apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r495116 - in /apr/apr/trunk: build/fixwin32mak.pl libapr.dsp test/testapp.dsp test/testappnt.dsp
Date Thu, 11 Jan 2007 04:57:29 GMT
Author: wrowe
Date: Wed Jan 10 20:57:28 2007
New Revision: 495116

URL: http://svn.apache.org/viewvc?view=rev&rev=495116
Log:
Spent more time observing MSVC6's default syntax, change some
path delims to their 'preferred' style.

Modified:
    apr/apr/trunk/build/fixwin32mak.pl
    apr/apr/trunk/libapr.dsp
    apr/apr/trunk/test/testapp.dsp
    apr/apr/trunk/test/testappnt.dsp

Modified: apr/apr/trunk/build/fixwin32mak.pl
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/fixwin32mak.pl?view=diff&rev=495116&r1=495115&r2=495116
==============================================================================
--- apr/apr/trunk/build/fixwin32mak.pl (original)
+++ apr/apr/trunk/build/fixwin32mak.pl Wed Jan 10 20:57:28 2007
@@ -14,7 +14,9 @@
 # ignore our own direcory (allowing us to move into any parallel tree)
 $root =~ s|^.:(.*)?$|cd "$1|;
 $root =~ s|/|\\\\|g;
-print "Testing " . $root . "\n";
+$altroot = $root;
+$altroot =~ s| ".:| "|;
+print "Stripping " . $root . " and " . $altroot . "\n";
 find(\&fixcwd, '.');
 
 sub fixcwd { 
@@ -23,26 +25,29 @@
 	$thisroot =~ s|^./(.*)$|$1|;
 	$thisroot =~ s|/|\\\\|g;
         $thisroot = $root . "\\\\" . $thisroot;
+        $thisaltroot = $altroot . "\\\\" . $thisroot;
         $oname = $_;
 	$tname = '.#' . $_;
 	$verchg = 0;
-#print "Processing " . $thisroot . " of " . $_ . "\n";
 	$srcfl = new IO::File $_, "r" || die;
 	$dstfl = new IO::File $tname, "w" || die;
 	while ($src = <$srcfl>) {
 	    if ($src =~ m|^\s*($root[^\"]*)\".*$|) {
-#print "Found " . $1 . "\"\n";
 		$orig = $thisroot;
+            } elsif ($src =~ m|^\s*($altroot[^\"]*)\".*$|) {
+		$orig = $thisaltroot;
+            }
+            if (defined($orig)) {
                 $repl = "cd \".";
                 while (!($src =~ s|$orig|$repl|)) {
-#print "Tried replacing " . $orig . " with " . $repl . "\n";
 		   if (!($orig =~ s|^(.*)\\\\[^\\]+$|$1|)) {
                        break;
                    }
 		   $repl .= "\\..";
 		}
-#print "Replaced " . $orig . " with " . $repl . "\n";
+print "Replaced " . $orig . " with " . $repl . "\n";
 		$verchg = -1;
+                undef $orig;
 	    }
             print $dstfl $src; 
 	}

Modified: apr/apr/trunk/libapr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/trunk/libapr.dsp?view=diff&rev=495116&r1=495115&r2=495116
==============================================================================
--- apr/apr/trunk/libapr.dsp (original)
+++ apr/apr/trunk/libapr.dsp Wed Jan 10 20:57:28 2007
@@ -55,9 +55,9 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"Release/libapr-1.dll"
/opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:".\Release\libapr-1.dll"
/opt:ref
 # Begin Special Build Tool
-TargetPath=./Release/libapr-1.dll
+TargetPath=.\Release\libapr-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
@@ -87,9 +87,9 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"Debug/libapr-1.dll"
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:".\Debug\libapr-1.dll"
 # Begin Special Build Tool
-TargetPath=./Debug/libapr-1.dll
+TargetPath=.\Debug\libapr-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2

Modified: apr/apr/trunk/test/testapp.dsp
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testapp.dsp?view=diff&rev=495116&r1=495115&r2=495116
==============================================================================
--- apr/apr/trunk/test/testapp.dsp (original)
+++ apr/apr/trunk/test/testapp.dsp Wed Jan 10 20:57:28 2007
@@ -32,13 +32,13 @@
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "."
+# PROP BASE Intermediate_Dir "."
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "."
+# PROP Intermediate_Dir "."
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /FD /c
@@ -52,7 +52,7 @@
 # ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
 # ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
 # Begin Special Build Tool
-TargetPath=./Release/testapp.exe
+TargetPath=.\testapp.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
@@ -82,7 +82,7 @@
 # ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /debug
 # ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /debug
 # Begin Special Build Tool
-TargetPath=././testapp.exe
+TargetPath=.\testapp.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2

Modified: apr/apr/trunk/test/testappnt.dsp
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testappnt.dsp?view=diff&rev=495116&r1=495115&r2=495116
==============================================================================
--- apr/apr/trunk/test/testappnt.dsp (original)
+++ apr/apr/trunk/test/testappnt.dsp Wed Jan 10 20:57:28 2007
@@ -32,13 +32,13 @@
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "."
+# PROP BASE Intermediate_Dir "."
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "."
+# PROP Intermediate_Dir "."
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "WINNT" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
@@ -52,7 +52,7 @@
 # ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
 # ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /entry:"wmainCRTStartup"
/subsystem:console
 # Begin Special Build Tool
-TargetPath=./Release/testappnt.exe
+TargetPath=.\testappnt.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
@@ -82,7 +82,7 @@
 # ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /debug
 # ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /entry:"wmainCRTStartup"
/subsystem:console /incremental:no /debug
 # Begin Special Build Tool
-TargetPath=././testappnt.exe
+TargetPath=.\testappnt.exe
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2



Mime
View raw message