diff options
author | William A. Rowe Jr <wrowe@apache.org> | 2007-01-11 04:59:01 +0000 |
---|---|---|
committer | William A. Rowe Jr <wrowe@apache.org> | 2007-01-11 04:59:01 +0000 |
commit | f79179f11ea0f16d7d9c4d89309e34504eea4573 (patch) | |
tree | 3f9fd4edb575c710d8058eef5cce132b8bdf612b /build/fixwin32mak.pl | |
parent | 03d05e5ae69811c46ecc5c4c7a049c0483753824 (diff) | |
download | apr-f79179f11ea0f16d7d9c4d89309e34504eea4573.tar.gz |
Revert the changes to fixwin32mak.pl - not tested, and didn't
intend to commit this
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@495117 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/fixwin32mak.pl')
-rw-r--r-- | build/fixwin32mak.pl | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/build/fixwin32mak.pl b/build/fixwin32mak.pl index 3012984df..9ee8918e9 100644 --- a/build/fixwin32mak.pl +++ b/build/fixwin32mak.pl @@ -14,9 +14,7 @@ $root = cwd; # ignore our own direcory (allowing us to move into any parallel tree) $root =~ s|^.:(.*)?$|cd "$1|; $root =~ s|/|\\\\|g; -$altroot = $root; -$altroot =~ s| ".:| "|; -print "Stripping " . $root . " and " . $altroot . "\n"; +print "Testing " . $root . "\n"; find(\&fixcwd, '.'); sub fixcwd { @@ -25,29 +23,26 @@ sub fixcwd { $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; } |