From 08efcd520cfc83fb703910b93db2e87cdb153af1 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Thu, 6 Jun 2024 14:40:27 +0300 Subject: [PATCH] v0-2-2 --- Makefile | 6 +++- VERSION | 2 +- retropikzel/pffi/v0-2-2/chicken.scm | 2 +- retropikzel/pffi/v0-2-2/cyclone.sld | 2 +- retropikzel/pffi/v0-2-2/empty.scm | 2 +- retropikzel/pffi/v0-2-2/gambit.scm | 2 +- retropikzel/pffi/v0-2-2/gerbil.scm | 2 +- retropikzel/pffi/v0-2-2/guile.scm | 2 +- retropikzel/pffi/v0-2-2/main.scm | 42 +++++++++++++++--------- retropikzel/pffi/v0-2-2/main.sld | 20 +++++------ retropikzel/pffi/v0-2-2/racket.rkt | 2 +- retropikzel/pffi/v0-2-2/sagittarius.scm | 2 +- retropikzel/pffi/v0-2-2/stklos.scm | 2 +- test-all.sh | 2 ++ test/200_import.scm | 2 +- test/300_size-of.scm | 2 +- test/400_pointer-allocate-free.scm | 2 +- test/401_is-pointer.scm | 2 +- test/402_null-pointer.scm | 2 +- test/410_pointer-set-get.scm | 2 +- test/500_string-to-pointer-to-string.scm | 2 +- test/600_pffi-define.scm | 2 +- test/700_libc.scm | 2 +- 23 files changed, 62 insertions(+), 46 deletions(-) diff --git a/Makefile b/Makefile index 3aea63b..22aa6f6 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,12 @@ VERSION=$(shell cat VERSION) + build: build-main-scm +install: build + schubert install + build-main-scm: cp retropikzel/pffi/${VERSION}/main.sld retropikzel/pffi/${VERSION}/main.scm @@ -22,7 +26,7 @@ documentation: tmp: mkdir -p tmp -test: +test: build bash test-all.sh clean: diff --git a/VERSION b/VERSION index caf4187..d94ab43 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0-2-1 +v0-2-2 diff --git a/retropikzel/pffi/v0-2-2/chicken.scm b/retropikzel/pffi/v0-2-2/chicken.scm index 5f1fe29..abbaacb 100644 --- a/retropikzel/pffi/v0-2-2/chicken.scm +++ b/retropikzel/pffi/v0-2-2/chicken.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-1 chicken) + (retropikzel pffi v0-2-2 chicken) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-2/cyclone.sld b/retropikzel/pffi/v0-2-2/cyclone.sld index a1cbf9c..8e071f3 100644 --- a/retropikzel/pffi/v0-2-2/cyclone.sld +++ b/retropikzel/pffi/v0-2-2/cyclone.sld @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-1 cyclone) + (retropikzel pffi v0-2-2 cyclone) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-2/empty.scm b/retropikzel/pffi/v0-2-2/empty.scm index d312fe9..c20bec2 100644 --- a/retropikzel/pffi/v0-2-2/empty.scm +++ b/retropikzel/pffi/v0-2-2/empty.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-1 empty) + (retropikzel pffi v0-2-2 empty) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-2/gambit.scm b/retropikzel/pffi/v0-2-2/gambit.scm index eb7e59c..d88f44b 100644 --- a/retropikzel/pffi/v0-2-2/gambit.scm +++ b/retropikzel/pffi/v0-2-2/gambit.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-1 gambit) + (retropikzel pffi v0-2-2 gambit) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-2/gerbil.scm b/retropikzel/pffi/v0-2-2/gerbil.scm index 9d23d2a..7d5664a 100644 --- a/retropikzel/pffi/v0-2-2/gerbil.scm +++ b/retropikzel/pffi/v0-2-2/gerbil.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-1 gerbil) + (retropikzel pffi v0-2-2 gerbil) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-2/guile.scm b/retropikzel/pffi/v0-2-2/guile.scm index 26eaab3..5586fd9 100644 --- a/retropikzel/pffi/v0-2-2/guile.scm +++ b/retropikzel/pffi/v0-2-2/guile.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-1 guile) + (retropikzel pffi v0-2-2 guile) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-2/main.scm b/retropikzel/pffi/v0-2-2/main.scm index 97821e2..55f4d40 100644 --- a/retropikzel/pffi/v0-2-2/main.scm +++ b/retropikzel/pffi/v0-2-2/main.scm @@ -1,32 +1,32 @@ (define-library - (retropikzel pffi v0-2-1 main) + (retropikzel pffi v0-2-2 main) (cond-expand (sagittarius (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 sagittarius))) + (retropikzel pffi v0-2-2 sagittarius))) (guile (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 guile))) + (retropikzel pffi v0-2-2 guile))) (racket (import (scheme base) (scheme write) (scheme file) (scheme process-context) (only (racket base) system-type) - (retropikzel pffi v0-2-1 racket))) + (retropikzel pffi v0-2-2 racket))) (stklos (import (scheme base) (scheme write) (scheme file) (scheme process-context) (stklos) - (retropikzel pffi v0-2-1 stklos))) + (retropikzel pffi v0-2-2 stklos))) (kawa (import (scheme base) (scheme write) @@ -37,31 +37,31 @@ (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 cyclone))) + (retropikzel pffi v0-2-2 cyclone))) (gambit (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 gambit))) + (retropikzel pffi v0-2-2 gambit))) (chicken (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 chicken))) + (retropikzel pffi v0-2-2 chicken))) (chibi (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 chibi))) + (retropikzel pffi v0-2-2 chibi))) (mit-scheme (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 mit-scheme)))) + (retropikzel pffi v0-2-2 mit-scheme)))) (export pffi-shared-object-auto-load pffi-shared-object-load pffi-define @@ -83,7 +83,7 @@ - (define library-version "v0-2-1") + (define library-version "v0-2-2") (define slash (cond-expand (windows (string #\\)) (else "/"))) (define platform-file-extension @@ -149,7 +149,16 @@ (if (get-environment-variable "WINDIR") (list (get-environment-variable "WINDIR")) (list)) - (list ".") + (if (get-environment-variable "WINEDLLDIR0") + (list (get-environment-variable "WINEDLLDIR0")) + (list)) + (if (get-environment-variable "SystemRoot") + (list (string-append + (get-environment-variable "SystemRoot") + "system32")) + (list)) + (list "." + ) (string-split (get-environment-variable "PATH") #\;))) (else (append @@ -166,7 +175,6 @@ "/usr/lib/x86_64-linux-gnu" "/usr/local/lib" "/usr/lib" - "/usr/lib32" "/usr/lib64")))))) (define auto-load-versions (list "")) @@ -192,14 +200,16 @@ object-name platform-file-extension version))) - (write library-path) - (newline) (if (file-exists? library-path) (set! shared-object library-path)))) versions)) paths) (if (not shared-object) - (error "Could not load shared object" object-name) + (error "Could not load shared object" + (list (cons 'object object-name) + (cons 'paths paths) + (cons 'platform-file-extension platform-file-extension) + (cons 'versions versions))) (pffi-shared-object-load headers shared-object)))))))) (cond-expand diff --git a/retropikzel/pffi/v0-2-2/main.sld b/retropikzel/pffi/v0-2-2/main.sld index 76b1d84..55f4d40 100644 --- a/retropikzel/pffi/v0-2-2/main.sld +++ b/retropikzel/pffi/v0-2-2/main.sld @@ -6,27 +6,27 @@ (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 sagittarius))) + (retropikzel pffi v0-2-2 sagittarius))) (guile (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 guile))) + (retropikzel pffi v0-2-2 guile))) (racket (import (scheme base) (scheme write) (scheme file) (scheme process-context) (only (racket base) system-type) - (retropikzel pffi v0-2-1 racket))) + (retropikzel pffi v0-2-2 racket))) (stklos (import (scheme base) (scheme write) (scheme file) (scheme process-context) (stklos) - (retropikzel pffi v0-2-1 stklos))) + (retropikzel pffi v0-2-2 stklos))) (kawa (import (scheme base) (scheme write) @@ -37,31 +37,31 @@ (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 cyclone))) + (retropikzel pffi v0-2-2 cyclone))) (gambit (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 gambit))) + (retropikzel pffi v0-2-2 gambit))) (chicken (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 chicken))) + (retropikzel pffi v0-2-2 chicken))) (chibi (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 chibi))) + (retropikzel pffi v0-2-2 chibi))) (mit-scheme (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-1 mit-scheme)))) + (retropikzel pffi v0-2-2 mit-scheme)))) (export pffi-shared-object-auto-load pffi-shared-object-load pffi-define @@ -83,7 +83,7 @@ - (define library-version "v0-2-1") + (define library-version "v0-2-2") (define slash (cond-expand (windows (string #\\)) (else "/"))) (define platform-file-extension diff --git a/retropikzel/pffi/v0-2-2/racket.rkt b/retropikzel/pffi/v0-2-2/racket.rkt index 02fd8c6..3c5e2a2 100644 --- a/retropikzel/pffi/v0-2-2/racket.rkt +++ b/retropikzel/pffi/v0-2-2/racket.rkt @@ -1,7 +1,7 @@ #lang r7rs (define-library - (retropikzel pffi v0-2-1 racket) + (retropikzel pffi v0-2-2 racket) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-2/sagittarius.scm b/retropikzel/pffi/v0-2-2/sagittarius.scm index e294d62..a5387cb 100644 --- a/retropikzel/pffi/v0-2-2/sagittarius.scm +++ b/retropikzel/pffi/v0-2-2/sagittarius.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-1 sagittarius) + (retropikzel pffi v0-2-2 sagittarius) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-2/stklos.scm b/retropikzel/pffi/v0-2-2/stklos.scm index 48f7587..f86d132 100644 --- a/retropikzel/pffi/v0-2-2/stklos.scm +++ b/retropikzel/pffi/v0-2-2/stklos.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-1 stklos) + (retropikzel pffi v0-2-2 stklos) (import (scheme base) (scheme write) (scheme file) diff --git a/test-all.sh b/test-all.sh index b4a998f..320a7c3 100644 --- a/test-all.sh +++ b/test-all.sh @@ -3,6 +3,8 @@ set -eu set -o pipefail +VERSION=$(cat VERSION) + for testfile in ./test-*.sh do if [[ ! "${testfile}" = "./test-all.sh" ]]; diff --git a/test/200_import.scm b/test/200_import.scm index 123551d..93c2dea 100644 --- a/test/200_import.scm +++ b/test/200_import.scm @@ -1,6 +1,6 @@ (import (scheme base) (scheme write) - (retropikzel pffi v0-2-1 main)) + (retropikzel pffi v0-2-2 main)) (display "Hello from import.scm") (newline) diff --git a/test/300_size-of.scm b/test/300_size-of.scm index 9df7b8b..2148fe1 100644 --- a/test/300_size-of.scm +++ b/test/300_size-of.scm @@ -1,6 +1,6 @@ (import (scheme base) (scheme write) - (retropikzel pffi v0-2-1 main)) + (retropikzel pffi v0-2-2 main)) (display 'int8) (display " ") diff --git a/test/400_pointer-allocate-free.scm b/test/400_pointer-allocate-free.scm index 07f82f4..2f35065 100644 --- a/test/400_pointer-allocate-free.scm +++ b/test/400_pointer-allocate-free.scm @@ -1,6 +1,6 @@ (import (scheme base) (scheme write) - (retropikzel pffi v0-2-1 main)) + (retropikzel pffi v0-2-2 main)) (define p (pffi-pointer-allocate (+ (* (pffi-size-of 'uint32) 3) (* (pffi-size-of 'uint8) 4) diff --git a/test/401_is-pointer.scm b/test/401_is-pointer.scm index ee59ce9..3ee565a 100644 --- a/test/401_is-pointer.scm +++ b/test/401_is-pointer.scm @@ -1,6 +1,6 @@ (import (scheme base) (scheme write) - (retropikzel pffi v0-2-1 main)) + (retropikzel pffi v0-2-2 main)) (define p (pffi-pointer-allocate (+ (* (pffi-size-of 'uint32) 3) (* (pffi-size-of 'uint8) 4) diff --git a/test/402_null-pointer.scm b/test/402_null-pointer.scm index 14fd729..af8600b 100644 --- a/test/402_null-pointer.scm +++ b/test/402_null-pointer.scm @@ -1,6 +1,6 @@ (import (scheme base) (scheme write) - (retropikzel pffi v0-2-1 main)) + (retropikzel pffi v0-2-2 main)) (define p (pffi-pointer-allocate (+ (* (pffi-size-of 'uint32) 3) (* (pffi-size-of 'uint8) 4) diff --git a/test/410_pointer-set-get.scm b/test/410_pointer-set-get.scm index 23b6ded..8884106 100644 --- a/test/410_pointer-set-get.scm +++ b/test/410_pointer-set-get.scm @@ -1,6 +1,6 @@ (import (scheme base) (scheme write) - (retropikzel pffi v0-2-1 main)) + (retropikzel pffi v0-2-2 main)) (define p (pffi-pointer-allocate (+ (* (pffi-size-of 'uint32) 3) (* (pffi-size-of 'uint8) 4) diff --git a/test/500_string-to-pointer-to-string.scm b/test/500_string-to-pointer-to-string.scm index 608fca4..1ae42ba 100644 --- a/test/500_string-to-pointer-to-string.scm +++ b/test/500_string-to-pointer-to-string.scm @@ -1,6 +1,6 @@ (import (scheme base) (scheme write) - (retropikzel pffi v0-2-1 main)) + (retropikzel pffi v0-2-2 main)) (define original "Hello world") diff --git a/test/600_pffi-define.scm b/test/600_pffi-define.scm index 3a2755f..b68ee11 100644 --- a/test/600_pffi-define.scm +++ b/test/600_pffi-define.scm @@ -2,7 +2,7 @@ (scheme write) (scheme process-context) (scheme eval) - (retropikzel pffi v0-2-1 main)) + (retropikzel pffi v0-2-2 main)) (define libcurl (pffi-shared-object-auto-load (list "curl/curl.h") (list) diff --git a/test/700_libc.scm b/test/700_libc.scm index fd7c02e..62d9e10 100644 --- a/test/700_libc.scm +++ b/test/700_libc.scm @@ -2,7 +2,7 @@ (scheme write) (scheme process-context) (scheme eval) - (retropikzel pffi v0-2-1 main)) + (retropikzel pffi v0-2-2 main)) (define libc (pffi-shared-object-auto-load (list "curl/curl.h") (list)