.:

        Reviewed by Darin Adler.

        Add "64" and "64u" make rules to allow easy building of 64-bit versions.

        make 64: will build Intel-only 64-bit.
        make 64u: will build 4-way universal for PPC and Intel.

        * Makefile:
        * Makefile.shared:

WebKitTools:

        Reviewed by Darin Adler.

        * Scripts/build-webkit: Add --universal and --64-bit flags to make building
        64-bit architectures easy. Combine the two flags to build 4-way universal.
        * Makefile: Add "64" and "64u" make rules. Fix the universal rule to return
        non-zero when the build failes.

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

diff --git a/ChangeLog b/ChangeLog
index bb7c72be2c104d43b7b385cd22ac7ccf9981e554..915a84765b06724a331c759e6def4fd340c37e46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-02-26  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Add "64" and "64u" make rules to allow easy building of 64-bit versions.
+
+        make 64: will build Intel-only 64-bit.
+        make 64u: will build 4-way universal for PPC and Intel.
+
+        * Makefile:
+        * Makefile.shared:
+
 2008-02-23  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
 
         Rubber stamped by Darin.

diff --git a/Makefile b/Makefile
index 89344f7a582396c94262e3691106978117b0e51e..fa7ea02426eabc667cd27e503f52861a0f24588c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,16 +7,23 @@ all:
 debug d development dev develop:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-       
+
 release r deployment dep deploy:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-       
+
 universal u:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-clean:
+64:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
+64u:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+clean:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done

diff --git a/Makefile.shared b/Makefile.shared
index a036aacc50e8e93ce7e30dae6bc435f8490a3ca8..096d32e948d338768866ecde7c9a5203fe507ac6 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -15,6 +15,12 @@ release r deployment dep deploy: force
 universal u: force
        ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
 
+64: force
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+64u: force
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
 clean:
        ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 50e2f0480de3f62b0e60bfbb05e56ce8a817825a..64e31a7582321cdb34f3eb3452b7cd7b5e3aa7d9 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-26  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin Adler.
+
+        * Scripts/build-webkit: Add --universal and --64-bit flags to make building
+        64-bit architectures easy. Combine the two flags to build 4-way universal.
+        * Makefile: Add "64" and "64u" make rules. Fix the universal rule to return
+        non-zero when the build failes.
+
 2008-02-26  Jessica Kahn  <jess@apple.com>
 
         Reviewed by Darin.

diff --git a/WebKitTools/Makefile b/WebKitTools/Makefile
index a0f946a0007704f9966afb7a41a8ba625e546fb0..364eadbc2a5f1361188214b711dc3a84d415c60f 100644 (file)
--- a/WebKitTools/Makefile
+++ b/WebKitTools/Makefile
@@ -13,7 +13,16 @@ release r deployment dep deploy:
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
 universal u:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+64:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+64u:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
 clean:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 350b3e7c0fcbbf5ff72db961b641eb4c0dace254..f4c99e6bfca838ce2f64ef6db03f3bfcfcb56792 100755 (executable)
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -56,11 +56,16 @@ my $coverageSupport = 0;
 my $videoSupport = isOSX() || isCygwin(); # Enable by default on OSX and Windows
 my $showHelp = 0;
 my $clean = 0;
+my $buildUniversal = 0;
+my $buildSixtyFourBit = 0;
 
 my $programName = basename($0);
 my $usage = <<EOF;
 Usage: $programName [options] [options to pass to build system]
   --help                        Show this help message
+  --clean                       Perform a clean build
+  --universal                   Build 2-way universal (PPC and Intel 32-bit)
+  --64-bit                      Build 64-bit, combine with --universal to build 4-way universal
   --[no-]cross-document-messaging   Toggle cross-document messaging support (default: $crossDocumentMessagingSupport)
   --[no-]database               Toggle Database Support (default: $databaseSupport)
   --[no-]icon-database          Toggle Icon database support (default: $iconDatabaseSupport)
@@ -95,6 +100,8 @@ GetOptions('cross-document-messaging!' => \$crossDocumentMessagingSupport,
            'video!' => \$videoSupport,
            'coverage!' => \$coverageSupport,
            'help' => \$showHelp,
+           'universal' => \$buildUniversal,
+           '64-bit' => \$buildSixtyFourBit,
            'clean' => \$clean);
 
 if ($showHelp) {
@@ -183,6 +190,21 @@ if ($clean && isOSX()) {
     push(@options, "clean");
 }
 
+if ($buildSixtyFourBit && isOSX()) {
+    my $cpuVendor = `sysctl -n machdep.cpu.vendor`;
+    chomp $cpuVendor;
+
+    if ($buildUniversal) {
+        push(@options, "ARCHS=ppc ppc64 i386 x86_64");
+    } elsif ($cpuVendor eq "GenuineIntel") {
+        push(@options, "ARCHS=i386 x86_64");
+    } else {
+        push(@options, "ARCHS=ppc ppc64");
+    }
+} elsif ($buildUniversal && isOSX()) {
+    push(@options, "ARCHS=ppc i386");
+}
+
 # enable autotool options accordingly
 if ($ENV{WEBKITAUTOTOOLS}) {
     push @options, autotoolsFlag($crossDocumentMessagingSupport, "cross-document-messaging");