Bring things to new compile-r7rs

This commit is contained in:
retropikzel 2025-07-19 18:51:05 +03:00
parent f2b8ae0590
commit da34379a83
3 changed files with 12 additions and 19 deletions

2
Jenkinsfile vendored
View File

@ -20,7 +20,7 @@ pipeline {
stage("${implementation} install") { stage("${implementation} install") {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
if("${implementation}" == "chicken") { if("${implementation}" == "chicken") {
DOCKERIMG="${implementation}:5" DOCKERIMG="chicken:5"
} else { } else {
DOCKERIMG="${implementation}:head" DOCKERIMG="${implementation}:head"
} }

View File

@ -7,15 +7,12 @@ TEST=primitives
SCHEME=chibi SCHEME=chibi
TMPDIR=tmp/${SCHEME} TMPDIR=tmp/${SCHEME}
DOCKERIMG=${SCHEME}:head DOCKERIMG=${SCHEME}:head
ifeq "${SCHEME}" "chicken" ifeq "${SCHEME}" "chicken:5"
DOCKERIMG=${SCHEME} DOCKERIMG=${SCHEME}
endif endif
all: build ${TMPDIR} all: build ${TMPDIR}
docker-image:
echo ${DOCKERIMG}
build: build:
snow-chibi package \ snow-chibi package \
--version=${VERSION} \ --version=${VERSION} \

View File

@ -294,15 +294,11 @@
;define-c-variable (?) ;define-c-variable (?)
) )
(cond-expand (cond-expand
(chicken-6 (include-relative "c/internal.scm")) (chicken (include-relative "c/internal.scm"))
(else (include "c/internal.scm"))) (else (include "c/internal.scm")))
(cond-expand (cond-expand
(chibi (include "c/primitives/chibi.scm")) (chibi (include "c/primitives/chibi.scm"))
(chicken-5 (export foreign-declare (chicken (export foreign-declare
foreign-safe-lambda
void)
(include "c/primitives/chicken.scm"))
(chicken-6 (export foreign-declare
foreign-safe-lambda foreign-safe-lambda
void) void)
(include-relative "c/primitives/chicken.scm")) (include-relative "c/primitives/chicken.scm"))
@ -322,7 +318,7 @@
(ypsilon (export c-function c-callback) (ypsilon (export c-function c-callback)
(include "c/primitives/ypsilon.scm"))) (include "c/primitives/ypsilon.scm")))
(cond-expand (cond-expand
(chicken-6 (include-relative "c/main.scm") (chicken (include-relative "c/main.scm")
(include-relative "c/libc.scm") (include-relative "c/libc.scm")
(include-relative "c/c-bytevectors.scm") (include-relative "c/c-bytevectors.scm")
(include-relative "c/pointer.scm") (include-relative "c/pointer.scm")