apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r661018 - in /apr/apr-util/branches/1.3.x: aprutil.dsw build/preaprutil.dsp test/Makefile.win test/testall.dsw test/testutildll.dsp test/testutillib.dsp
Date Wed, 28 May 2008 17:06:24 GMT
Author: wrowe
Date: Wed May 28 10:06:24 2008
New Revision: 661018

URL: http://svn.apache.org/viewvc?rev=661018&view=rev
Log:
Revert to 1.2.x style build for binary compatibility; it was never
assumed when these changes went into trunk that httpd would ship
the 1.3.x release with httpd 2.2.x

Removed:
    apr/apr-util/branches/1.3.x/build/preaprutil.dsp
Modified:
    apr/apr-util/branches/1.3.x/aprutil.dsw
    apr/apr-util/branches/1.3.x/test/Makefile.win
    apr/apr-util/branches/1.3.x/test/testall.dsw
    apr/apr-util/branches/1.3.x/test/testutildll.dsp
    apr/apr-util/branches/1.3.x/test/testutillib.dsp

Modified: apr/apr-util/branches/1.3.x/aprutil.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/aprutil.dsw?rev=661018&r1=661017&r2=661018&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/aprutil.dsw (original)
+++ apr/apr-util/branches/1.3.x/aprutil.dsw Wed May 28 10:06:24 2008
@@ -15,7 +15,7 @@
 
 ###############################################################################
 
-Project: "aprapp"="..\apr\build\aprapp.dsp" - Package Owner=<4>
+Project: "apr_app"="..\apr\build\apr_app.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -24,7 +24,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name preaprapp
+    Project_Dep_Name apr
     End Project Dependency
 }}}
 
@@ -39,7 +39,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name preapriconv
+    Project_Dep_Name apr
     End Project Dependency
 }}}
 
@@ -54,9 +54,6 @@
 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
@@ -78,7 +75,7 @@
 
 ###############################################################################
 
-Project: "libaprapp"="..\apr\build\libaprapp.dsp" - Package Owner=<4>
+Project: "libapr_app"="..\apr\build\libapr_app.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -87,7 +84,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name prelibaprapp
+    Project_Dep_Name libapr
     End Project Dependency
 }}}
 
@@ -156,9 +153,6 @@
     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
@@ -174,69 +168,6 @@
 
 ###############################################################################
 
-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"=".\build\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
-}}}
-
-###############################################################################
-
 Project: "xml"=".\xml\expat\lib\xml.dsp" - Package Owner=<4>
 
 Package=<5>

Modified: apr/apr-util/branches/1.3.x/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/Makefile.win?rev=661018&r1=661017&r2=661018&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/Makefile.win (original)
+++ apr/apr-util/branches/1.3.x/test/Makefile.win Wed May 28 10:06:24 2008
@@ -3,7 +3,7 @@
 # ALL_TESTS
 #   test modules invoked through the abts suite (./testall)
 # OTHER_PROGRAMS
-#   programs such as sockperf, that have to be invoked in a special sequence
+#   programs such as sendfile, that have to be invoked in a special sequence
 #   or with special parameters
 
 # Windows Specific;
@@ -71,9 +71,7 @@
 	$(OUTDIR)\testall.exe
 
 OTHER_PROGRAMS = \
-	$(OUTDIR)\dbd.exe \
-	$(OUTDIR)\echod.exe \
-	$(OUTDIR)\sockperf.exe
+	$(OUTDIR)\dbd.exe
 
 # bring in rules.mk for standard functionality
 ALL: $(PROGRAMS) $(OTHER_PROGRAMS)
@@ -137,16 +135,6 @@
 	@if exist "$@.manifest" \
 	    mt.exe -manifest "$@.manifest" -outputresource:$@;1
 
-$(OUTDIR)\echod.exe: $(INTDIR)\echod.obj $(PROGRAM_DEPENDENCIES)
-	$(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS)
-	@if exist "$@.manifest" \
-	    mt.exe -manifest "$@.manifest" -outputresource:$@;1
-
-$(OUTDIR)\sockperf.exe: $(INTDIR)\sockperf.obj $(PROGRAM_DEPENDENCIES)
-	$(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS)
-	@if exist "$@.manifest" \
-	    mt.exe -manifest "$@.manifest" -outputresource:$@;1
-
 
 cleandata:
 	@for %f in ($(CLEAN_DATA)) do @if EXIST %f del /f %f
@@ -160,10 +148,8 @@
 	    @if EXIST %d\. rmdir /s /q %d
 
 
-!IF "$(MODEL)" == "static"
 PATH=$(OUTDIR);..\$(OUTDIR);$(API_PATH)\$(OUTDIR);$(APR_PATH)\$(APROUTDIR);$(PATH)
 APR_ICONV1_PATH=$(API_PATH)\$(OUTDIR)\iconv
-!ENDIF
 
 check: $(PROGRAMS) $(OTHER_PROGRAMS)
 	@for %p in ($(PROGRAMS)) do @( \

Modified: apr/apr-util/branches/1.3.x/test/testall.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/testall.dsw?rev=661018&r1=661017&r2=661018&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/testall.dsw (original)
+++ apr/apr-util/branches/1.3.x/test/testall.dsw Wed May 28 10:06:24 2008
@@ -15,7 +15,7 @@
 
 ###############################################################################
 
-Project: "aprapp"="..\..\apr\build\aprapp.dsp" - Package Owner=<4>
+Project: "apr_app"="..\..\apr\build\apr_app.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -24,7 +24,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name preaprapp
+    Project_Dep_Name apr
     End Project Dependency
 }}}
 
@@ -39,7 +39,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name preapriconv
+    Project_Dep_Name apr
     End Project Dependency
 }}}
 
@@ -54,9 +54,6 @@
 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
@@ -78,7 +75,7 @@
 
 ###############################################################################
 
-Project: "libaprapp"="..\..\apr\build\libaprapp.dsp" - Package Owner=<4>
+Project: "libapr_app"="..\..\apr\build\libapr_app.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -87,7 +84,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name prelibaprapp
+    Project_Dep_Name libapr
     End Project Dependency
 }}}
 
@@ -156,9 +153,6 @@
     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
@@ -174,69 +168,6 @@
 
 ###############################################################################
 
-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"="..\build\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
-}}}
-
-###############################################################################
-
 Project: "testdll"="..\..\apr\test\testdll.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -249,7 +180,7 @@
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libaprapp
+    Project_Dep_Name libapr_app
     End Project Dependency
 }}}
 
@@ -267,7 +198,7 @@
     Project_Dep_Name apr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name aprapp
+    Project_Dep_Name apr_app
     End Project Dependency
 }}}
 
@@ -285,14 +216,14 @@
     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 libaprutil
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libapr_app
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -309,14 +240,14 @@
     Project_Dep_Name apr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name aprapp
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name apriconv
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name aprutil
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name apr_app
+    End Project Dependency
 }}}
 
 ###############################################################################

Modified: apr/apr-util/branches/1.3.x/test/testutildll.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/testutildll.dsp?rev=661018&r1=661017&r2=661018&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/testutildll.dsp (original)
+++ apr/apr-util/branches/1.3.x/test/testutildll.dsp Wed May 28 10:06:24 2008
@@ -19,8 +19,8 @@
 !MESSAGE 
 !MESSAGE "testutildll - Win32 Release" (based on "Win32 (x86) External Target")
 !MESSAGE "testutildll - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE "testutildll - Win32 Release9x" (based on "Win32 (x86) External Target")
-!MESSAGE "testutildll - Win32 Debug9x" (based on "Win32 (x86) External Target")
+!MESSAGE "testutildll - Win32 ReleaseNT" (based on "Win32 (x86) External Target")
+!MESSAGE "testutildll - Win32 DebugNT" (based on "Win32 (x86) External Target")
 !MESSAGE "testutildll - x64 Release" (based on "Win32 (x86) External Target")
 !MESSAGE "testutildll - x64 Debug" (based on "Win32 (x86) External Target")
 !MESSAGE 
@@ -72,45 +72,45 @@
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!ELSEIF  "$(CFG)" == "testutildll - Win32 Release9x"
+!ELSEIF  "$(CFG)" == "testutildll - Win32 ReleaseNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir ""
 # PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Release OUTDIR=9x\Release MODEL=dynamic
all check"
+# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Release OUTDIR=NT\Release MODEL=dynamic
all check"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\Release\testall.exe"
+# PROP BASE Target_File "NT\Release\testall.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Release OUTDIR=9x\Release MODEL=dynamic
all check"
+# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Release OUTDIR=NT\Release MODEL=dynamic
all check"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\Release\testall.exe"
+# PROP Target_File "NT\Release\testall.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!ELSEIF  "$(CFG)" == "testutildll - Win32 Debug9x"
+!ELSEIF  "$(CFG)" == "testutildll - Win32 DebugNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir ""
 # PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Debug OUTDIR=9x\Debug MODEL=dynamic
_DEBUG=1 all check"
+# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Debug OUTDIR=NT\Debug MODEL=dynamic
_DEBUG=1 all check"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\Debug\testall.exe"
+# PROP BASE Target_File "NT\Debug\testall.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\Debug OUTDIR=9x\Debug MODEL=dynamic _DEBUG=1
all check"
+# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Debug OUTDIR=NT\Debug MODEL=dynamic _DEBUG=1
all check"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\Debug\testall.exe"
+# PROP Target_File "NT\Debug\testall.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
@@ -162,8 +162,8 @@
 
 # Name "testutildll - Win32 Release"
 # Name "testutildll - Win32 Debug"
-# Name "testutildll - Win32 Release9x"
-# Name "testutildll - Win32 Debug9x"
+# Name "testutildll - Win32 ReleaseNT"
+# Name "testutildll - Win32 DebugNT"
 # Name "testutildll - x64 Release"
 # Name "testutildll - x64 Debug"
 # Begin Group "testall Source Files"
@@ -261,18 +261,6 @@
 
 SOURCE=.\dbd.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\echod.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sockperf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testssl.c
-# End Source File
 # End Group
 # Begin Source File
 

Modified: apr/apr-util/branches/1.3.x/test/testutillib.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/testutillib.dsp?rev=661018&r1=661017&r2=661018&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/testutillib.dsp (original)
+++ apr/apr-util/branches/1.3.x/test/testutillib.dsp Wed May 28 10:06:24 2008
@@ -19,8 +19,8 @@
 !MESSAGE 
 !MESSAGE "testutillib - Win32 Release" (based on "Win32 (x86) External Target")
 !MESSAGE "testutillib - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE "testutillib - Win32 Release9x" (based on "Win32 (x86) External Target")
-!MESSAGE "testutillib - Win32 Debug9x" (based on "Win32 (x86) External Target")
+!MESSAGE "testutillib - Win32 ReleaseNT" (based on "Win32 (x86) External Target")
+!MESSAGE "testutillib - Win32 DebugNT" (based on "Win32 (x86) External Target")
 !MESSAGE "testutillib - x64 Release" (based on "Win32 (x86) External Target")
 !MESSAGE "testutillib - x64 Debug" (based on "Win32 (x86) External Target")
 !MESSAGE 
@@ -72,45 +72,45 @@
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!ELSEIF  "$(CFG)" == "testutillib - Win32 Release9x"
+!ELSEIF  "$(CFG)" == "testutillib - Win32 ReleaseNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir ""
 # PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibR OUTDIR=9x\LibR MODEL=static all
check"
+# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibR OUTDIR=NT\LibR MODEL=static all
check"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\LibR\testall.exe"
+# PROP BASE Target_File "NT\LibR\testall.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibR OUTDIR=9x\LibR MODEL=static all check"
+# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibR OUTDIR=NT\LibR MODEL=static all check"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\LibR\testall.exe"
+# PROP Target_File "NT\LibR\testall.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
-!ELSEIF  "$(CFG)" == "testutillib - Win32 Debug9x"
+!ELSEIF  "$(CFG)" == "testutillib - Win32 DebugNT"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir ""
 # PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibD OUTDIR=9x\LibD MODEL=static _DEBUG=1
all check"
+# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibD OUTDIR=NT\LibD MODEL=static _DEBUG=1
all check"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "9x\LibD\testall.exe"
+# PROP BASE Target_File "NT\LibD\testall.exe"
 # PROP BASE Bsc_Name ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=9x\LibD OUTDIR=9x\LibD MODEL=static _DEBUG=1
all check"
+# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibD OUTDIR=NT\LibD MODEL=static _DEBUG=1
all check"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "9x\LibD\testall.exe"
+# PROP Target_File "NT\LibD\testall.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
@@ -162,8 +162,8 @@
 
 # Name "testutillib - Win32 Release"
 # Name "testutillib - Win32 Debug"
-# Name "testutillib - Win32 Release9x"
-# Name "testutillib - Win32 Debug9x"
+# Name "testutillib - Win32 ReleaseNT"
+# Name "testutillib - Win32 DebugNT"
 # Name "testutillib - x64 Release"
 # Name "testutillib - x64 Debug"
 # Begin Group "testall Source Files"
@@ -261,18 +261,6 @@
 
 SOURCE=.\dbd.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\echod.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sockperf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testssl.c
-# End Source File
 # End Group
 # Begin Source File
 



Mime
View raw message