* DumpRenderTree/DumpRenderTree.xcode/project.pbxproj: Tweak, simplify.

        * Scripts/build-dumprendertree: Added.
        * Scripts/build-webkit: Build All in the JavaScriptCore directory.
        * Scripts/run-webkit-tests: Build DumpRenderTree before running.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3af7c8c6c05e65cc339c8bc1f912b930ebd8e5b3..a3e7d5efdb58684bd7bbbc7fe2651c64272f5c90 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-05  Darin Adler  <darin@apple.com>
+
+        * DumpRenderTree/DumpRenderTree.xcode/project.pbxproj: Tweak, simplify.
+        * Scripts/build-dumprendertree: Added.
+        * Scripts/build-webkit: Build All in the JavaScriptCore directory.
+        * Scripts/run-webkit-tests: Build DumpRenderTree before running.
+

 2005-06-05  Darin Adler  <darin@apple.com>
 
         * Scripts/run-safari: Fix path to Safari executable. Add check for frameworks.
 2005-06-05  Darin Adler  <darin@apple.com>
 
         * Scripts/run-safari: Fix path to Safari executable. Add check for frameworks.

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.xcode/project.pbxproj b/WebKitTools/DumpRenderTree/DumpRenderTree.xcode/project.pbxproj
index 4e7bb974620e9196462f77af1ccfc66b32e5c34b..e20445251d207c1806b2ea5eff516c513255943b 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.xcode/project.pbxproj
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.xcode/project.pbxproj
@@ -7,13 +7,8 @@
        objects = {
                014CEA4F0018CE4811CA2923 = {
                        buildSettings = {
        objects = {
                014CEA4F0018CE4811CA2923 = {
                        buildSettings = {

-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;

                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;

-                               OPTIMIZATION_CFLAGS = "-O0";
-                               ZERO_LINK = YES;

                        };
                        isa = PBXBuildStyle;
                        name = Development;
                        };
                        isa = PBXBuildStyle;
                        name = Development;


@@ -23,23 +18,6 @@
 //012
 //013
 //014
 //012
 //013
 //014

-//030
-//031
-//032
-//033
-//034
-               034768E6FF38A76511DB9C8B = {
-                       explicitFileType = "compiled.mach-o.executable";
-                       isa = PBXFileReference;
-                       path = DumpRenderTree;
-                       refType = 3;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-//030
-//031
-//032
-//033
-//034

 //080
 //081
 //082
 //080
 //081
 //082


@@ -54,9 +32,10 @@
                        hasScannedForEncodings = 1;
                        isa = PBXProject;
                        mainGroup = 08FB7794FE84155DC02AAC07;
                        hasScannedForEncodings = 1;
                        isa = PBXProject;
                        mainGroup = 08FB7794FE84155DC02AAC07;

+                       productRefGroup = 9340995508540CAF007F3BC8;

                        projectDirPath = "";
                        targets = (
                        projectDirPath = "";
                        targets = (

-                               08FB779FFE84155DC02AAC07,
+                               9340994A08540CAE007F3BC8,

                        );
                };
                08FB7794FE84155DC02AAC07 = {
                        );
                };
                08FB7794FE84155DC02AAC07 = {


@@ -67,7 +46,7 @@
                                9335436903D75557008635CE,
                                9335436503D7553D008635CE,
                                9335435F03D75502008635CE,
                                9335436903D75557008635CE,
                                9335436503D7553D008635CE,
                                9335435F03D75502008635CE,

-                               034768E6FF38A76511DB9C8B,
+                               9340995508540CAF007F3BC8,

                        );
                        isa = PBXGroup;
                        name = DumpRenderTree;
                        );
                        isa = PBXGroup;
                        name = DumpRenderTree;


@@ -90,52 +69,102 @@
                        refType = 0;
                        sourceTree = "<absolute>";
                };
                        refType = 0;
                        sourceTree = "<absolute>";
                };

-               08FB779FFE84155DC02AAC07 = {
+//080
+//081
+//082
+//083
+//084
+//320
+//321
+//322
+//323
+//324
+               32A70AAB03705E1F00C91783 = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = DumpRenderTreePrefix.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+//320
+//321
+//322
+//323
+//324
+//930
+//931
+//932
+//933
+//934
+               9335435F03D75502008635CE = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       path = WebKit.framework;
+                       refType = 3;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               9335436503D7553D008635CE = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       path = WebCore.framework;
+                       refType = 3;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               9335436903D75557008635CE = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       path = JavaScriptCore.framework;
+                       refType = 3;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               9340994A08540CAE007F3BC8 = {

                        buildPhases = (
                        buildPhases = (

-                               08FB77A0FE84155DC02AAC07,
-                               08FB77A1FE84155DC02AAC07,
-                               08FB77A3FE84155DC02AAC07,
+                               9340994B08540CAE007F3BC8,
+                               9340994D08540CAE007F3BC8,
+                               9340994F08540CAE007F3BC8,
+                       );
+                       buildRules = (

                        );
                        buildSettings = {
                        );
                        buildSettings = {

-                               FRAMEWORK_SEARCH_PATHS = "";
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = DumpRenderTreePrefix.h;

                                GCC_TREAT_WARNINGS_AS_ERRORS = YES;
                                GCC_TREAT_WARNINGS_AS_ERRORS = YES;

-                               HEADER_SEARCH_PATHS = "";
-                               INSTALL_PATH = "$(HOME)/bin";
-                               LIBRARY_SEARCH_PATHS = "";
-                               MACOSX_DEPLOYMENT_TARGET = 10.2;
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
-                               PRECOMPILE_PREFIX_HEADER = YES;
-                               PREFIX_HEADER = DumpRenderTreePrefix.h;

                                PRODUCT_NAME = DumpRenderTree;
                                PRODUCT_NAME = DumpRenderTree;

-                               SECTORDER_FLAGS = "";

                                WARNING_CFLAGS = "-Wall -W -Wno-unused-parameter";
                        };
                        dependencies = (
                        );
                                WARNING_CFLAGS = "-Wall -W -Wno-unused-parameter";
                        };
                        dependencies = (
                        );

-                       isa = PBXToolTarget;
+                       isa = PBXNativeTarget;

                        name = DumpRenderTree;
                        productInstallPath = "$(HOME)/bin";
                        productName = DumpRenderTree;
                        name = DumpRenderTree;
                        productInstallPath = "$(HOME)/bin";
                        productName = DumpRenderTree;

-                       productReference = 034768E6FF38A76511DB9C8B;
+                       productReference = 9340995408540CAF007F3BC8;
+                       productType = "com.apple.product-type.tool";

                };
                };

-               08FB77A0FE84155DC02AAC07 = {
+               9340994B08540CAE007F3BC8 = {

                        buildActionMask = 2147483647;
                        files = (
                        buildActionMask = 2147483647;
                        files = (

-                               32A70AAC03705E1F00C91783,
+                               9340994C08540CAE007F3BC8,

                        );
                        isa = PBXHeadersBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        isa = PBXHeadersBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               08FB77A1FE84155DC02AAC07 = {
+               9340994C08540CAE007F3BC8 = {
+                       fileRef = 32A70AAB03705E1F00C91783;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               9340994D08540CAE007F3BC8 = {

                        buildActionMask = 2147483647;
                        files = (
                        buildActionMask = 2147483647;
                        files = (

-                               08FB77A2FE84155DC02AAC07,
+                               9340994E08540CAE007F3BC8,

                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               08FB77A2FE84155DC02AAC07 = {
+               9340994E08540CAE007F3BC8 = {

                        fileRef = 08FB7796FE84155DC02AAC07;
                        isa = PBXBuildFile;
                        settings = {
                        fileRef = 08FB7796FE84155DC02AAC07;
                        isa = PBXBuildFile;
                        settings = {


@@ -143,95 +172,57 @@
                                );
                        };
                };
                                );
                        };
                };

-               08FB77A3FE84155DC02AAC07 = {
+               9340994F08540CAE007F3BC8 = {

                        buildActionMask = 2147483647;
                        files = (
                        buildActionMask = 2147483647;
                        files = (

-                               08FB77A4FE84155DC02AAC07,
-                               9335436103D75502008635CE,
-                               9335436603D7553D008635CE,
-                               9335436A03D75557008635CE,
+                               9340995008540CAE007F3BC8,
+                               9340995108540CAE007F3BC8,
+                               9340995208540CAE007F3BC8,
+                               9340995308540CAE007F3BC8,

                        );
                        isa = PBXFrameworksBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        isa = PBXFrameworksBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               08FB77A4FE84155DC02AAC07 = {
+               9340995008540CAE007F3BC8 = {

                        fileRef = 08FB779EFE84155DC02AAC07;
                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        fileRef = 08FB779EFE84155DC02AAC07;
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-//080
-//081
-//082
-//083
-//084
-//320
-//321
-//322
-//323
-//324
-               32A70AAB03705E1F00C91783 = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       path = DumpRenderTreePrefix.h;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               32A70AAC03705E1F00C91783 = {
-                       fileRef = 32A70AAB03705E1F00C91783;
+               9340995108540CAE007F3BC8 = {
+                       fileRef = 9335435F03D75502008635CE;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-//320
-//321
-//322
-//323
-//324
-//930
-//931
-//932
-//933
-//934
-               9335435F03D75502008635CE = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = wrapper.framework;
-                       path = WebKit.framework;
-                       refType = 3;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-               9335436103D75502008635CE = {
-                       fileRef = 9335435F03D75502008635CE;
+               9340995208540CAE007F3BC8 = {
+                       fileRef = 9335436503D7553D008635CE;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               9335436503D7553D008635CE = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = wrapper.framework;
-                       path = WebCore.framework;
-                       refType = 3;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-               9335436603D7553D008635CE = {
-                       fileRef = 9335436503D7553D008635CE;
+               9340995308540CAE007F3BC8 = {
+                       fileRef = 9335436903D75557008635CE;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               9335436903D75557008635CE = {
+               9340995408540CAF007F3BC8 = {
+                       explicitFileType = "compiled.mach-o.executable";
+                       includeInIndex = 0;

                        isa = PBXFileReference;
                        isa = PBXFileReference;

-                       lastKnownFileType = wrapper.framework;
-                       path = JavaScriptCore.framework;
+                       path = DumpRenderTree;

                        refType = 3;
                        sourceTree = BUILT_PRODUCTS_DIR;
                };
                        refType = 3;
                        sourceTree = BUILT_PRODUCTS_DIR;
                };

-               9335436A03D75557008635CE = {
-                       fileRef = 9335436903D75557008635CE;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
+               9340995508540CAF007F3BC8 = {
+                       children = (
+                               9340995408540CAF007F3BC8,
+                       );
+                       isa = PBXGroup;
+                       name = Products;
+                       refType = 4;
+                       sourceTree = "<group>";

                };
        };
        rootObject = 08FB7793FE84155DC02AAC07;
                };
        };
        rootObject = 08FB7793FE84155DC02AAC07;

diff --git a/WebKitTools/Scripts/build-dumprendertree b/WebKitTools/Scripts/build-dumprendertree
new file mode 100755 (executable)
index 0000000..7ac8654
--- /dev/null
+++ b/WebKitTools/Scripts/build-dumprendertree
@@ -0,0 +1,28 @@
+#!/usr/bin/perl -w
+
+# Simplified build script for Web Kit Open Source Project.
+# Modified copy of build-webkit. Perhaps these could share code.
+
+use strict;
+
+# Check that we're in the right directory.
+if (! -d "WebKitTools") {
+    if (-d "../WebKitTools") {
+        chdir ".." or die;
+    }
+    if (! -d "WebKitTools") {
+        die "No WebKitTools directory found. Please run this script from the directory containing WebKitTools.\n";
+    }
+}
+
+# Check that an Xcode product directory is set.
+open PRODUCT, "defaults read com.apple.Xcode PBXProductDirectory 2> /dev/null |" or die;
+my $productDir = <PRODUCT>;
+close PRODUCT;
+if (!$productDir) {
+    die "No product directory set. Please set the 'Place Build Products' preference to 'Customized location' in XCode Building Preferences.\n";
+}
+
+# Build
+chdir "WebKitTools/DumpRenderTree" or die;
+exit system "xcodebuild";

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 14aeb1f23d0f48f2cef9264847fbf86a80b54799..870901901d47cf1cdd71ba0c05d79c4dd525cadb 100755 (executable)
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -40,7 +40,12 @@ for my $dir (@projects, @otherDirs) {
 # Build, and abort if the build fails.
 for my $dir (@projects) {
     chdir $dir or die;
 # Build, and abort if the build fails.
 for my $dir (@projects) {
     chdir $dir or die;

-    my $result = system "xcodebuild", "-buildstyle", $style;
+    my $result;
+    if ($dir eq "JavaScriptCore") {
+        $result = system "xcodebuild", "-target", "All", "-buildstyle", $style;
+    } else {
+        $result = system "xcodebuild", "-buildstyle", $style;
+    }

     exit $result if $result;
     chdir ".." or die;
 }
     exit $result if $result;
     chdir ".." or die;
 }

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index a3fee27aa319034c0e2499d8050b69a63fb5a4dd..e5c8e255f91f31cfa35f1d0038fe25ff72c0b6ea 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -37,11 +37,16 @@ if (!$productDir) {
     die "No product directory set. Please set the 'Place Build Products' preference to 'Customized location' in XCode Building Preferences.\n";
 }
 
     die "No product directory set. Please set the 'Place Build Products' preference to 'Customized location' in XCode Building Preferences.\n";
 }
 

+my $result = system "WebKitTools/Scripts/build-dumprendertree";
+exit $result if $result;
+

 my $tool = "$productDir/DumpRenderTree";
 
 die "can't find executable DumpRenderTree tool (looked in $productDir)\n" if !-x $tool;
 
 my $tool = "$productDir/DumpRenderTree";
 
 die "can't find executable DumpRenderTree tool (looked in $productDir)\n" if !-x $tool;
 

-my $WebCoreDirectory = "WebCore";
+my $workingDir = `pwd`;
+chomp $workingDir;
+my $WebCoreDirectory = "$workingDir/WebCore";

 my $testDirectory = "$WebCoreDirectory/layout-tests";
 my $testResultsDirectory = "/tmp/layout-test-results";
 my $testResults = "$testResultsDirectory/results.html";
 my $testDirectory = "$WebCoreDirectory/layout-tests";
 my $testResultsDirectory = "/tmp/layout-test-results";
 my $testResults = "$testResultsDirectory/results.html";