~ chicken-core (chicken-5) 836da54ead8b3162b815d1cc2c56fe2163ba1c71
commit 836da54ead8b3162b815d1cc2c56fe2163ba1c71
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Wed Jan 13 07:24:34 2010 +0100
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Wed Jan 13 07:24:34 2010 +0100
Revert "handle numeric version in upgrade message"
This reverts commit 21a4cae9701bf34e87741ac360e4f160da79a739.
diff --git a/Makefile.mingw b/Makefile.mingw
index 67971b1c..8976da0b 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -89,9 +89,9 @@ POSIXFILE = posixwin
# select default and internal settings
CUSTOM_CHICKEN_DEFAULTS=1
-include $(SRCDIR)defaults.make
+TARGETS = libchickengui$(SO) libchickengui$(A)
-TARGETS += libchickengui$(SO) libchickengui$(A)
+include $(SRCDIR)defaults.make
chicken-config.h: chicken-defaults.h
echo #define HAVE_DIRENT_H 1 >$@
diff --git a/Makefile.mingw-msys b/Makefile.mingw-msys
index 1f78f811..b8bd2443 100644
--- a/Makefile.mingw-msys
+++ b/Makefile.mingw-msys
@@ -78,9 +78,9 @@ POSIXFILE = posixwin
# select default and internal settings
-include $(SRCDIR)/defaults.make
+TARGETS = libchickengui$(SO) libchickengui$(A)
-TARGETS += libchickengui$(SO) libchickengui$(A)
+include $(SRCDIR)/defaults.make
chicken-config.h: chicken-defaults.h
echo "#define HAVE_DIRENT_H 1" >$@
diff --git a/compiler.scm b/compiler.scm
index 8dd0eff8..f9f31cd2 100644
--- a/compiler.scm
+++ b/compiler.scm
@@ -1487,7 +1487,7 @@
[f-id (gensym 'stub)]
[bufvar (gensym)]
[rsize (estimate-foreign-result-size rtype)] )
- (set-real-name! f-id #t)
+ (when sname (set-real-name! f-id (string->symbol sname)))
(set! foreign-lambda-stubs
(cons (make-foreign-stub f-id rtype sname argtypes argnames body cps callback)
foreign-lambda-stubs) )
diff --git a/defaults.make b/defaults.make
index ae66cd1f..2dc0e03f 100644
--- a/defaults.make
+++ b/defaults.make
@@ -328,7 +328,7 @@ CSI_STATIC_EXECUTABLE = $(CSI_PROGRAM)$(EXE)
CHICKEN_SHARED_EXECUTABLE = $(CHICKEN_PROGRAM)-shared$(EXE)
CSI_SHARED_EXECUTABLE = $(CSI_PROGRAM)-shared$(EXE)
TARGETLIBS ?= libchicken$(A) libuchicken$(A)
-TARGETS ?= $(TARGETLIBS) $(CHICKEN_STATIC_EXECUTABLE) \
+TARGETS += $(TARGETLIBS) $(CHICKEN_STATIC_EXECUTABLE) \
$(CSI_STATIC_EXECUTABLE) $(CHICKEN_PROFILE_PROGRAM)$(EXE) \
$(CSC_PROGRAM)$(EXE) \
$(CHICKEN_BUG_PROGRAM)$(EXE)
@@ -339,7 +339,7 @@ CHICKEN_SHARED_EXECUTABLE = $(CHICKEN_PROGRAM)$(EXE)
CSI_SHARED_EXECUTABLE = $(CSI_PROGRAM)$(EXE)
TARGETLIBS ?= libchicken$(A) libuchicken$(A) \
$(LIBCHICKEN_SO_FILE) $(LIBUCHICKEN_SO_FILE)
-TARGETS ?= $(TARGETLIBS) $(CHICKEN_SHARED_EXECUTABLE) \
+TARGETS += $(TARGETLIBS) $(CHICKEN_SHARED_EXECUTABLE) \
$(CSI_SHARED_EXECUTABLE) $(CHICKEN_PROFILE_PROGRAM)$(EXE) \
$(CSC_PROGRAM)$(EXE) $(CHICKEN_INSTALL_PROGRAM)$(EXE) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE) \
$(CHICKEN_STATUS_PROGRAM)$(EXE) setup-download.so setup-api.so \
diff --git a/setup-api.scm b/setup-api.scm
index 2ca7e9fe..e80e5e60 100644
--- a/setup-api.scm
+++ b/setup-api.scm
@@ -634,7 +634,7 @@
(error
(sprintf
"the required extension `~s' ~a - please run~%~% chicken-install ~a~a~%~%and repeat the current installation operation."
- ext msg ext (if version (conc ":" version) "")) ) )
+ ext msg ext (if version (string-append ":" version) "")) ) )
(define (required-extension-version . args)
(let loop ((args args))
Trap