Unhardcode libchicken (untested!) pasted by mario-goulart on Fri May 4 15:40:16 2012

diff --git a/csc.scm b/csc.scm
index 3ba5007..78eded9 100644
--- a/csc.scm
+++ b/csc.scm
@@ -61,6 +61,7 @@
 (define-foreign-variable CSC_PROGRAM c-string "C_CSC_PROGRAM")
 (define-foreign-variable WINDOWS_SHELL bool "C_WINDOWS_SHELL")
 (define-foreign-variable BINARY_VERSION int "C_BINARY_VERSION")
+(define-foreign-variable PROGRAM_PREFIX c-string "C_PROGRAM_PREFIX")
 
 
 ;;; Parameters:
@@ -119,8 +120,11 @@
 (define windows-shell WINDOWS_SHELL)
 (define generate-manifest #f)
 
+(define libchicken
+  (string-append "lib" PROGRAM_PREFIX "chicken"))
+
 (define default-library
-  (string-append "libchicken." library-extension))
+  (string-append libchicken "." library-extension))
 
 (define default-compilation-optimization-options (string-split (if host-mode INSTALL_CFLAGS TARGET_CFLAGS)))
 (define best-compilation-optimization-options default-compilation-optimization-options)
@@ -915,9 +919,9 @@ EOF
     (when (and osx (or (not cross-chicken) host-mode))
       (command
        (string-append
-	"install_name_tool -change libchicken.dylib "
+	"install_name_tool -change " libchicken ".dylib "
 	(quotewrap 
-	 (let ((lib "libchicken.dylib"))
+	 (let ((lib (string-append libchicken ".dylib")))
 	   (if deployed
 	       (make-pathname "@executable_path" lib)
 	       (make-pathname
@@ -958,7 +962,7 @@ EOF
 (define (copy-libraries targetdir)
   (let ((lib (make-pathname
 	      (target-lib-path) 
-	      "libchicken"
+	      libchicken
 	      (cond (osx "dylib")
 		    (win "dll")
 		    (else (string-append
diff --git a/defaults.make b/defaults.make
index a16e5a5..87b6ef1 100644
--- a/defaults.make
+++ b/defaults.make
@@ -479,6 +479,9 @@ endif
 	echo "#ifndef C_BINARY_VERSION" >>$@
 	echo "# define C_BINARY_VERSION $(BINARYVERSION)" >>$@
 	echo "#endif" >>$@
+	echo "#ifndef C_PROGRAM_PREFIX" >>$@
+	echo "# define C_PROGRAM_PREFIX \"$(PROGRAM_PREFIX)\"" >>$@
+	echo "#endif" >>$@
 	echo "/* END OF FILE */" >>$@
 endif
 
diff --git a/eval.scm b/eval.scm
index 52e19f2..07b09d3 100644
--- a/eval.scm
+++ b/eval.scm
@@ -57,6 +57,7 @@
 (define-foreign-variable install-egg-home c-string "C_INSTALL_EGG_HOME")
 (define-foreign-variable installation-home c-string "C_INSTALL_SHARE_HOME")
 (define-foreign-variable binary-version int "C_BINARY_VERSION")
+(define-foreign-variable program-prefix c-string "C_PROGRAM_PREFIX")
 
 (define ##sys#core-library-modules
   '(extras lolevel utils files tcp irregex posix srfi-1 srfi-4 srfi-13 
@@ -67,7 +68,8 @@
 
 (define ##sys#explicit-library-modules '())
 
-(define-constant default-dynamic-load-libraries '("libchicken"))
+(define-constant default-dynamic-load-libraries
+  `(,(string-append "lib" program-prefix "chicken")))
 (define-constant cygwin-default-dynamic-load-libraries '("cygchicken-0"))
 (define-constant macosx-load-library-extension ".dylib")
 (define-constant windows-load-library-extension ".dll")
[ permalink | raw ]

s/define-constant/define/ for default-dynamic-load-libraries pasted by mario-goulart on Fri May 4 15:55:38 2012

diff --git a/csc.scm b/csc.scm
index 3ba5007..78eded9 100644
--- a/csc.scm
+++ b/csc.scm
@@ -61,6 +61,7 @@
 (define-foreign-variable CSC_PROGRAM c-string "C_CSC_PROGRAM")
 (define-foreign-variable WINDOWS_SHELL bool "C_WINDOWS_SHELL")
 (define-foreign-variable BINARY_VERSION int "C_BINARY_VERSION")
+(define-foreign-variable PROGRAM_PREFIX c-string "C_PROGRAM_PREFIX")
 
 
 ;;; Parameters:
@@ -119,8 +120,11 @@
 (define windows-shell WINDOWS_SHELL)
 (define generate-manifest #f)
 
+(define libchicken
+  (string-append "lib" PROGRAM_PREFIX "chicken"))
+
 (define default-library
-  (string-append "libchicken." library-extension))
+  (string-append libchicken "." library-extension))
 
 (define default-compilation-optimization-options (string-split (if host-mode INSTALL_CFLAGS TARGET_CFLAGS)))
 (define best-compilation-optimization-options default-compilation-optimization-options)
@@ -915,9 +919,9 @@ EOF
     (when (and osx (or (not cross-chicken) host-mode))
       (command
        (string-append
-	"install_name_tool -change libchicken.dylib "
+	"install_name_tool -change " libchicken ".dylib "
 	(quotewrap 
-	 (let ((lib "libchicken.dylib"))
+	 (let ((lib (string-append libchicken ".dylib")))
 	   (if deployed
 	       (make-pathname "@executable_path" lib)
 	       (make-pathname
@@ -958,7 +962,7 @@ EOF
 (define (copy-libraries targetdir)
   (let ((lib (make-pathname
 	      (target-lib-path) 
-	      "libchicken"
+	      libchicken
 	      (cond (osx "dylib")
 		    (win "dll")
 		    (else (string-append
diff --git a/defaults.make b/defaults.make
index a16e5a5..87b6ef1 100644
--- a/defaults.make
+++ b/defaults.make
@@ -479,6 +479,9 @@ endif
 	echo "#ifndef C_BINARY_VERSION" >>$@
 	echo "# define C_BINARY_VERSION $(BINARYVERSION)" >>$@
 	echo "#endif" >>$@
+	echo "#ifndef C_PROGRAM_PREFIX" >>$@
+	echo "# define C_PROGRAM_PREFIX \"$(PROGRAM_PREFIX)\"" >>$@
+	echo "#endif" >>$@
 	echo "/* END OF FILE */" >>$@
 endif
 
diff --git a/eval.scm b/eval.scm
index 52e19f2..e17b9da 100644
--- a/eval.scm
+++ b/eval.scm
@@ -57,6 +57,7 @@
 (define-foreign-variable install-egg-home c-string "C_INSTALL_EGG_HOME")
 (define-foreign-variable installation-home c-string "C_INSTALL_SHARE_HOME")
 (define-foreign-variable binary-version int "C_BINARY_VERSION")
+(define-foreign-variable program-prefix c-string "C_PROGRAM_PREFIX")
 
 (define ##sys#core-library-modules
   '(extras lolevel utils files tcp irregex posix srfi-1 srfi-4 srfi-13 
@@ -67,7 +68,8 @@
 
 (define ##sys#explicit-library-modules '())
 
-(define-constant default-dynamic-load-libraries '("libchicken"))
+(define default-dynamic-load-libraries
+  `(,(string-append "lib" program-prefix "chicken")))
 (define-constant cygwin-default-dynamic-load-libraries '("cygchicken-0"))
 (define-constant macosx-load-library-extension ".dylib")
 (define-constant windows-load-library-extension ".dll")
[ permalink | raw ]

Also fix tests for unhardcoded libchicken pasted by mario-goulart on Fri May 4 16:06:18 2012

diff --git a/csc.scm b/csc.scm
index 3ba5007..78eded9 100644
--- a/csc.scm
+++ b/csc.scm
@@ -61,6 +61,7 @@
 (define-foreign-variable CSC_PROGRAM c-string "C_CSC_PROGRAM")
 (define-foreign-variable WINDOWS_SHELL bool "C_WINDOWS_SHELL")
 (define-foreign-variable BINARY_VERSION int "C_BINARY_VERSION")
+(define-foreign-variable PROGRAM_PREFIX c-string "C_PROGRAM_PREFIX")
 
 
 ;;; Parameters:
@@ -119,8 +120,11 @@
 (define windows-shell WINDOWS_SHELL)
 (define generate-manifest #f)
 
+(define libchicken
+  (string-append "lib" PROGRAM_PREFIX "chicken"))
+
 (define default-library
-  (string-append "libchicken." library-extension))
+  (string-append libchicken "." library-extension))
 
 (define default-compilation-optimization-options (string-split (if host-mode INSTALL_CFLAGS TARGET_CFLAGS)))
 (define best-compilation-optimization-options default-compilation-optimization-options)
@@ -915,9 +919,9 @@ EOF
     (when (and osx (or (not cross-chicken) host-mode))
       (command
        (string-append
-	"install_name_tool -change libchicken.dylib "
+	"install_name_tool -change " libchicken ".dylib "
 	(quotewrap 
-	 (let ((lib "libchicken.dylib"))
+	 (let ((lib (string-append libchicken ".dylib")))
 	   (if deployed
 	       (make-pathname "@executable_path" lib)
 	       (make-pathname
@@ -958,7 +962,7 @@ EOF
 (define (copy-libraries targetdir)
   (let ((lib (make-pathname
 	      (target-lib-path) 
-	      "libchicken"
+	      libchicken
 	      (cond (osx "dylib")
 		    (win "dll")
 		    (else (string-append
diff --git a/defaults.make b/defaults.make
index a16e5a5..87b6ef1 100644
--- a/defaults.make
+++ b/defaults.make
@@ -479,6 +479,9 @@ endif
 	echo "#ifndef C_BINARY_VERSION" >>$@
 	echo "# define C_BINARY_VERSION $(BINARYVERSION)" >>$@
 	echo "#endif" >>$@
+	echo "#ifndef C_PROGRAM_PREFIX" >>$@
+	echo "# define C_PROGRAM_PREFIX \"$(PROGRAM_PREFIX)\"" >>$@
+	echo "#endif" >>$@
 	echo "/* END OF FILE */" >>$@
 endif
 
diff --git a/eval.scm b/eval.scm
index 52e19f2..e17b9da 100644
--- a/eval.scm
+++ b/eval.scm
@@ -57,6 +57,7 @@
 (define-foreign-variable install-egg-home c-string "C_INSTALL_EGG_HOME")
 (define-foreign-variable installation-home c-string "C_INSTALL_SHARE_HOME")
 (define-foreign-variable binary-version int "C_BINARY_VERSION")
+(define-foreign-variable program-prefix c-string "C_PROGRAM_PREFIX")
 
 (define ##sys#core-library-modules
   '(extras lolevel utils files tcp irregex posix srfi-1 srfi-4 srfi-13 
@@ -67,7 +68,8 @@
 
 (define ##sys#explicit-library-modules '())
 
-(define-constant default-dynamic-load-libraries '("libchicken"))
+(define default-dynamic-load-libraries
+  `(,(string-append "lib" program-prefix "chicken")))
 (define-constant cygwin-default-dynamic-load-libraries '("cygchicken-0"))
 (define-constant macosx-load-library-extension ".dylib")
 (define-constant windows-load-library-extension ".dll")
diff --git a/tests/runtests.bat b/tests/runtests.bat
index be16134..27ae889 100644
--- a/tests/runtests.bat
+++ b/tests/runtests.bat
@@ -12,7 +12,7 @@ set FAST_OPTIONS=-O5 -d0 -b -disable-interrupts
 
 set TYPESDB=..\types.db
 
-copy ..\libchicken.dll .
+copy ..\lib*chicken.dll .
 
 set compile=..\csc -compiler %CHICKEN% -v -I.. -L.. -include-path .. -o a.out
 set compile2=..\csc -compiler %CHICKEN% -v -I.. -L.. -include-path ..
diff --git a/tests/runtests.sh b/tests/runtests.sh
old mode 100644
new mode 100755
index 1ec59cd..4508e15
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -43,7 +43,7 @@ if test -n "$MSYSTEM"; then
     ASMFLAGS=-Wa,-w
     TIME=time
     # make compiled tests use proper library on Windows
-    cp ../libchicken.dll .
+    cp ../lib*chicken.dll .
 else 
     TIME=/usr/bin/time
 fi
[ permalink | raw ]

Also fix runbench.sh for unhardcoded libchicken (windows) added by mario-goulart on Fri May 4 16:09:55 2012

diff --git a/csc.scm b/csc.scm
index 3ba5007..78eded9 100644
--- a/csc.scm
+++ b/csc.scm
@@ -61,6 +61,7 @@
 (define-foreign-variable CSC_PROGRAM c-string "C_CSC_PROGRAM")
 (define-foreign-variable WINDOWS_SHELL bool "C_WINDOWS_SHELL")
 (define-foreign-variable BINARY_VERSION int "C_BINARY_VERSION")
+(define-foreign-variable PROGRAM_PREFIX c-string "C_PROGRAM_PREFIX")
 
 
 ;;; Parameters:
@@ -119,8 +120,11 @@
 (define windows-shell WINDOWS_SHELL)
 (define generate-manifest #f)
 
+(define libchicken
+  (string-append "lib" PROGRAM_PREFIX "chicken"))
+
 (define default-library
-  (string-append "libchicken." library-extension))
+  (string-append libchicken "." library-extension))
 
 (define default-compilation-optimization-options (string-split (if host-mode INSTALL_CFLAGS TARGET_CFLAGS)))
 (define best-compilation-optimization-options default-compilation-optimization-options)
@@ -915,9 +919,9 @@ EOF
     (when (and osx (or (not cross-chicken) host-mode))
       (command
        (string-append
-	"install_name_tool -change libchicken.dylib "
+	"install_name_tool -change " libchicken ".dylib "
 	(quotewrap 
-	 (let ((lib "libchicken.dylib"))
+	 (let ((lib (string-append libchicken ".dylib")))
 	   (if deployed
 	       (make-pathname "@executable_path" lib)
 	       (make-pathname
@@ -958,7 +962,7 @@ EOF
 (define (copy-libraries targetdir)
   (let ((lib (make-pathname
 	      (target-lib-path) 
-	      "libchicken"
+	      libchicken
 	      (cond (osx "dylib")
 		    (win "dll")
 		    (else (string-append
diff --git a/defaults.make b/defaults.make
index a16e5a5..87b6ef1 100644
--- a/defaults.make
+++ b/defaults.make
@@ -479,6 +479,9 @@ endif
 	echo "#ifndef C_BINARY_VERSION" >>$@
 	echo "# define C_BINARY_VERSION $(BINARYVERSION)" >>$@
 	echo "#endif" >>$@
+	echo "#ifndef C_PROGRAM_PREFIX" >>$@
+	echo "# define C_PROGRAM_PREFIX \"$(PROGRAM_PREFIX)\"" >>$@
+	echo "#endif" >>$@
 	echo "/* END OF FILE */" >>$@
 endif
 
diff --git a/eval.scm b/eval.scm
index 52e19f2..e17b9da 100644
--- a/eval.scm
+++ b/eval.scm
@@ -57,6 +57,7 @@
 (define-foreign-variable install-egg-home c-string "C_INSTALL_EGG_HOME")
 (define-foreign-variable installation-home c-string "C_INSTALL_SHARE_HOME")
 (define-foreign-variable binary-version int "C_BINARY_VERSION")
+(define-foreign-variable program-prefix c-string "C_PROGRAM_PREFIX")
 
 (define ##sys#core-library-modules
   '(extras lolevel utils files tcp irregex posix srfi-1 srfi-4 srfi-13 
@@ -67,7 +68,8 @@
 
 (define ##sys#explicit-library-modules '())
 
-(define-constant default-dynamic-load-libraries '("libchicken"))
+(define default-dynamic-load-libraries
+  `(,(string-append "lib" program-prefix "chicken")))
 (define-constant cygwin-default-dynamic-load-libraries '("cygchicken-0"))
 (define-constant macosx-load-library-extension ".dylib")
 (define-constant windows-load-library-extension ".dll")
diff --git a/tests/runbench.sh b/tests/runbench.sh
old mode 100644
new mode 100755
index 77a4e92..58587d6
--- a/tests/runbench.sh
+++ b/tests/runbench.sh
@@ -17,7 +17,7 @@ COMPILE_OPTIONS="-O5 -d0 -disable-interrupts -b"
 if test -n "$MSYSTEM"; then
     CHICKEN="..\\chicken.exe"
     # make compiled tests use proper library on Windows
-    cp ../libchicken.dll .
+    cp ../lib*chicken.dll .
 fi
 
 case `uname -s` in
diff --git a/tests/runtests.bat b/tests/runtests.bat
index be16134..27ae889 100644
--- a/tests/runtests.bat
+++ b/tests/runtests.bat
@@ -12,7 +12,7 @@ set FAST_OPTIONS=-O5 -d0 -b -disable-interrupts
 
 set TYPESDB=..\types.db
 
-copy ..\libchicken.dll .
+copy ..\lib*chicken.dll .
 
 set compile=..\csc -compiler %CHICKEN% -v -I.. -L.. -include-path .. -o a.out
 set compile2=..\csc -compiler %CHICKEN% -v -I.. -L.. -include-path ..
diff --git a/tests/runtests.sh b/tests/runtests.sh
old mode 100644
new mode 100755
index 1ec59cd..4508e15
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -43,7 +43,7 @@ if test -n "$MSYSTEM"; then
     ASMFLAGS=-Wa,-w
     TIME=time
     # make compiled tests use proper library on Windows
-    cp ../libchicken.dll .
+    cp ../lib*chicken.dll .
 else 
     TIME=/usr/bin/time
 fi
[ permalink | raw ]