[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apr-cvs
Subject:    svn commit: r495128 - /apr/apr/branches/1.2.x/build/cvtdsp.pl
From:       wrowe () apache ! org
Date:       2007-01-11 5:38:12
Message-ID: 20070111053813.3AD941A981A () eris ! apache ! org
[Download RAW message or body]

Author: wrowe
Date: Wed Jan 10 21:38:11 2007
New Revision: 495128

URL: http://svn.apache.org/viewvc?view=rev&rev=495128
Log:
Correct the path syntax for link /out: and the manifest's
InputFile specification

Modified:
    apr/apr/branches/1.2.x/build/cvtdsp.pl

Modified: apr/apr/branches/1.2.x/build/cvtdsp.pl
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/build/cvtdsp.pl?view=diff&rev=495128&r1=495127&r2=495128
 ==============================================================================
--- apr/apr/branches/1.2.x/build/cvtdsp.pl (original)
+++ apr/apr/branches/1.2.x/build/cvtdsp.pl Wed Jan 10 21:38:11 2007
@@ -39,6 +39,7 @@
     print "Specify -w3 or -w4 for .dsp build with warning level 3 or 4 \
                (strict)\n\n";
     print "Specify -ia64 for build targeted at Itanium (req's psdk tools)\n\n";
     print "Specify -p for extreme pool debugging\n\n";
+    print "Specify -mt to add .manifest embedding\n\n";
     die "Missing argument";
 }
 
@@ -62,11 +63,13 @@
                 $outdir = $1;
                 $outpath = $oname;
                 $outpath =~ s|\.dsp||;
-                $outpath =  "./" . $outdir . "/" . $outpath . $outtype;
+                $outpath =  ".\\" . $outdir . "\\" . $outpath . $outtype;
 	    }
-	    if ($src =~ m|^# ADD LINK32 .+ /out:"([^"]+)"|) {
-                $outpath = $1;
-                $outpath = "./" . $outpath if (!($outpath =~ m|^\.|));
+	    if ($src =~ m|^# ADD (BASE )?LINK32 .+ /out:"([^"]+)"|) {
+	        $outpath = $2;
+                $outpath =~ s|/|\\|;
+                $outpath = ".\\" . $outpath if (!($outpath =~ m|^\.|));
+                $src =~ s|/out:"([^"]+)"|/out:"$outpath"|;
 	    }
 	    if (defined($outpath) && ($src =~ m|^# Begin Special Build Tool|)) {
                 undef $outpath;


[prev in list] [next in list] [prev in thread] [next in thread]