msvc: fix testing and package targets

Signed-off-by: Daniel Kochmański <daniel@turtleware.eu>
This commit is contained in:
Daniel Kochmański 2015-08-21 19:48:30 +02:00
parent 2f869e6eb6
commit 82ccc61d52
2 changed files with 48 additions and 56 deletions

View file

@ -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)

View file

@ -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