diff --git a/VERSION b/VERSION index 9fa76f3..caf4187 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0-2-0 +v0-2-1 diff --git a/composition.scm b/composition.scm index e2211c1..3e8b412 100644 --- a/composition.scm +++ b/composition.scm @@ -1,6 +1,6 @@ ((packager . "retropikzel") (name . "pffi") - (version . "v0-2-0") + (version . "v0-2-1") (type . "library") (description . "Portable Foreign Function Interface for R7RS schemes") (license . "LGPL") diff --git a/retropikzel/pffi/v0-2-0/chicken.scm b/retropikzel/pffi/v0-2-1/chicken.scm similarity index 99% rename from retropikzel/pffi/v0-2-0/chicken.scm rename to retropikzel/pffi/v0-2-1/chicken.scm index 7c217f0..5f1fe29 100644 --- a/retropikzel/pffi/v0-2-0/chicken.scm +++ b/retropikzel/pffi/v0-2-1/chicken.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-0 chicken) + (retropikzel pffi v0-2-1 chicken) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-0/cyclone.sld b/retropikzel/pffi/v0-2-1/cyclone.sld similarity index 99% rename from retropikzel/pffi/v0-2-0/cyclone.sld rename to retropikzel/pffi/v0-2-1/cyclone.sld index 98266b6..a1cbf9c 100644 --- a/retropikzel/pffi/v0-2-0/cyclone.sld +++ b/retropikzel/pffi/v0-2-1/cyclone.sld @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-0 cyclone) + (retropikzel pffi v0-2-1 cyclone) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-0/empty.scm b/retropikzel/pffi/v0-2-1/empty.scm similarity index 98% rename from retropikzel/pffi/v0-2-0/empty.scm rename to retropikzel/pffi/v0-2-1/empty.scm index a332c7b..d312fe9 100644 --- a/retropikzel/pffi/v0-2-0/empty.scm +++ b/retropikzel/pffi/v0-2-1/empty.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-0 empty) + (retropikzel pffi v0-2-1 empty) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-0/gambit.scm b/retropikzel/pffi/v0-2-1/gambit.scm similarity index 98% rename from retropikzel/pffi/v0-2-0/gambit.scm rename to retropikzel/pffi/v0-2-1/gambit.scm index 174e809..eb7e59c 100644 --- a/retropikzel/pffi/v0-2-0/gambit.scm +++ b/retropikzel/pffi/v0-2-1/gambit.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-0 gambit) + (retropikzel pffi v0-2-1 gambit) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-0/gerbil.scm b/retropikzel/pffi/v0-2-1/gerbil.scm similarity index 98% rename from retropikzel/pffi/v0-2-0/gerbil.scm rename to retropikzel/pffi/v0-2-1/gerbil.scm index 1afa601..9d23d2a 100644 --- a/retropikzel/pffi/v0-2-0/gerbil.scm +++ b/retropikzel/pffi/v0-2-1/gerbil.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-0 gerbil) + (retropikzel pffi v0-2-1 gerbil) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-0/guile.scm b/retropikzel/pffi/v0-2-1/guile.scm similarity index 98% rename from retropikzel/pffi/v0-2-0/guile.scm rename to retropikzel/pffi/v0-2-1/guile.scm index fd58d7c..26eaab3 100644 --- a/retropikzel/pffi/v0-2-0/guile.scm +++ b/retropikzel/pffi/v0-2-1/guile.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-0 guile) + (retropikzel pffi v0-2-1 guile) (import (scheme base) (scheme write) (scheme file) @@ -138,7 +138,7 @@ ((equal? native-type unsigned-long) (bytevector-u64-ref p offset value (native-endianness))) ((equal? native-type float) (bytevector-u64-ref p offset value (native-endianness))) ((equal? native-type double) (bytevector-u64-ref p offset value (native-endianness))) - ((equal? native-type '*) (bytevector-sint-ref p offset value (native-endianness) (pffi-size-of type))))))))))) + ((equal? native-type '*) (bytevector-sint-ref p offset value (native-endianness) (pffi-size-of type))))))) (define pffi-pointer-deref (lambda (pointer) diff --git a/retropikzel/pffi/v0-2-0/kawa.scm b/retropikzel/pffi/v0-2-1/kawa.scm similarity index 100% rename from retropikzel/pffi/v0-2-0/kawa.scm rename to retropikzel/pffi/v0-2-1/kawa.scm diff --git a/retropikzel/pffi/v0-2-0/main.rkt b/retropikzel/pffi/v0-2-1/main.rkt similarity index 100% rename from retropikzel/pffi/v0-2-0/main.rkt rename to retropikzel/pffi/v0-2-1/main.rkt diff --git a/retropikzel/pffi/v0-2-0/main.scm b/retropikzel/pffi/v0-2-1/main.scm similarity index 65% rename from retropikzel/pffi/v0-2-0/main.scm rename to retropikzel/pffi/v0-2-1/main.scm index 04e5226..5d2773e 100644 --- a/retropikzel/pffi/v0-2-0/main.scm +++ b/retropikzel/pffi/v0-2-1/main.scm @@ -1,32 +1,32 @@ (define-library - (retropikzel pffi v0-2-0 main) + (retropikzel pffi v0-2-1 main) (cond-expand (sagittarius (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 sagittarius))) + (retropikzel pffi v0-2-1 sagittarius))) (guile (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 guile))) + (retropikzel pffi v0-2-1 guile))) (racket (import (scheme base) (scheme write) (scheme file) (scheme process-context) (only (racket base) system-type) - (retropikzel pffi v0-2-0 racket))) + (retropikzel pffi v0-2-1 racket))) (stklos (import (scheme base) (scheme write) (scheme file) (scheme process-context) (stklos) - (retropikzel pffi v0-2-0 stklos))) + (retropikzel pffi v0-2-1 stklos))) (kawa (import (scheme base) (scheme write) @@ -37,31 +37,31 @@ (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 cyclone))) + (retropikzel pffi v0-2-1 cyclone))) (gambit (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 gambit))) + (retropikzel pffi v0-2-1 gambit))) (chicken (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 chicken))) + (retropikzel pffi v0-2-1 chicken))) (chibi (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 chibi))) + (retropikzel pffi v0-2-1 chibi))) (mit-scheme (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 mit-scheme)))) + (retropikzel pffi v0-2-1 mit-scheme)))) (export pffi-shared-object-auto-load pffi-shared-object-load pffi-define @@ -83,7 +83,7 @@ - (define library-version "v0-2-0") + (define library-version "v0-2-1") (define slash (cond-expand (windows (string #\\)) (else "/"))) (define platform-file-extension @@ -168,58 +168,9 @@ (define auto-load-versions (list "")) - (define-syntax pffi-shared-object-auto-load-old - (syntax-rules () - ((pffi-shared-object-auto-load headers object-name additional-paths) - (cond-expand - (cyclone (pffi-shared-object-load headers)) - (chicken (pffi-shared-object-load headers)) - (gambit (pffi-shared-object-load headers)) - (else - (let* ((paths (append auto-load-paths additional-paths)) - (shared-object #f)) - (for-each - (lambda (path) - (if (not shared-object) - (let ((object-path - (string-append path - "/" - object-name - platform-file-extension)) - (object-version-path - (string-append path - "/" - object-name - platform-version-file-extension)) - (object-lib-path - (string-append path - "/" - platform-lib-prefix - object-name - platform-file-extension)) - (object-version-lib-path - (string-append path - "/" - platform-lib-prefix - object-name - platform-version-file-extension))) - (cond - ((file-exists? object-path) - (set! shared-object (pffi-shared-object-load headers object-path))) - ((file-exists? object-version-path) - (set! shared-object (pffi-shared-object-load headers object-version-path))) - ((file-exists? object-lib-path) - (set! shared-object (pffi-shared-object-load headers object-lib-path))) - ((file-exists? object-version-lib-path) - (set! shared-object (pffi-shared-object-load headers object-version-lib-path))))))) - paths) - (if (not shared-object) - (error "Could not load shared object" object-name) - shared-object))))))) - (define-syntax pffi-shared-object-auto-load (syntax-rules () - ((pffi-shared-object-auto-load headers object-name additional-versions additional-paths) + ((pffi-shared-object-auto-load headers additional-paths object-name additional-versions) (cond-expand (cyclone (pffi-shared-object-load headers)) (chicken (pffi-shared-object-load headers)) diff --git a/retropikzel/pffi/v0-2-0/main.sld b/retropikzel/pffi/v0-2-1/main.sld similarity index 65% rename from retropikzel/pffi/v0-2-0/main.sld rename to retropikzel/pffi/v0-2-1/main.sld index 04e5226..5d2773e 100644 --- a/retropikzel/pffi/v0-2-0/main.sld +++ b/retropikzel/pffi/v0-2-1/main.sld @@ -1,32 +1,32 @@ (define-library - (retropikzel pffi v0-2-0 main) + (retropikzel pffi v0-2-1 main) (cond-expand (sagittarius (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 sagittarius))) + (retropikzel pffi v0-2-1 sagittarius))) (guile (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 guile))) + (retropikzel pffi v0-2-1 guile))) (racket (import (scheme base) (scheme write) (scheme file) (scheme process-context) (only (racket base) system-type) - (retropikzel pffi v0-2-0 racket))) + (retropikzel pffi v0-2-1 racket))) (stklos (import (scheme base) (scheme write) (scheme file) (scheme process-context) (stklos) - (retropikzel pffi v0-2-0 stklos))) + (retropikzel pffi v0-2-1 stklos))) (kawa (import (scheme base) (scheme write) @@ -37,31 +37,31 @@ (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 cyclone))) + (retropikzel pffi v0-2-1 cyclone))) (gambit (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 gambit))) + (retropikzel pffi v0-2-1 gambit))) (chicken (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 chicken))) + (retropikzel pffi v0-2-1 chicken))) (chibi (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 chibi))) + (retropikzel pffi v0-2-1 chibi))) (mit-scheme (import (scheme base) (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-2-0 mit-scheme)))) + (retropikzel pffi v0-2-1 mit-scheme)))) (export pffi-shared-object-auto-load pffi-shared-object-load pffi-define @@ -83,7 +83,7 @@ - (define library-version "v0-2-0") + (define library-version "v0-2-1") (define slash (cond-expand (windows (string #\\)) (else "/"))) (define platform-file-extension @@ -168,58 +168,9 @@ (define auto-load-versions (list "")) - (define-syntax pffi-shared-object-auto-load-old - (syntax-rules () - ((pffi-shared-object-auto-load headers object-name additional-paths) - (cond-expand - (cyclone (pffi-shared-object-load headers)) - (chicken (pffi-shared-object-load headers)) - (gambit (pffi-shared-object-load headers)) - (else - (let* ((paths (append auto-load-paths additional-paths)) - (shared-object #f)) - (for-each - (lambda (path) - (if (not shared-object) - (let ((object-path - (string-append path - "/" - object-name - platform-file-extension)) - (object-version-path - (string-append path - "/" - object-name - platform-version-file-extension)) - (object-lib-path - (string-append path - "/" - platform-lib-prefix - object-name - platform-file-extension)) - (object-version-lib-path - (string-append path - "/" - platform-lib-prefix - object-name - platform-version-file-extension))) - (cond - ((file-exists? object-path) - (set! shared-object (pffi-shared-object-load headers object-path))) - ((file-exists? object-version-path) - (set! shared-object (pffi-shared-object-load headers object-version-path))) - ((file-exists? object-lib-path) - (set! shared-object (pffi-shared-object-load headers object-lib-path))) - ((file-exists? object-version-lib-path) - (set! shared-object (pffi-shared-object-load headers object-version-lib-path))))))) - paths) - (if (not shared-object) - (error "Could not load shared object" object-name) - shared-object))))))) - (define-syntax pffi-shared-object-auto-load (syntax-rules () - ((pffi-shared-object-auto-load headers object-name additional-versions additional-paths) + ((pffi-shared-object-auto-load headers additional-paths object-name additional-versions) (cond-expand (cyclone (pffi-shared-object-load headers)) (chicken (pffi-shared-object-load headers)) diff --git a/retropikzel/pffi/v0-2-0/racket.rkt b/retropikzel/pffi/v0-2-1/racket.rkt similarity index 98% rename from retropikzel/pffi/v0-2-0/racket.rkt rename to retropikzel/pffi/v0-2-1/racket.rkt index b4c5b1e..02fd8c6 100644 --- a/retropikzel/pffi/v0-2-0/racket.rkt +++ b/retropikzel/pffi/v0-2-1/racket.rkt @@ -1,7 +1,7 @@ #lang r7rs (define-library - (retropikzel pffi v0-2-0 racket) + (retropikzel pffi v0-2-1 racket) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-0/sagittarius.scm b/retropikzel/pffi/v0-2-1/sagittarius.scm similarity index 99% rename from retropikzel/pffi/v0-2-0/sagittarius.scm rename to retropikzel/pffi/v0-2-1/sagittarius.scm index cdc6509..96d7e8f 100644 --- a/retropikzel/pffi/v0-2-0/sagittarius.scm +++ b/retropikzel/pffi/v0-2-1/sagittarius.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-0 sagittarius) + (retropikzel pffi v0-2-1 sagittarius) (import (scheme base) (scheme write) (scheme file) diff --git a/retropikzel/pffi/v0-2-0/schubert-doc.md b/retropikzel/pffi/v0-2-1/schubert-doc.md similarity index 100% rename from retropikzel/pffi/v0-2-0/schubert-doc.md rename to retropikzel/pffi/v0-2-1/schubert-doc.md diff --git a/retropikzel/pffi/v0-2-0/stklos.scm b/retropikzel/pffi/v0-2-1/stklos.scm similarity index 98% rename from retropikzel/pffi/v0-2-0/stklos.scm rename to retropikzel/pffi/v0-2-1/stklos.scm index b341516..48f7587 100644 --- a/retropikzel/pffi/v0-2-0/stklos.scm +++ b/retropikzel/pffi/v0-2-1/stklos.scm @@ -1,5 +1,5 @@ (define-library - (retropikzel pffi v0-2-0 stklos) + (retropikzel pffi v0-2-1 stklos) (import (scheme base) (scheme write) (scheme file) diff --git a/test/200_import.scm b/test/200_import.scm index 172aa04..123551d 100644 --- a/test/200_import.scm +++ b/test/200_import.scm @@ -1,6 +1,6 @@ (import (scheme base) (scheme write) - (retropikzel pffi v0-2-0 main)) + (retropikzel pffi v0-2-1 main)) (display "Hello from import.scm") (newline) diff --git a/test/300_size-of.scm b/test/300_size-of.scm index 98fa1d9..9df7b8b 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-0 main)) + (retropikzel pffi v0-2-1 main)) (display 'int8) (display " ") diff --git a/test/400_pointer-allocate-free.scm b/test/400_pointer-allocate-free.scm index 78fba98..07f82f4 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-0 main)) + (retropikzel pffi v0-2-1 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 3da0d35..ee59ce9 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-0 main)) + (retropikzel pffi v0-2-1 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 d963b24..14fd729 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-0 main)) + (retropikzel pffi v0-2-1 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 3953a3e..23b6ded 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-0 main)) + (retropikzel pffi v0-2-1 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 9f64c86..608fca4 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-0 main)) + (retropikzel pffi v0-2-1 main)) (define original "Hello world") diff --git a/test/600_pffi-define.scm b/test/600_pffi-define.scm index a92eac0..ae222aa 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-0 main)) + (retropikzel pffi v0-2-1 main)) (define libcurl (pffi-shared-object-auto-load (list "curl/curl.h") "curl"