2006-02-17 Eric Seidel <eseidel@apple.com>

        Reviewed by hyatt.

        Make Win32 have the same default "WebKitBuild" directory behavior.

        * Scripts/build-webkit:
        * Scripts/webkitdirs.pm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12881 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0608924f3f2c79c9bc5990439da5b8808fd83182..b9ce1da449a278d5fea65b2c32ccda32d0256b24 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-17  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by hyatt.
+
+        Make Win32 have the same default "WebKitBuild" directory behavior.
+
+        * Scripts/build-webkit:
+        * Scripts/webkitdirs.pm:
+
 2006-02-17  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by Beth.

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 0d9171e9b0f20b100532735ce40a2aa92cb3a2ea..73eb0b007e54974b1c0fc7b1e7ec47da1115fc1d 100755 (executable)
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -82,6 +82,7 @@ if (isCygwin()) {
     $devenvPath = "$programFilesPath/Microsoft Visual Studio 8/Common7/IDE/devenv.exe";
     $cygwinTmpPath = `cygpath -w /tmp`;
     chomp $cygwinTmpPath;
+    print "Building results into: ", baseProductDir(), "\n";
 }
 
 # Force re-link of existing libraries if different than expected

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 742245781cd28f1d993759d9a0927f94f504f70c..33b97f014f3ffc91f0cdd563cc46c2f576f3e85b 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -67,20 +67,37 @@ sub determineBaseProductDir
 {
     return if defined $baseProductDir;
     determineSourceDir();
-    open PRODUCT, "defaults read com.apple.Xcode PBXProductDirectory 2> /dev/null |" or die;
-    $baseProductDir = <PRODUCT>;
-    close PRODUCT;
-    if ($baseProductDir) {
+    if (isOSX()) {
+        open PRODUCT, "defaults read com.apple.Xcode PBXProductDirectory 2> /dev/null |" or die;
+        $baseProductDir = <PRODUCT>;
+        close PRODUCT;
         chomp $baseProductDir;
+    } else {
+        $baseProductDir = $ENV{"WebKitOutputDir"};
+        if (isCygwin() && $baseProductDir) {
+            my $unixBuildPath = `cygpath --unix \"$baseProductDir\"`;
+            chomp $unixBuildPath;
+            $baseProductDir = $unixBuildPath;
+        }
+    }
+
+    if ($baseProductDir && isOSX()) {
         $baseProductDir =~ s|^\Q$(SRCROOT)/..\E$|$sourceDir|;
         $baseProductDir =~ s|^\Q$(SRCROOT)/../|$sourceDir/|;
         $baseProductDir =~ s|^~/|$ENV{HOME}/|;
         die "Can't handle Xcode product directory with a ~ in it.\n" if $baseProductDir =~ /~/;
         die "Can't handle Xcode product directory with a variable in it.\n" if $baseProductDir =~ /\$/;
         @baseProductDirOption = ();
-    } else {
+    }
+
+    if (!defined($baseProductDir)) {
         $baseProductDir = "$sourceDir/WebKitBuild";
-        @baseProductDirOption = ("SYMROOT=$baseProductDir");
+        @baseProductDirOption = ("SYMROOT=$baseProductDir") if (isOSX());
+        if (isCygwin()) {
+            my $dosBuildPath = `cygpath --windows \"$baseProductDir\"`;
+            chomp $dosBuildPath;
+            $ENV{"WebKitOutputDir"} = $dosBuildPath;
+        }
     }
 }