From 82ccc61d52a67e49bdd4e077fc135ff7f53231cd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Kochma=C5=84ski?= <daniel@turtleware.eu>
Date: Fri, 21 Aug 2015 19:48:30 +0200
Subject: [PATCH] msvc: fix testing and package targets
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Kochmański <daniel@turtleware.eu>
---
 msvc/Makefile       |   4 ++-
 msvc/tests/Makefile | 100 +++++++++++++++++++++++-----------------------------
 2 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/msvc/Makefile b/msvc/Makefile
index 5aaf050..d5f255b 100755
--- 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
--- a/msvc/tests/Makefile
+++ b/msvc/tests/Makefile
@@ -1,55 +1,45 @@
-top_srcdir=..\..
-ECLDIR=../package/
-ECL=..\package\ecl.exe
-
-all: output.ecl\ansi.log output.ecl\regressions.log
-
-.PHONY: do-ansi do-regressions do-quicklisp 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\ansi.log: config.lsp
-	$(MAKE) do-ansi
-output.ecl\regressions.log: config.lsp
-	$(MAKE) do-regressions
-
-do-ansi: ansi-tests config.lsp
-	set ECLDIR=$(ECLDIR)
-	$(ECL) -norc -load config.lsp -eval "(ecl-tests::run-ansi-tests)" -eval "(ext:quit)"
-do-regressions: regressions config.lsp
-	set ECLDIR=$(ECLDIR)
-	$(ECL) -norc -load config.lsp -eval "(ecl-tests::run-regressions-tests)" -eval "(ext:quit)"
-do-quicklisp: quicklisp config.lsp
-	set ECLDIR=$(ECLDIR)
-	$(ECL) -norc -load config.lsp -eval "(ecl-tests::run-quicklisp-tests)" -eval "(ext:quit)"
-
-#
-# Create directories
-#
-ansi-tests: config.lsp
-	set ECLDIR=$(ECLDIR)
-	$(ECL) -norc -load config.lsp -eval "(ecl-tests::ensure-ansi-tests)" -eval "(ext:quit)"
-regressions: config.lsp
-	set ECLDIR=$(ECLDIR)
-	$(ECL) -norc -load config.lsp -eval "(ecl-tests::ensure-regressions)" -eval "(ext:quit)"
-quicklisp: config.lsp
-	set ECLDIR=$(ECLDIR)
-	$(ECL) -norc -load config.lsp -eval "(ecl-tests::ensure-quicklisp)" -eval "(ext:quit)"
-
-#
-# 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) ansi-tests regressions quicklisp
-
+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
+
-- 
2.9.0