Return-Path: 
 <commits-return-8100-apmail-apr-commits-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-commits-archive@www.apache.org
Received: (qmail 99769 invoked from network); 11 Jan 2007 05:00:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 Jan 2007 05:00:03 -0000
Received: (qmail 10810 invoked by uid 500); 11 Jan 2007 05:00:10 -0000
Delivered-To: apmail-apr-commits-archive@apr.apache.org
Received: (qmail 10774 invoked by uid 500); 11 Jan 2007 05:00:10 -0000
Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:commits@apr.apache.org>
List-Help: <mailto:commits-help@apr.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
List-Id: <commits.apr.apache.org>
Delivered-To: mailing list commits@apr.apache.org
Received: (qmail 10763 invoked by uid 99); 11 Jan 2007 05:00:09 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jan 2007 21:00:09 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jan 2007 21:00:02 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6B9891A981A; Wed, 10 Jan 2007 20:59:02 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r495117 - /apr/apr/trunk/build/fixwin32mak.pl
Date: Thu, 11 Jan 2007 04:59:02 -0000
To: commits@apr.apache.org
From: wrowe@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070111045902.6B9891A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: wrowe
Date: Wed Jan 10 20:59:01 2007
New Revision: 495117

URL: http://svn.apache.org/viewvc?view=rev&rev=495117
Log:
Revert the changes to fixwin32mak.pl - not tested, and didn't
intend to commit this

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

Modified: apr/apr/trunk/build/fixwin32mak.pl
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/fixwin32mak.pl?view=diff&rev=495117&r1=495116&r2=495117
==============================================================================
--- apr/apr/trunk/build/fixwin32mak.pl (original)
+++ apr/apr/trunk/build/fixwin32mak.pl Wed Jan 10 20:59:01 2007
@@ -14,9 +14,7 @@
 # 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 @@
 	$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; 
 	}