A slighly more inventive method of cleaning up abs paths from .mak files

  I worked up before the machines went down [yup - data is recovered.]


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62906 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 18 insertions, 10 deletions

diff --git a/build/fixwin32mak.pl b/build/fixwin32mak.pl
index c3f6acf86..fa2d1b4eb 100644
--- a/build/fixwin32mak.pl
+++ b/build/fixwin32mak.pl
@@ -12,28 +12,36 @@ use File::Find;
 
 $root = cwd;
 # ignore our own direcory (allowing us to move into any parallel tree)
-$root =~ s|^.:(.*)/.*?$|cd "$1|;
+$root =~ s|^.:(.*)?$|cd "$1|;
 $root =~ s|/|\\\\|g;
 print "Testing " . $root . "\n";
 find(\&fixcwd, '.');
 
 sub fixcwd { 
     if (m|.mak$|) {
-# note repl is broken... isn't freindly to directories with periods.
-	$repl = $File::Find::dir;
-# replace ./ with the parent (moving into any parallel tree)
-        $repl =~ s|^\./|../|;
-# replace each directory in this path with .. to get back to our root
-        $repl =~ s|[^/]+|..|g;
-        $repl =~ s|/|\\|;
+        $thisroot = $File::Find::dir;
+	$thisroot =~ s|^./(.*)$|$1|;
+	$thisroot =~ s|/|\\\\|g;
+        $thisroot = $root . "\\\\" . $thisroot;
         $oname = $_;
 	$tname = '.#' . $_;
 	$verchg = 0;
-print "Processing " . $_ . "\n";
+#print "Processing " . $thisroot . " of " . $_ . "\n";
 	$srcfl = new IO::File $_, "r" || die;
 	$dstfl = new IO::File $tname, "w" || die;
 	while ($src = <$srcfl>) {
-	    if ($src =~ s|^(\s*)$root|$1cd "$repl|) {
+	    if ($src =~ m|^\s*($root[^\"]*)\".*$|) {
+#print "Found " . $1 . "\"\n";
+		$orig = $thisroot;
+                $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";
 		$verchg = -1;
 	    }
             print $dstfl $src;