apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r586626 - in /apr/apr-util/branches/1.2.x: aprutil.dsw test/testall.dsw
Date Fri, 19 Oct 2007 21:59:44 GMT
Author: wrowe
Date: Fri Oct 19 14:59:44 2007
New Revision: 586626

URL: http://svn.apache.org/viewvc?rev=586626&view=rev
Log:
Sync appropriate changes to 1.2.x, knowing that we don't
want to 'undo' the symbol polution in the static libraries
since some builds against 1.2 probably depend on this quirk.

Modified:
    apr/apr-util/branches/1.2.x/aprutil.dsw
    apr/apr-util/branches/1.2.x/test/testall.dsw

Modified: apr/apr-util/branches/1.2.x/aprutil.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/aprutil.dsw?rev=586626&r1=586625&r2=586626&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/aprutil.dsw (original)
+++ apr/apr-util/branches/1.2.x/aprutil.dsw Fri Oct 19 14:59:44 2007
@@ -15,6 +15,21 @@
 
 ###############################################################################
 
+Project: "apr_app"="..\apr\build\apr_app.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "apriconv"="..\apr-iconv\apriconv.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -63,6 +78,21 @@
 
 ###############################################################################
 
+Project: "libapr_app"="..\apr\build\libapr_app.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "libapriconv"="..\apr-iconv\libapriconv.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -92,9 +122,6 @@
     Begin Project Dependency
     Project_Dep_Name libapriconv
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libapriconv_ces_modules
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -130,6 +157,12 @@
     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

Modified: apr/apr-util/branches/1.2.x/test/testall.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/test/testall.dsw?rev=586626&r1=586625&r2=586626&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/test/testall.dsw (original)
+++ apr/apr-util/branches/1.2.x/test/testall.dsw Fri Oct 19 14:59:44 2007
@@ -15,6 +15,21 @@
 
 ###############################################################################
 
+Project: "apr_app"="..\..\apr\build\apr_app.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "apriconv"="..\..\apr-iconv\apriconv.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -39,6 +54,9 @@
 Package=<4>
 {{{
     Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name apriconv
     End Project Dependency
     Begin Project Dependency
@@ -60,6 +78,21 @@
 
 ###############################################################################
 
+Project: "libapr_app"="..\..\apr\build\libapr_app.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "libapriconv"="..\..\apr-iconv\libapriconv.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -89,9 +122,6 @@
     Begin Project Dependency
     Project_Dep_Name libapriconv
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libapriconv_ces_modules
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -129,13 +159,19 @@
     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: "testdll"="..\..\apr\test\testdll.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -147,17 +183,50 @@
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libapriconv
+    Project_Dep_Name libapr_app
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "testlib"="..\..\apr\test\testlib.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 apr_app
+    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
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libapr_app
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -178,6 +247,9 @@
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name aprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name apr_app
     End Project Dependency
 }}}
 



Mime
View raw message