Reviewed by Maciej.

        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3397
          Build DumpRenderTree fails with unresolved NSAutoreleasePool, etc

        * DumpRenderTree/DumpRenderTree.xcode/project.pbxproj: Change type from "folder" to "wrapper.framework"
        for Foundation.framework. How was it ever wrong?

        - finally, I tested making the default build directory work; it works now

        * Scripts/webkitdirs.pm: Changed structure of the code a little bit, added symrootXcodeOptions function
        that sets SYMROOT on the command line in case there's no product directory set in Xcode preferences.
        * Scripts/build-webkit: Pass symrootXcodeOptions when invoking Xcode.
        * Scripts/build-dumprendertree: Ditto.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 44da328b0dabfe914d584e2322a8c6113a02588a..cb1d19f168de05bef9b14c35a851bb21d521cbe2 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,20 @@
+2005-06-09  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3397
+          Build DumpRenderTree fails with unresolved NSAutoreleasePool, etc
+
+        * DumpRenderTree/DumpRenderTree.xcode/project.pbxproj: Change type from "folder" to "wrapper.framework"
+        for Foundation.framework. How was it ever wrong?
+
+        - finally, I tested making the default build directory work; it works now
+
+        * Scripts/webkitdirs.pm: Changed structure of the code a little bit, added symrootXcodeOptions function
+        that sets SYMROOT on the command line in case there's no product directory set in Xcode preferences.
+        * Scripts/build-webkit: Pass symrootXcodeOptions when invoking Xcode.
+        * Scripts/build-dumprendertree: Ditto.
+
 2005-06-09  Darin Adler  <darin@apple.com>
 
         * Scripts/webkitdirs.pm: Another try at making the default build directory of ~/WebKitBuild

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.xcode/project.pbxproj b/WebKitTools/DumpRenderTree/DumpRenderTree.xcode/project.pbxproj
index a0ba5686bbd75d78365850d7789b10f65eecfa3e..39c63c8dc5d64cdcea8de6318636caf7c3d898f5 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.xcode/project.pbxproj
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.xcode/project.pbxproj
@@ -63,8 +63,8 @@
                        sourceTree = "<group>";
                };
                08FB779EFE84155DC02AAC07 = {
+                       explicitFileType = wrapper.framework;
                        isa = PBXFileReference;
-                       lastKnownFileType = folder;
                        name = Foundation.framework;
                        path = /System/Library/Frameworks/Foundation.framework;
                        refType = 0;

diff --git a/WebKitTools/Scripts/build-dumprendertree b/WebKitTools/Scripts/build-dumprendertree
index da38052377465f579484f6e167a2bc7cc509e085..b4d23ab19d5fd2cb198b0e4b919d202aadf773f8 100755 (executable)
--- a/WebKitTools/Scripts/build-dumprendertree
+++ b/WebKitTools/Scripts/build-dumprendertree
@@ -40,4 +40,4 @@ my $productDir = productDir();
 
 # Build
 chdir "WebKitTools/DumpRenderTree" or die;
-exit system "xcodebuild", "-buildstyle", "Deployment";
+exit system "xcodebuild", symrootXcodeOptions(), "-buildstyle", "Deployment";

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index cc331a119f44482ee93d817187df60c51ff4d2a3..bed89087166a8bae9717ced1911e5c385b2aeddc 100755 (executable)
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -77,9 +77,9 @@ for my $dir (@projects) {
     chdir $dir or die;
     my $result;
     if ($dir eq "JavaScriptCore") {
-        $result = system "xcodebuild", "-target", "All", "-buildstyle", $style;
+        $result = system "xcodebuild", symrootXcodeOptions(), "-target", "All", "-buildstyle", $style;
     } else {
-        $result = system "xcodebuild", "-buildstyle", $style;
+        $result = system "xcodebuild", symrootXcodeOptions(), "-buildstyle", $style;
     }
     exit $result if $result;
     chdir ".." or die;

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index a6d1caeefcf912059525cf5227b86e6f8325ef5d..825c9d86906b393026297cb40236192f57022626 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -34,13 +34,16 @@ BEGIN {
    our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
    $VERSION     = 1.00;
    @ISA         = qw(Exporter);
-   @EXPORT      = qw(&chdirWebKit &productDir);
+   @EXPORT      = qw(&chdirWebKit &productDir &symrootXcodeOptions);
    %EXPORT_TAGS = ( );
    @EXPORT_OK   = ();
 }
 
 our @EXPORT_OK;
 
+my $productDir;
+my @options;
+
 # Check that we're in the right directory.
 sub chdirWebKit
 {
@@ -60,18 +63,34 @@ sub chdirWebKit
 # Check that an Xcode product directory is set, setting the SYMROOT environment variable
 # as a side effect in case it's not so that we will effectively have a temporary Xcode
 # product directory for xcodebuild commands called from the script.
-sub productDir
+sub findProductDir
 {
+    return if defined $productDir;
     open PRODUCT, "defaults read com.apple.Xcode PBXProductDirectory 2> /dev/null |" or die;
-    my $productDir = <PRODUCT>;
-    chomp $productDir;
+    $productDir = <PRODUCT>;
     close PRODUCT;
-    if (!$productDir) {
+    if ($productDir) {
+        chomp $productDir;
+        @options = ();
+    } else {
         $productDir = "$ENV{HOME}/WebKitBuild";
-        $ENV{SYMROOT} = $productDir;
+        @options = ("SYMROOT=$productDir");
     }
     $productDir =~ s|^~/|$ENV{HOME}/|;
+}
+
+# Get product directory.
+sub productDir
+{
+    findProductDir();
     return $productDir;
 }
 
+# Get SYMROOT options for Xcode.
+sub symrootXcodeOptions
+{
+    findProductDir();
+    return @options;
+}
+
 1;