apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r586246 - in /apr/apr-util/trunk: aprutil.dsw test/Makefile.win test/testall.dsw
Date Fri, 19 Oct 2007 03:35:47 GMT
Author: wrowe
Date: Thu Oct 18 20:35:47 2007
New Revision: 586246

URL: http://svn.apache.org/viewvc?rev=586246&view=rev
Log:
Catch up with the introduction of pre(staticlib) targets
to stop contaminating other libraries, and catch up with
some test build changes.

Modified:
    apr/apr-util/trunk/aprutil.dsw
    apr/apr-util/trunk/test/Makefile.win
    apr/apr-util/trunk/test/testall.dsw

Modified: apr/apr-util/trunk/aprutil.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/aprutil.dsw?rev=586246&r1=586245&r2=586246&view=diff
==============================================================================
--- apr/apr-util/trunk/aprutil.dsw (original)
+++ apr/apr-util/trunk/aprutil.dsw Thu Oct 18 20:35:47 2007
@@ -15,6 +15,21 @@
 
 ###############################################################################
 
+Project: "aprapp"="..\apr\build\aprapp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name preaprapp
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "apriconv"="..\apr-iconv\apriconv.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -24,7 +39,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name apr
+    Project_Dep_Name preapriconv
     End Project Dependency
 }}}
 
@@ -39,7 +54,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name apr
+    Project_Dep_Name preaprutil
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name apriconv
@@ -63,6 +78,21 @@
 
 ###############################################################################
 
+Project: "libaprapp"="..\apr\build\libaprapp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name prelibaprapp
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "libapriconv"="..\apr-iconv\libapriconv.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -129,10 +159,82 @@
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprapp
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libapriconv
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libapriconv_ccs_modules
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libapriconv_ces_modules
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name xml
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "preaprapp"="..\apr\build\preaprapp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "preapriconv"="..\apr-iconv\build\preapriconv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "preaprutil"=".\preaprutil.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprapp
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "prelibaprapp"="..\apr\build\prelibaprapp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
     End Project Dependency
 }}}
 

Modified: apr/apr-util/trunk/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/Makefile.win?rev=586246&r1=586245&r2=586246&view=diff
==============================================================================
--- apr/apr-util/trunk/test/Makefile.win (original)
+++ apr/apr-util/trunk/test/Makefile.win Thu Oct 18 20:35:47 2007
@@ -50,9 +50,9 @@
 
 CLEAN_BUILDDIRS = Debug Release LibD LibR 9x x64
 
-PROGRAMS = $(OUTDIR)\testall.exe
+PROGRAMS = $(OUTDIR)\testall.exe $(OUTDIR)\testssl.exe
 
-OTHER_PROGRAMS = $(OUTDIR)\dbd.exe $(OUTDIR)\testssl.exe \
+OTHER_PROGRAMS = $(OUTDIR)\dbd.exe \
 	$(OUTDIR)\echod.exe $(OUTDIR)\sockperf.exe
 
 # bring in rules.mk for standard functionality
@@ -67,13 +67,11 @@
 !IF "$(MODEL)" == "static"
 PROGRAM_DEPENDENCIES = \
 	$(APR_PATH)\$(OUTDIR)\apr-1.lib \
-	$(API_PATH)\$(OUTDIR)\apriconv-1.lib \
 	..\$(OUTDIR)\aprutil-1.lib 
 STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
 !ELSE
 PROGRAM_DEPENDENCIES = \
 	$(APR_PATH)\$(OUTDIR)\libapr-1.lib \
-	$(API_PATH)\$(OUTDIR)\libapriconv-1.lib \
 	..\$(OUTDIR)\libaprutil-1.lib 
 STATIC_CFLAGS = 
 !ENDIF
@@ -146,7 +144,7 @@
 
 
 PATH=$(OUTDIR);..\$(OUTDIR);$(API_PATH)\$(OUTDIR);$(APR_PATH)\$(OUTDIR);$(PATH)
-APR_ICONV1_PATH=$(API_PATH)\$(OUTDIR)\iconv
+set APR_ICONV1_PATH=$(API_PATH)\$(OUTDIR)\iconv
 
 check: $(PROGRAMS) $(OTHER_PROGRAMS)
 	@for %p in ($(PROGRAMS)) do @( \

Modified: apr/apr-util/trunk/test/testall.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/testall.dsw?rev=586246&r1=586245&r2=586246&view=diff
==============================================================================
--- apr/apr-util/trunk/test/testall.dsw (original)
+++ apr/apr-util/trunk/test/testall.dsw Thu Oct 18 20:35:47 2007
@@ -15,6 +15,21 @@
 
 ###############################################################################
 
+Project: "aprapp"="..\..\apr\build\aprapp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name preaprapp
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "apriconv"="..\..\apr-iconv\apriconv.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -24,7 +39,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name apr
+    Project_Dep_Name preapriconv
     End Project Dependency
 }}}
 
@@ -39,6 +54,9 @@
 Package=<4>
 {{{
     Begin Project Dependency
+    Project_Dep_Name preaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name apriconv
     End Project Dependency
     Begin Project Dependency
@@ -60,6 +78,21 @@
 
 ###############################################################################
 
+Project: "libaprapp"="..\..\apr\build\libaprapp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name prelibaprapp
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "libapriconv"="..\..\apr-iconv\libapriconv.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -126,16 +159,25 @@
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprapp
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libapriconv
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libapriconv_ccs_modules
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libapriconv_ces_modules
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name xml
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "testutildll"=".\testutildll.dsp" - Package Owner=<4>
+Project: "preaprapp"="..\..\apr\build\preaprapp.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -144,16 +186,73 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name libapr
+    Project_Dep_Name apr
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "preapriconv"="..\..\apr-iconv\build\preapriconv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
     Begin Project Dependency
-    Project_Dep_Name libapriconv
+    Project_Dep_Name apr
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "preaprutil"="..\preaprutil.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
     Begin Project Dependency
-    Project_Dep_Name libapriconv_ccs_modules
+    Project_Dep_Name apr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libapriconv_ces_modules
+    Project_Dep_Name aprapp
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "prelibaprapp"="..\..\apr\build\prelibaprapp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "testutildll"=".\testutildll.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libapriconv
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name libaprutil



Mime
View raw message