Bring things to new compile-r7rs
This commit is contained in:
		
							parent
							
								
									f2b8ae0590
								
							
						
					
					
						commit
						da34379a83
					
				| 
						 | 
					@ -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"
 | 
				
			||||||
					}
 | 
										}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										5
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										5
									
								
								Makefile
								
								
								
								
							| 
						 | 
					@ -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} \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -294,17 +294,13 @@
 | 
				
			||||||
          ;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
 | 
					                     foreign-safe-lambda
 | 
				
			||||||
                       void)
 | 
					                     void)
 | 
				
			||||||
               (include "c/primitives/chicken.scm"))
 | 
					 | 
				
			||||||
    (chicken-6 (export foreign-declare
 | 
					 | 
				
			||||||
                       foreign-safe-lambda
 | 
					 | 
				
			||||||
                       void)
 | 
					 | 
				
			||||||
      (include-relative "c/primitives/chicken.scm"))
 | 
					      (include-relative "c/primitives/chicken.scm"))
 | 
				
			||||||
    ;(cyclone (include "c/primitives/cyclone.scm"))
 | 
					    ;(cyclone (include "c/primitives/cyclone.scm"))
 | 
				
			||||||
    (gambit (include "c/primitives/gambit.scm"))
 | 
					    (gambit (include "c/primitives/gambit.scm"))
 | 
				
			||||||
| 
						 | 
					@ -322,12 +318,12 @@
 | 
				
			||||||
    (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")
 | 
				
			||||||
               ;(include-relative "c/array.scm")
 | 
					             ;(include-relative "c/array.scm")
 | 
				
			||||||
               ;(include-relative "c/struct.scm")
 | 
					             ;(include-relative "c/struct.scm")
 | 
				
			||||||
               )
 | 
					               )
 | 
				
			||||||
    (else (include "c/main.scm")
 | 
					    (else (include "c/main.scm")
 | 
				
			||||||
          (include "c/libc.scm")
 | 
					          (include "c/libc.scm")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue