diff --git a/Jenkinsfile b/Jenkinsfile index 4a729f8..7e842fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { stage("${implementation} snow-chibi install test") { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { sh "docker build --build-arg COMPILE_R7RS=${implementation} --tag=r7rs-pffi-test-${implementation} -f dockerfiles/Dockerfile.snow-chibi-install-test ." - sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t r7rs-pffi-test-${implementation} sh -c \"make snow-chibi-install COMPILE_R7RS=${implementation} && cp tests/hello.scm /tmp/ && cd /tmp && COMPILE_R7RS=${implementation} compile-r7rs -o hello hello.scm && ./hello\"" + sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t r7rs-pffi-test-${implementation} sh -c \"make build install COMPILE_R7RS=${implementation} && cp tests/hello.scm /tmp/ && cd /tmp && COMPILE_R7RS=${implementation} compile-r7rs -o hello hello.scm && ./hello\"" } } } diff --git a/Makefile b/Makefile index 45f6799..8acd7d3 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,9 @@ DOCKER=docker run -it -v ${PWD}:/workdir DOCKER_INIT=cd /workdir && make clean && VERSION=$(shell awk '/version:/{ print $$2 }' README.md ) TESTNAME=primitives +COMPILE_R7RS=chibi -package: documentation +build: documentation snow-chibi package \ --version=${VERSION} \ --authors="Retropikzel" \ @@ -14,12 +15,9 @@ package: documentation --description="Portable foreign function interface for R7RS Schemes" \ foreign/c.sld -snow-chibi-install: clean-package package +install: snow-chibi --impls=${COMPILE_R7RS} install foreign-c-${VERSION}.tgz -clean-package: - rm -rf *.tgz - test-java: tmp/test/libtest.o tmp/test/libtest.so tmp/test/libtest.a mkdir -p tmp/test cp kawa.jar tmp/test/ @@ -160,3 +158,4 @@ clean: find . -name "*@gambit*" -delete rm -rf tmp rm foreign/c/primitives/chibi/foreign-c.c + rm -rf *.tgz diff --git a/documentation/foreign-c.pdf b/documentation/foreign-c.pdf index dada921..b4541a3 100644 Binary files a/documentation/foreign-c.pdf and b/documentation/foreign-c.pdf differ