~ chicken-core (chicken-5) 21a4cae9701bf34e87741ac360e4f160da79a739
commit 21a4cae9701bf34e87741ac360e4f160da79a739
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Jan 12 13:21:47 2010 +0100
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Tue Jan 12 13:21:47 2010 +0100
handle numeric version in upgrade message
diff --git a/Makefile.mingw b/Makefile.mingw
index 8976da0b..67971b1c 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -89,10 +89,10 @@ POSIXFILE = posixwin
# select default and internal settings
CUSTOM_CHICKEN_DEFAULTS=1
-TARGETS = libchickengui$(SO) libchickengui$(A)
-
include $(SRCDIR)defaults.make
+TARGETS += libchickengui$(SO) libchickengui$(A)
+
chicken-config.h: chicken-defaults.h
echo #define HAVE_DIRENT_H 1 >$@
echo #define HAVE_INTTYPES_H 1 >>$@
diff --git a/Makefile.mingw-msys b/Makefile.mingw-msys
index b8bd2443..1f78f811 100644
--- a/Makefile.mingw-msys
+++ b/Makefile.mingw-msys
@@ -78,10 +78,10 @@ POSIXFILE = posixwin
# select default and internal settings
-TARGETS = libchickengui$(SO) libchickengui$(A)
-
include $(SRCDIR)/defaults.make
+TARGETS += libchickengui$(SO) libchickengui$(A)
+
chicken-config.h: chicken-defaults.h
echo "#define HAVE_DIRENT_H 1" >$@
echo "#define HAVE_INTTYPES_H 1" >>$@
diff --git a/compiler.scm b/compiler.scm
index f9f31cd2..8dd0eff8 100644
--- a/compiler.scm
+++ b/compiler.scm
@@ -1487,7 +1487,7 @@
[f-id (gensym 'stub)]
[bufvar (gensym)]
[rsize (estimate-foreign-result-size rtype)] )
- (when sname (set-real-name! f-id (string->symbol sname)))
+ (set-real-name! f-id #t)
(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 2dc0e03f..ae66cd1f 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 e80e5e60..2ca7e9fe 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 (string-append ":" version) "")) ) )
+ ext msg ext (if version (conc ":" version) "")) ) )
(define (required-extension-version . args)
(let loop ((args args))
Trap