apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r583035 - in /apr/apr/trunk/test: Makefile.win internal/Makefile.win
Date Tue, 09 Oct 2007 02:07:33 GMT
Author: wrowe
Date: Mon Oct  8 19:07:33 2007
New Revision: 583035

URL: http://svn.apache.org/viewvc?rev=583035&view=rev
Log:
Hook up internal/Makefile.win similarly to internal/Makefile.in
on unix.

Added:
    apr/apr/trunk/test/internal/Makefile.win   (with props)
Modified:
    apr/apr/trunk/test/Makefile.win

Modified: apr/apr/trunk/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/Makefile.win?rev=583035&r1=583034&r2=583035&view=diff
==============================================================================
--- apr/apr/trunk/test/Makefile.win (original)
+++ apr/apr/trunk/test/Makefile.win Mon Oct  8 19:07:33 2007
@@ -77,9 +77,11 @@
 	$(INTDIR)\testfilecopy.obj $(INTDIR)\testtemp.obj $(INTDIR)\testlfs.obj \
 	$(INTDIR)\testcond.obj
 
-CLEAN_TARGETS = testfile.tmp lfstests/large.bin \
-	data/testputs.txt data/testbigfprintf.dat \
-	data/testwritev.txt data/testwritev_full.txt
+CLEAN_DATA = testfile.tmp lfstests\large.bin \
+	data\testputs.txt data\testbigfprintf.dat \
+	data\testwritev.txt data\testwritev_full.txt
+CLEAN_SUBDIRS = internal
+CLEAN_BUILDDIRS = Debug Release LibD LibR 9x x64
 
 PROGRAMS = $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS)
 
@@ -88,8 +90,6 @@
 # bring in rules.mk for standard functionality
 ALL: $(TARGETS)
 
-clean:
-
 CL = cl.exe
 LD = link.exe 
 
@@ -127,45 +127,57 @@
 .c{$(OUTDIR)}.exe:
 	$(CL) $(CFLAGS) -c $** -Fd$(INTDIR)\ $(INCLUDES) 
 	$(LD) $(LDFLAGS) /out:"$@" $*.obj $(LD_LIBS)
-	if exist "$@.manifest" \
+	@if exist "$@.manifest" \
 	    mt.exe -manifest "$@.manifest" -outputresource:$@;1
 
 {$(INTDIR)}.obj{$(OUTDIR)}.exe:
 	$(LD) $(LDFLAGS) /out:"$@" $*.obj $(LD_LIBS)
-	if exist "$@.manifest" \
+	@if exist "$@.manifest" \
 	    mt.exe -manifest "$@.manifest" -outputresource:$@;1
 
 $(OUTDIR)\mod_test.dll: $(INTDIR)/mod_test.obj
 	$(LD) $(SHLDFLAGS) /out:"$@" $** \
 	       /export:print_hello /export:count_reps $(LD_LIBS)
-	if exist "$@.manifest" \
+	@if exist "$@.manifest" \
 	    mt.exe -manifest "$@.manifest" -outputresource:$@;2
 
 $(OUTDIR)\testapp.exe: $(INTDIR)/testapp.obj
 	$(LD) $(LDFLAGS) /out:"$@" $** \
 	      /entry:wmainCRTStartup $(APP_LIB) $(LD_LIBS)
-	if exist "$@.manifest" \
+	@if exist "$@.manifest" \
 	    mt.exe -manifest "$@.manifest" -outputresource:$@;2
 
 $(OUTDIR)\testall.exe: $(ALL_TESTS) $(INTDIR)\abts.obj
 	$(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS)
-	if exist "$@.manifest" \
+	@if exist "$@.manifest" \
 	    mt.exe -manifest "$@.manifest" -outputresource:$@;1
 
 
-clean:
-	for %f in ($(CLEAN_TARGETS)) do del /f %f
-	rmdir /s /q $(OUTDIR)
-!IF "$(OUTDIR)" != "$(INTDIR)"
-	rmdir /s /q $(OUTDIR)
-!ENDIF
+cleandata:
+	@for %f in ($(CLEAN_DATA)) do @if EXIST %f del /f %f
+
+clean: cleandata
+	@if EXIST $(INTDIR)\. rmdir /s /q $(INTDIR)
+	@if EXIST $(OUTDIR)\. rmdir /s /q $(OUTDIR)
+	@for %d in ($(CLEAN_SUBDIRS)) do \
+	    %COMSPEC% /c "cd %%d && $(MAKE) -f Makefile.win clean" \
+
+cleanall: 
+	@for %d in ($(CLEAN_BUILDDIRS) $(INTDIR) $(OUTDIR)) do \
+	    @if EXIST %d\. rmdir /s /q %d
+	@for %d in ($(CLEAN_SUBDIRS)) do \
+	    %COMSPEC% /c "cd %%d & $(MAKE) -f Makefile.win cleanall" \
 
 
 PATH=$(OUTDIR);..\$(OUTDIR);$(PATH)
 
 check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
-	for %p in ($(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)) do @( \
-	    echo Testing %p && %p || echo "%p failed" \
+	@for %p in ($(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)) do @( \
+	    echo Testing %p && %p || echo %p failed \
 	)
+
+checkall: check
+	@for %d in ($(CLEAN_SUBDIRS)) do \
+	    %COMSPEC% /c "cd %%d && $(MAKE) -f Makefile.win check" \
 
 # DO NOT REMOVE

Added: apr/apr/trunk/test/internal/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/internal/Makefile.win?rev=583035&view=auto
==============================================================================
--- apr/apr/trunk/test/internal/Makefile.win (added)
+++ apr/apr/trunk/test/internal/Makefile.win Mon Oct  8 19:07:33 2007
@@ -0,0 +1,107 @@
+# PROGRAMS includes all test programs built on this platform.
+# STDTEST_PORTABLE
+#   test programs invoked via standard user interface, run on all platforms
+# STDTEST_NONPORTABLE
+#   test programs invoked via standard user interface, not portable
+# OTHER_PROGRAMS
+#   programs such as sendfile, that have to be invoked in a special sequence
+#   or with special parameters
+
+!IFNDEF MODEL
+MODEL=dynamic
+!ENDIF
+
+INCDIR=../../include
+
+!IFNDEF OUTDIR
+!IF "$(MODEL)" == "static"
+OUTDIR=LibR
+!ELSE
+OUTDIR=Release
+!ENDIF
+
+!IF [$(COMSPEC) /c cl /nologo /? | find "x64" >NUL ] == 0
+OUTDIR=x64\$(OUTDIR)
+!ENDIF
+!ENDIF
+
+!IF !EXIST("$(OUTDIR)\.")
+!IF ([$(COMSPEC) /C mkdir $(OUTDIR)] == 0)
+!ENDIF
+!ENDIF
+
+!IFNDEF INTDIR
+INTDIR=$(OUTDIR)
+!ELSE
+!IF !EXIST("$(INTDIR)\.")
+!IF ([$(COMSPEC) /C mkdir $(INTDIR)] == 0)
+!ENDIF
+!ENDIF
+!ENDIF
+
+!MESSAGE Building tests into $(OUTDIR) for $(MODEL)
+
+NONPORTABLE = \
+	$(OUTDIR)\testucs.exe
+
+CLEAN_BUILDDIRS = Release Debug 9x x64
+
+PROGRAMS = 
+
+TARGETS = $(PROGRAMS) $(NONPORTABLE)
+
+# bring in rules.mk for standard functionality
+ALL: $(TARGETS)
+
+CL = cl.exe
+LD = link.exe 
+
+!IF "$(MODEL)" == "static"
+LOCAL_LIB= ..\..\$(OUTDIR)\apr-1.lib 
+STATIC_CFLAGS = /D APR_DECLARE_STATIC
+!ELSE
+LOCAL_LIB= ..\..\$(OUTDIR)\libapr-1.lib 
+STATIC_CFLAGS = 
+!ENDIF
+
+!IFDEF _DEBUG
+DEBUG_CFLAGS = /MDd
+!ELSE
+DEBUG_CFLAGS = /MD 
+!ENDIF
+
+INCLUDES=/I "$(INCDIR)"
+
+CFLAGS = /nologo /c /W3 /Gm /EHsc /Zi /Od $(INCLUDES) \
+	 $(STATIC_CFLAGS) $(DEBUG_CFLAGS) /D "BINPATH=$(OUTDIR:\=/)" \
+	 /D _DEBUG /D WIN32 /Fo"$(INTDIR)/" /FD
+
+LD_LIBS = $(LOCAL_LIB) kernel32.lib advapi32.lib ws2_32.lib wsock32.lib \
+	  ole32.lib shell32.lib rpcrt4.lib
+
+LDFLAGS = /nologo /debug /subsystem:console /incremental:no 
+SHLDFLAGS = /nologo /dll /debug /subsystem:windows /incremental:no
+
+.c{$(OUTDIR)}.exe:
+	$(CL) $(CFLAGS) -c $** -Fd$(INTDIR)\ $(INCLUDES) 
+	$(LD) $(LDFLAGS) /out:"$@" $*.obj $(LD_LIBS)
+	@if exist "$@.manifest" \
+	    mt.exe -manifest "$@.manifest" -outputresource:$@;1
+
+
+clean:
+	@if EXIST $(INTDIR)\. rmdir /s /q $(INTDIR)
+	@if EXIST $(OUTDIR)\. rmdir /s /q $(OUTDIR)
+
+cleanall:
+	@for %d in ($(CLEAN_BUILDDIRS)) do @if EXIST %d\. rmdir /s /q %d
+
+
+PATH=$(OUTDIR);..\..\$(OUTDIR);$(PATH)
+
+check: $(NONPORTABLE)
+	@for %p in ($(NONPORTABLE)) do @( \
+	    echo Testing %p && %p || echo %p failed \
+	)
+
+# DO NOT REMOVE

Propchange: apr/apr/trunk/test/internal/Makefile.win
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message