Repositories / ecl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2f869e6)
msvc: fix testing and package targets
authorDaniel Kochmański <daniel@turtleware.eu>
Fri, 21 Aug 2015 17:48:30 +0000 (19:48 +0200)
committerDaniel Kochmański <daniel@turtleware.eu>
Fri, 21 Aug 2015 17:48:30 +0000 (19:48 +0200)
Signed-off-by: Daniel Kochmański <daniel@turtleware.eu>
msvc/Makefile patch | blob | blame | history
msvc/tests/Makefile patch | blob | blame | history

diff --git a/msvc/Makefile b/msvc/Makefile
index 5aaf050..d5f255b 100755 (executable)
--- a/msvc/Makefile
+++ b/msvc/Makefile
@@ -393,7 +393,7 @@ install:
        for /f %i in ('type MODULES') do $(CP) %i "$(libdir)"
        for %i in (ecl-static.lib) do IF EXIST %i $(CP) %i "$(libdir)"
        IF NOT EXIST "$(docdir)" $(MKDIR) "$(docdir)"
-       for %i in (..\Copyright ..\ANNOUNCEMENT ..\LGPL ..\README.1st ..\src\CHANGELOG) do $(CP) %i "$(docdir)"
+       for %i in (..\Copyright ..\LGPL ..\README.1st ..\CHANGELOG) do $(CP) %i "$(docdir)"
 !if "$(ECL_UNICODE)" != ""
        IF NOT EXIST "$(libdir)\encodings" $(MKDIR) "$(libdir)\encodings"
        $(CP) encodings\*.* "$(libdir)\encodings"
@@ -402,10 +402,12 @@ install:
 check: package\ecl.exe
        cd tests
        $(MAKE)
+
 recheck: package\ecl.exe
        cd tests
        $(MAKE) clean
        $(MAKE)
+
 package\ecl.exe: ecl2$(EXE)
        $(MAKE) install ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE) 
 
diff --git a/msvc/tests/Makefile b/msvc/tests/Makefile
index fb061fe..d8bcbfd 100755 (executable)
--- a/msvc/tests/Makefile
+++ b/msvc/tests/Makefile
@@ -1,55 +1,45 @@
-top_srcdir=..\..\r
-ECLDIR=../package/\r
-ECL=..\package\ecl.exe\r
-\r
-all: output.ecl\ansi.log output.ecl\regressions.log\r
-\r
-.PHONY: do-ansi do-regressions do-quicklisp cleanup clean-sources update\r
-\r
-config.lsp: $(top_srcdir)\src\tests\config.lsp.in ..\c\cut.exe Makefile\r
-       ..\c\cut.exe "@builddir@" "./" \\r
-                 "@top_srcdir@" "../.." \\r
-         < $(top_srcdir)\src\tests\config.lsp.in > config.lsp\r
-\r
-output.ecl\ansi.log: config.lsp\r
-       $(MAKE) do-ansi\r
-output.ecl\regressions.log: config.lsp\r
-       $(MAKE) do-regressions\r
-\r
-do-ansi: ansi-tests config.lsp\r
-       set ECLDIR=$(ECLDIR)\r
-       $(ECL) -norc -load config.lsp -eval "(ecl-tests::run-ansi-tests)" -eval "(ext:quit)"\r
-do-regressions: regressions config.lsp\r
-       set ECLDIR=$(ECLDIR)\r
-       $(ECL) -norc -load config.lsp -eval "(ecl-tests::run-regressions-tests)" -eval "(ext:quit)"\r
-do-quicklisp: quicklisp config.lsp\r
-       set ECLDIR=$(ECLDIR)\r
-       $(ECL) -norc -load config.lsp -eval "(ecl-tests::run-quicklisp-tests)" -eval "(ext:quit)"\r
-\r
-#\r
-# Create directories\r
-#\r
-ansi-tests: config.lsp\r
-       set ECLDIR=$(ECLDIR)\r
-       $(ECL) -norc -load config.lsp -eval "(ecl-tests::ensure-ansi-tests)" -eval "(ext:quit)"\r
-regressions: config.lsp\r
-       set ECLDIR=$(ECLDIR)\r
-       $(ECL) -norc -load config.lsp -eval "(ecl-tests::ensure-regressions)" -eval "(ext:quit)"\r
-quicklisp: config.lsp\r
-       set ECLDIR=$(ECLDIR)\r
-       $(ECL) -norc -load config.lsp -eval "(ecl-tests::ensure-quicklisp)" -eval "(ext:quit)"\r
-\r
-#\r
-# Cleanup\r
-#\r
-clean:\r
-       rm -rf output*\r
-clean-sources:\r
-       test -f config.lsp.in || rm -rf bugs\r
-       rm -rf ansi-tests quicklisp\r
-distclean: clean-sources clean\r
-       rm -rf cache\r
-\r
-update: clean-sources\r
-       $(MAKE) ansi-tests regressions quicklisp\r
-\r
+top_srcdir=..\..
+ECLDIR=../package/
+ECL=..\package\ecl.exe
+
+all: show-fails
+
+.PHONY: do-regressions cleanup clean-sources update
+
+config.lsp: $(top_srcdir)\src\tests\config.lsp.in ..\c\cut.exe Makefile
+       ..\c\cut.exe "@builddir@" "./" \
+                 "@top_srcdir@" "../.." \
+         < $(top_srcdir)\src\tests\config.lsp.in > config.lsp
+
+output.ecl\regressions.log: config.lsp
+       $(MAKE) do-regressions
+
+do-regressions: regressions config.lsp
+       set ECLDIR=$(ECLDIR)
+       $(ECL) -norc -load config.lsp -eval "(ecl-tests::run-regressions-tests)" -eval "(ext:quit)"
+
+show-fails: regressions.log
+       type regressions.log
+
+#
+# Create directories
+#
+regressions.log: config.lsp
+       $(MAKE) do-regressions
+
+#
+# Cleanup
+#
+clean:
+       rm -rf output*
+
+clean-sources:
+       test -f config.lsp.in || rm -rf bugs
+       rm -rf ansi-tests quicklisp
+
+distclean: clean-sources clean
+       rm -rf cache
+
+update: clean-sources
+       $(MAKE) regressions
+
Embeddable Common Lisp (Official: https://gitlab.com/embeddable-common-lisp/ecl)