~ chicken-core (chicken-5) 919a7c7c4e5a89f3c3b940ef85b5b2bd3a289997
commit 919a7c7c4e5a89f3c3b940ef85b5b2bd3a289997
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Mon Oct 31 08:56:36 2011 +0100
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Mon Oct 31 08:56:36 2011 +0100
fixes in build + Windows test script, added note to README (thanks to mario)
diff --git a/README b/README
index 289a1289..8d0d0679 100644
--- a/README
+++ b/README
@@ -453,7 +453,9 @@
- When installing under mingw, with a windows shell
("cmd.exe"), pass an absolute pathname (including the
- drive letter) as PREFIX and use forward slashes.
+ drive letter) as PREFIX and use forward slashes. If you
+ are building the sources from git, but use backslashes to
+ specify the path zo `chicken' (the "CHICKEN" variable).
- When installing under mingw without MSYS, make sure that the
MSYS tools (in case you have some of them, in particular the
diff --git a/rules.make b/rules.make
index 7d5b1296..7383e7f8 100644
--- a/rules.make
+++ b/rules.make
@@ -650,15 +650,18 @@ testclean:
.PHONY: check
-check: $(CHICKEN_SHARED_EXECUTABLE) $(CSI_SHARED_EXECUTABLE) $(CSC_PROGRAM)
+check: $(CHICKEN_SHARED_EXECUTABLE) $(CSI_SHARED_EXECUTABLE) $(CSC_PROGRAM)$(EXE)
+ifndef WINDOWS_SHELL
cd tests; sh runtests.sh
-
+else
+ cd tests & runtests.bat
+endif
# benchmark
.PHONY: bench
-bench: $(CHICKEN_SHARED_EXECUTABLE) $(CSI_SHARED_EXECUTABLE) $(CSC_PROGRAM)
+bench: $(CHICKEN_SHARED_EXECUTABLE) $(CSI_SHARED_EXECUTABLE) $(CSC_PROGRAM)$(EXE)
cd tests; echo >>bench.log; date >>bench.log; sh runbench.sh 2>&1 | tee -a bench.log
@@ -672,7 +675,7 @@ boot-chicken:
C_COMPILER_OPTIMIZATION_OPTIONS= C_HACKED_APPLY= BUILDING_CHICKEN_BOOT=1 \
confclean chicken-boot-stage1$(EXE)
$(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
- CHICKEN=chicken-boot-stage1$(EXE) PROGRAM_SUFFIX=-boot \
+ CHICKEN=.$(SEP)chicken-boot-stage1$(EXE) PROGRAM_SUFFIX=-boot \
STATICBUILD=1 C_COMPILER_OPTIMIZATION_OPTIONS= \
touchfiles chicken-boot$(EXE) confclean
diff --git a/tests/runtests.bat b/tests/runtests.bat
index 879d5759..1b82aa9e 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
-cp ..\libchicken.dll .
+copy ..\libchicken.dll .
set compile=..\csc -compiler %CHICKEN% -v -I.. -L.. -include-path .. -o a.out
set compile2=..\csc -compiler %CHICKEN% -v -I.. -L.. -include-path ..
Trap