svn commit: r426571 - /apr/apr/trunk/build/cvtdsp.pl

[wr...@apache.org]

Author: wrowe
Date: Fri Jul 28 08:41:11 2006
New Revision: 426571

URL: http://svn.apache.org/viewvc?rev=426571&view=rev
Log:

  Munger for VC RC (resource compile) /d Foo=Bar syntax flavors.
  Old VC (5/6) accepts only /d Foo="Bar Bash", 2005 only accepts
  /d "Foo=Bar Bash"

Modified:
    apr/apr/trunk/build/cvtdsp.pl

Modified: apr/apr/trunk/build/cvtdsp.pl
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/cvtdsp.pl?rev=426571&r1=426570&r2=426571&view=diff
==============================================================================
--- apr/apr/trunk/build/cvtdsp.pl (original)
+++ apr/apr/trunk/build/cvtdsp.pl Fri Jul 28 08:41:11 2006
@@ -63,6 +63,9 @@
 	    if ($src =~ s|^(# ADD BASE CPP .*)/EHsc (.*)|$1/GX $2|) {
 		$verchg = -1;
 	    }
+	    while ($src =~ s|^(# ADD RSC .*)/d "([^ ="]+)=([^"]+)"|$1/d $2="$3"|) {
+		$verchg = -1;
+	    }
 	    if ($src !~ m|^# PROP AllowPerConfigDependencies|) {
 		print $dstfl $src; }
 	    else {
@@ -105,6 +108,9 @@
 	    if ($src =~ s|^(# ADD BASE CPP .*)/GX (.*)|$1/EHsc $2|) {
 		$verchg = -1;
 	    }
+	    while ($src =~ s|^(# ADD RSC .*)/d "([^ ="]+)=([^"]+)"|$1/d $2="$3"|) {
+		$verchg = -1;
+	    }
             print $dstfl $src; 
 	    if ($verchg && $src =~ m|^# Begin Project|) {
 		print $dstfl "# PROP AllowPerConfigDependencies 0\n"; 
@@ -136,6 +142,9 @@
 		$verchg = -1;
 	    }
 	    if ($src =~ s|(\bLINK32.*) /machine:I386(.*)|$1$2|) {
+		$verchg = -1;
+	    }
+	    if ($src =~ s|^(# ADD RSC .*)/d ([^ ="]+)="([^"]+)"|$1/d "$2=$3"|) {
 		$verchg = -1;
 	    }
             print $dstfl $src;