apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r586618 - in /apr/apr/branches/1.2.x: apr.dsp apr.dsw libapr.dsp test/testdll.dsp test/testlib.dsp
Date Fri, 19 Oct 2007 21:39:15 GMT
Author: wrowe
Date: Fri Oct 19 14:39:14 2007
New Revision: 586618

URL: http://svn.apache.org/viewvc?rev=586618&view=rev
Log:
Sync some build schema changes and corrections with trunk,
but essentially leave the 'polluted' static libraries
untouched, so that anyone building against 1.2.x encounters
no surprises.

Modified:
    apr/apr/branches/1.2.x/apr.dsp
    apr/apr/branches/1.2.x/apr.dsw
    apr/apr/branches/1.2.x/libapr.dsp
    apr/apr/branches/1.2.x/test/testdll.dsp
    apr/apr/branches/1.2.x/test/testlib.dsp

Modified: apr/apr/branches/1.2.x/apr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/apr.dsp?rev=586618&r1=586617&r2=586618&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/apr.dsp (original)
+++ apr/apr/branches/1.2.x/apr.dsp Fri Oct 19 14:39:14 2007
@@ -380,10 +380,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\poll\unix\select.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\network_io\win32\sendrecv.c
 # End Source File
 # Begin Source File
@@ -405,6 +401,14 @@
 # Begin Source File
 
 SOURCE=.\passwd\apr_getpass.c
+# End Source File
+# End Group
+# Begin Group "poll"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\poll\unix\select.c
 # End Source File
 # End Group
 # Begin Group "random"

Modified: apr/apr/branches/1.2.x/apr.dsw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/apr.dsw?rev=586618&r1=586617&r2=586618&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/apr.dsw (original)
+++ apr/apr/branches/1.2.x/apr.dsw Fri Oct 19 14:39:14 2007
@@ -15,7 +15,7 @@
 
 ###############################################################################
 
-Project: "apr_app"=".\build\apr_app.dsp" - Package Owner=<4>
+Project: "aprapp"=".\build\aprapp.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -24,7 +24,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name apr
+    Project_Dep_Name preaprapp
     End Project Dependency
 }}}
 
@@ -42,7 +42,37 @@
 
 ###############################################################################
 
-Project: "libapr_app"=".\build\libapr_app.dsp" - Package Owner=<4>
+Project: "libaprapp"=".\build\libaprapp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name prelibaprapp
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "preaprapp"=".\build\preaprapp.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "prelibaprapp"=".\build\prelibaprapp.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{

Modified: apr/apr/branches/1.2.x/libapr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/libapr.dsp?rev=586618&r1=586617&r2=586618&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/libapr.dsp (original)
+++ apr/apr/branches/1.2.x/libapr.dsp Fri Oct 19 14:39:14 2007
@@ -432,10 +432,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\poll\unix\select.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\network_io\win32\sendrecv.c
 # End Source File
 # Begin Source File
@@ -457,6 +453,14 @@
 # Begin Source File
 
 SOURCE=.\passwd\apr_getpass.c
+# End Source File
+# End Group
+# Begin Group "poll"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\poll\unix\select.c
 # End Source File
 # End Group
 # Begin Group "random"

Modified: apr/apr/branches/1.2.x/test/testdll.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/testdll.dsp?rev=586618&r1=586617&r2=586618&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/test/testdll.dsp (original)
+++ apr/apr/branches/1.2.x/test/testdll.dsp Fri Oct 19 14:39:14 2007
@@ -72,7 +72,7 @@
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!IF  "$(CFG)" == "testdll - Win32 ReleaseNT"
+!ELSEIF  "$(CFG)" == "testdll - Win32 ReleaseNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -114,7 +114,7 @@
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!IF  "$(CFG)" == "testdll - x64 Release"
+!ELSEIF  "$(CFG)" == "testdll - x64 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0

Modified: apr/apr/branches/1.2.x/test/testlib.dsp
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/testlib.dsp?rev=586618&r1=586617&r2=586618&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/test/testlib.dsp (original)
+++ apr/apr/branches/1.2.x/test/testlib.dsp Fri Oct 19 14:39:14 2007
@@ -72,7 +72,7 @@
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!IF  "$(CFG)" == "testlib - Win32 ReleaseNT"
+!ELSEIF  "$(CFG)" == "testlib - Win32 ReleaseNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -114,7 +114,7 @@
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!IF  "$(CFG)" == "testlib - x64 Release"
+!ELSEIF  "$(CFG)" == "testlib - x64 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0



Mime
View raw message