From 699ca23671e8d07478d3426ca90122b74de4f8f8 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Fri, 17 May 2024 14:02:06 +0300 Subject: [PATCH] Better clean --- Makefile | 28 ++++++----- manifest.scm | 1 - retropikzel/pffi/v0-1-0/chibi.scm | 84 ------------------------------- retropikzel/pffi/v0-1-0/main.rkt | 8 ++- retropikzel/pffi/v0-1-0/main.scm | 8 ++- retropikzel/pffi/v0-1-0/main.sld | 8 ++- 6 files changed, 37 insertions(+), 100 deletions(-) delete mode 100644 retropikzel/pffi/v0-1-0/chibi.scm diff --git a/Makefile b/Makefile index cdfba54..9f810c7 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,10 @@ GAMBIT_I=gsi -:r7rs,search=$(shell pwd) CHICKEN_ENV=CHICKEN_REPOSITORY_PATH=${ENV_CHICKEN_REPOSITORY_PATH}:${CHICKEN_INSTALL_REPOSITORY}:$(shell pwd) CHICKEN_INCLUDE_PATH=$(shell pwd) LD_LIBRARY_PATH=${GUIX_ENVIRONMENT}/lib CHICKEN=${CHICKEN_ENV} csc -X r7rs -R r7rs -sJ CHICKEN_I=${CHICKEN_ENV} csi -R r7rs -s -GERBIL=gxc -exe -prelude :scheme/r7rs +GERBIL=gxc -prelude :scheme/r7rs -exe +GERBIL_I=gxi --lang r7rs -build: build-rkt build-main-scm build-main-chicken build-main-gambit +build: build-rkt build-main-scm build-main-chicken build-main-gambit build-main-gerbil chicken-install: mkdir -p ${CHICKEN_INSTALL_REPOSITORY} @@ -47,6 +48,11 @@ build-main-gambit: ${GAMBIT} -obj retropikzel/pffi/${VERSION}/main.sld #cp retropikzel/pffi/${VERSION}/*.o* test/ +build-main-gerbil: + #${GAMBIT} -obj retropikzel/pffi/${VERSION}/gambit.scm + #${GAMBIT} -obj retropikzel/pffi/${VERSION}/main.sld + #cp retropikzel/pffi/${VERSION}/*.o* test/ + update-documentation: schubert document @@ -60,7 +66,6 @@ documentation: schubert document VERSION=${VERSION} bash doc/generate.sh > documentation.md - test/import.scm: clean build ${SASH} $@ ${GUILE} $@ @@ -68,22 +73,15 @@ test/import.scm: clean build ${STKLOS} $@ ${KAWA} $@ #${CYCLONE} $@ && test/import - #${GAMBIT} $@ + #${GAMBIT} -exe $@ && ./test/import #${CHICKEN} $@ #${GERBIL} $@ -test/import.scm: clean build - ${GAMBIT_I} $@ - ${GAMBIT} -exe $@ && ./test/import - test/pffi-define.scm: clean build ${SASH} $@ ${GUILE} $@ ${KAWA} $@ -#test/pffi-define.scm: clean build - #${CYCLONE} $@ && test/pffi-define - test/size-of.scm: ${SASH} $@ ${GUILE} $@ @@ -119,9 +117,15 @@ clean: rm -rf retropikzel/pffi/${VERSION}/*.o* rm -rf retropikzel/pffi/${VERSION}/*.so rm -rf retropikzel/pffi/${VERSION}/*.meta + rm -rf retropikzel.* rm -rf test/*.c - rm -rf test/*.o + rm -rf test/*.o* rm -rf test/*.so rm -rf test/*.meta rm -rf test/import rm -rf test/pffi-define + rm -rf test/*gambit* + rm -rf test/*.link + rm -rf *.c + rm -rf *.o + rm -rf *.so diff --git a/manifest.scm b/manifest.scm index d38ba32..82470ed 100644 --- a/manifest.scm +++ b/manifest.scm @@ -7,7 +7,6 @@ "racket-minimal" "gambit-c" "chicken" - "chibi-scheme" "gerbil" "openjdk" "curl" diff --git a/retropikzel/pffi/v0-1-0/chibi.scm b/retropikzel/pffi/v0-1-0/chibi.scm deleted file mode 100644 index 5a663e5..0000000 --- a/retropikzel/pffi/v0-1-0/chibi.scm +++ /dev/null @@ -1,84 +0,0 @@ -(define-library - (retropikzel pffi v0-1-0 chibi) - (import (scheme base) - (scheme write) - (scheme file) - (scheme process-context)) - (export pffi-shared-object-load - pffi-define - pffi-size-of - pffi-pointer-allocate - pffi-pointer-null - pffi-string->pointer - pffi-pointer->string - pffi-pointer->bytevector - pffi-pointer-free - pffi-pointer? - pffi-pointer-null? - pffi-pointer-set! - pffi-pointer-get - pffi-pointer-deref) - (begin - - (define pffi-type->native-type - (lambda (type) - (error "Not defined"))) - - (define pffi-pointer? - (lambda (object) - (error "Not defined"))) - - (define-syntax pffi-define - (syntax-rules () - ((pffi-define scheme-name shared-object c-name return-type argument-types) - (error "Not defined")))) - - - (define pffi-size-of - (lambda (type) - (error "Not defined"))) - - (define pffi-pointer-allocate - (lambda (size) - (error "Not defined"))) - - (define pffi-pointer-null - (lambda () - (error "Not defined"))) - - (define pffi-string->pointer - (lambda (string-content) - (error "Not defined"))) - - (define pffi-pointer->string - (lambda (pointer) - pointer)) - - (define pffi-pointer->bytevector - (lambda (pointer size) - (error "Not defined"))) - - (define pffi-shared-object-load - (lambda (header path) - (error "Not defined"))) - - (define pffi-pointer-free - (lambda (pointer) - (error "Not defined"))) - - (define pffi-pointer-null? - (lambda (pointer) - (error "Not defined"))) - - (define pffi-pointer-set! - (lambda (pointer type offset value) - (let ((p pointer)) - (error "Not defined")))) - - (define pffi-pointer-get - (lambda (pointer type offset) - (error "Not defined"))) - - (define pffi-pointer-deref - (lambda (pointer) - (error "Not defined"))))) diff --git a/retropikzel/pffi/v0-1-0/main.rkt b/retropikzel/pffi/v0-1-0/main.rkt index 7a1accd..b479675 100644 --- a/retropikzel/pffi/v0-1-0/main.rkt +++ b/retropikzel/pffi/v0-1-0/main.rkt @@ -58,7 +58,13 @@ (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-1-0 chibi)))) + (retropikzel pffi v0-1-0 chibi))) + (mit-scheme + (import (scheme base) + (scheme write) + (scheme file) + (scheme process-context) + (retropikzel pffi v0-1-0 mit-scheme)))) (export pffi-shared-object-auto-load pffi-shared-object-load pffi-define diff --git a/retropikzel/pffi/v0-1-0/main.scm b/retropikzel/pffi/v0-1-0/main.scm index 02fe360..251a09c 100644 --- a/retropikzel/pffi/v0-1-0/main.scm +++ b/retropikzel/pffi/v0-1-0/main.scm @@ -57,7 +57,13 @@ (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-1-0 chibi)))) + (retropikzel pffi v0-1-0 chibi))) + (mit-scheme + (import (scheme base) + (scheme write) + (scheme file) + (scheme process-context) + (retropikzel pffi v0-1-0 mit-scheme)))) (export pffi-shared-object-auto-load pffi-shared-object-load pffi-define diff --git a/retropikzel/pffi/v0-1-0/main.sld b/retropikzel/pffi/v0-1-0/main.sld index 02fe360..251a09c 100644 --- a/retropikzel/pffi/v0-1-0/main.sld +++ b/retropikzel/pffi/v0-1-0/main.sld @@ -57,7 +57,13 @@ (scheme write) (scheme file) (scheme process-context) - (retropikzel pffi v0-1-0 chibi)))) + (retropikzel pffi v0-1-0 chibi))) + (mit-scheme + (import (scheme base) + (scheme write) + (scheme file) + (scheme process-context) + (retropikzel pffi v0-1-0 mit-scheme)))) (export pffi-shared-object-auto-load pffi-shared-object-load pffi-define