~ chicken-core (chicken-5) 65c919288b0d4acba71dde0000cc562dae6e0098

commit 65c919288b0d4acba71dde0000cc562dae6e0098
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Fri Jan 8 11:08:19 2010 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Fri Jan 8 11:08:19 2010 +0100

    enabled branchname for msys, fix in mini-s., -no-trace for import libs

diff --git a/Makefile.mingw b/Makefile.mingw
index ff260153..415abb1c 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -31,6 +31,7 @@ endif
 
 SEP = $(strip \)
 SRCDIR =.$(SEP)
+BRANCHNAME =
 
 # platform configuration
 
diff --git a/defaults.make b/defaults.make
index bd9acd75..2881aa9b 100644
--- a/defaults.make
+++ b/defaults.make
@@ -43,6 +43,7 @@ SEP ?= /
 SRCDIR ?= .$(SEP)
 DESTDIR ?=
 PREFIX ?= /usr/local
+BRANCHNAME ?= $(shell scripts/identify-branch $(SRCDIR))
 
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
@@ -57,7 +58,6 @@ CHICKENLIBDIR = $(VARDIR)/chicken
 EGGDIR = $(CHICKENLIBDIR)/$(BINARYVERSION)
 
 ifdef WINDOWS_SHELL
-BRANCHNAME = ""
 SPREFIX = $(subst /,$(SEP),$(PREFIX))
 IBINDIR = $(SPREFIX)$(SEP)bin
 ILIBDIR = $(SPREFIX)$(SEP)lib
@@ -70,7 +70,6 @@ IDOCDIR = $(IDATADIR)$(SEP)doc
 ICHICKENLIBDIR = $(ILIBDIR)$(SEP)chicken
 IEGGDIR = $(ICHICKENLIBDIR)$(SEP)$(BINARYVERSION)
 else
-BRANCHNAME = $(shell scripts/identify-branch $(SRCDIR))
 SPREFIX = $(PREFIX)
 IBINDIR = $(BINDIR)
 ILIBDIR = $(LIBDIR)
@@ -300,7 +299,7 @@ CHICKEN_PROGRAM_OPTIONS = $(CHICKEN_OPTIONS) -no-lambda-info -local
 CHICKEN_COMPILER_OPTIONS = $(CHICKEN_PROGRAM_OPTIONS) -extend private-namespace.scm
 CHICKEN_UNSAFE_OPTIONS = -unsafe -no-lambda-info
 CHICKEN_DYNAMIC_OPTIONS = $(CHICKEN_OPTIONS) -feature chicken-compile-shared -dynamic
-CHICKEN_IMPORT_LIBRARY_OPTIONS = $(CHICKEN_DYNAMIC_OPTIONS)
+CHICKEN_IMPORT_LIBRARY_OPTIONS = $(CHICKEN_DYNAMIC_OPTIONS) -no-trace
 
 ifndef DEBUGBUILD
 CHICKEN_PROGRAM_OPTIONS += -no-trace
diff --git a/scripts/mini-salmonella.scm b/scripts/mini-salmonella.scm
index 85fadd9b..1315d1e1 100644
--- a/scripts/mini-salmonella.scm
+++ b/scripts/mini-salmonella.scm
@@ -94,7 +94,7 @@
     (let ((status (system command)))
       (cond ((zero? status)
 	     (report egg "OK")
-	     (set! *succeeded* (add1 *succeeded)))
+	     (set! *succeeded* (add1 *succeeded*)))
 	    (else
 	     (report egg "FAILED")
 	     (set! *failed* (add1 *failed*))
@@ -117,6 +117,7 @@
 	   (report egg "<no .meta file>")))))
  (directory *eggdir*))
 
-(print "\nSucceeded: " *succeeded* ", failed: " *failed*)
+(print "\nSucceeded: " *succeeded* ", failed: " *failed* ", total: "
+       (+ *succeeded* *failed*))
 
 )