Remove the --64-bit argument from scripts in favor of them detecting when 64-bit should be preferred.

bdash · bdash · commit 712903b5ff04 · 2009-03-14T06:17:16.000Z
Reviewed by Timothy Hatcher. The scripts will automatically target 64-bit if the system and hardware support it. This can be overridden by passing --32-bit to individual scripts, or using set-webkit-configuration --32-bit to make the override persistent. * Scripts/build-webkit: Remove architecture-related code. * Scripts/gdb-safari: Remove architecture-related code, and clean up how the environment variables are passed to gdb. * Scripts/run-javascriptcore-tests: Remove architecture-related code. * Scripts/run-safari: Ditto. * Scripts/run-webkit-tests: Ditto. * Scripts/set-webkit-configuration: Handle the --32-bit and --64-bit arguments. The --32-bit argument will set the architecture preference to the 32-bit architecture of the machine. The --64-bit argument will remove any architecture override that is in effect so that 64-bit support will be automatically detected. * Scripts/webkitdirs.pm: Add auto-detection of the best architecture for the machine, and the ability to override the auto-detection. Canonical link: https://commits.webkit.org/33755@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41696 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
@@ -1,3 +1,24 @@
+2009-03-13  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Remove the --64-bit argument from scripts in favor of them detecting when 64-bit should be preferred.
+
+        The scripts will automatically target 64-bit if the system and hardware support it.  This can be
+        overridden by passing --32-bit to individual scripts, or using set-webkit-configuration --32-bit
+        to make the override persistent.
+
+        * Scripts/build-webkit: Remove architecture-related code.
+        * Scripts/gdb-safari: Remove architecture-related code, and clean up how the environment variables are passed to gdb.
+        * Scripts/run-javascriptcore-tests: Remove architecture-related code.
+        * Scripts/run-safari: Ditto.
+        * Scripts/run-webkit-tests: Ditto.
+        * Scripts/set-webkit-configuration: Handle the --32-bit and --64-bit arguments.  The --32-bit argument will set the
+        architecture preference to the 32-bit architecture of the machine.  The --64-bit argument will remove any architecture
+        override that is in effect so that 64-bit support will be automatically detected.
+        * Scripts/webkitdirs.pm: Add auto-detection of the best architecture for the machine, and the ability to override the
+        auto-detection.
+
 2009-03-13  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
@@ -61,8 +61,6 @@ my $workersSupport = (isAppleWebKit() || isGtk()); # Enable by default for Apple
 my $geolocationSupport = (isAppleMacWebKit() && !isTiger() && !isLeopard());
 my $showHelp = 0;
 my $clean = 0;
-my $buildUniversal = 0;
-my $buildSixtyFourBit = 0;
 my $threeDTransformsSupport = 0;
 
 my $programName = basename($0);
@@ -73,8 +71,6 @@ Usage: $programName [options] [options to pass to build system]
   --chromium                    Build the Chromium port on Mac/Win/Linux
   --clean                       Cleanup the build directory
   --gtk                         Build the GTK+ port
-  --universal                   Build 2-way universal (PPC and Intel 32-bit)
-  --64-bit                      Build 64-bit, combine with --universal to build 4-way universal
   --[no-]3d-transforms          Toggle 3D Transforms support (default: $threeDTransformsSupport)
   --[no-]channel-messaging          Toggle MessageChannel and MessagePort support (default: $channelMessagingSupport)
   --[no-]offline-web-applications   Toggle Offline Web Application Support (default : $offlineWebApplicationSupport)
@@ -121,8 +117,6 @@ GetOptions(
            'geolocation!' => \$geolocationSupport,
            'coverage!' => \$coverageSupport,
            'help' => \$showHelp,
-           'universal' => \$buildUniversal,
-           '64-bit' => \$buildSixtyFourBit,
            'clean' => \$clean);
 
 if ($showHelp) {
@@ -190,21 +184,6 @@ for my $dir (@projects, @otherDirs) {
 
 my @options = ();
 
-if ($buildSixtyFourBit && isAppleMacWebKit()) {
-    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 && isAppleMacWebKit()) {
-    push(@options, "ARCHS=ppc i386");
-}
-
 # enable autotool options accordingly
 if (isGtk()) {
     push @options, autotoolsFlag($databaseSupport, "database");
diff --git a/WebKitTools/Scripts/gdb-safari b/WebKitTools/Scripts/gdb-safari
@@ -31,31 +31,9 @@
 use strict;
 use File::Temp qw/:mktemp/;
 use FindBin;
-use Getopt::Long qw(:config pass_through);
 use lib $FindBin::Bin;
 use webkitdirs;
 
-my $programName = basename($0);
-my $showHelp = 0;
-my $run64Bit;
-
-my $usage = <<EOF;
-Usage: $programName [options]
-  --help                          Show this help message
-  --64-bit                        Run in 64-bit mode
-EOF
-
-my $getOptionsResult = GetOptions(
-    'help' => \$showHelp,
-    '64-bit!' => \$run64Bit
-);
-
-if (!$getOptionsResult || $showHelp) {
-    print STDERR $usage;
-    exit 1;
-}
-
-setRun64Bit($run64Bit);
 setConfiguration();
 my $productDir = productDir();
 my $safariPath = safariPath();
@@ -67,17 +45,9 @@ die "Can't find gdb executable. Is gdb installed?\n" unless -x $gdbPath;
 # Check to see that all the frameworks are built.
 checkFrameworks();
 
-# Put a command to set DYLD_FRAMEWORK_PATH in a temp file.
-# Also set WEBKIT_UNSET_DYLD_FRAMEWORK_PATH to YES in this environment, so that
-# executables launched by Safari don't inherit using the new frameworks.
-my ($fh, $path) = mkstemp("/tmp/gdb-safari-XXXX");
-print $fh "set env DYLD_FRAMEWORK_PATH $productDir\n";
-print $fh "set env WEBKIT_UNSET_DYLD_FRAMEWORK_PATH YES\n";
-
-my @architectureFlags = ("-arch", preferredArchitecture()) if isAppleMacWebKit() && !isTiger();
-# Start up Safari.
-print "Start Safari under gdb with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
-exec $gdbPath, "-x", $path, @architectureFlags, $safariPath or die;
+$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
+$ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = 'YES';
 
-# Delete the temporary file.
-unlink0($fh, $path) or die "Error unlinking file $path safely"; 
+print "Starting Safari under gdb with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
+my @architectureFlags = ("-arch", architecture()) if !isTiger();
+exec $gdbPath, @architectureFlags, $safariPath or die;
diff --git a/WebKitTools/Scripts/run-javascriptcore-tests b/WebKitTools/Scripts/run-javascriptcore-tests
@@ -37,26 +37,22 @@ use webkitdirs;
 use POSIX;
 
 # determine configuration
-my $configuration;
 setConfiguration();
-$configuration = configuration();
+my $configuration = configuration();
 
 my $jsDriverArgs = "";
 my $root; # intentionally left undefined
-my $run64Bit = 0;
 my $showHelp = 0;
 
 my $programName = basename($0);
 my $usage = <<EOF;
 Usage: $programName [options] [options to pass to build system]
   --help                        Show this help message
-  --64-bit                      Use the 64bit jsc binary
   --jsDriver-args=              A string of arguments to pass to jsDriver.pl
   --root=                       Path to pre-built root containing jsc
 EOF
 
 GetOptions(
-    '64-bit' => \$run64Bit,
     'j|jsDriver-args=s' => \$jsDriverArgs,
     'root=s' => \$root,
     'help' => \$showHelp
@@ -75,22 +71,10 @@ if ($showHelp) {
 
 setConfigurationProductDir(Cwd::abs_path($root)) if (defined($root));
 
-if (isAppleMacWebKit() && !isTiger()) {
-    my $preferredArch = preferredArchitecture("JavaScriptCore");
-    setRun64Bit($run64Bit);
-    my $arch = preferredArchitecture("JavaScriptCore");
-    if ($arch ne $preferredArch) {
-        push(@jsArgs, "-a", $arch);
-    }
-}
-
 if (!defined($root)){
     chdirWebKit();
 
     push(@buildArgs, argumentsForConfiguration());
-
-    my $arch = preferredArchitecture("JavaScriptCore");
-    push(@buildArgs, "ARCHS=$arch") if (isAppleMacWebKit());
     
     print "Running: build-jsc " . join(" ", @buildArgs) . "\n";
     my $buildResult = system "perl", "WebKitTools/Scripts/build-jsc", @buildArgs;
diff --git a/WebKitTools/Scripts/run-safari b/WebKitTools/Scripts/run-safari
@@ -30,31 +30,9 @@
 
 use strict;
 use FindBin;
-use Getopt::Long qw(:config pass_through);
 use lib $FindBin::Bin;
 use webkitdirs;
 
-my $programName = basename($0);
-my $showHelp = 0;
-my $run64Bit;
-
-my $usage = <<EOF;
-Usage: $programName [options]
-  --help                          Show this help message
-  --64-bit                        Run in 64-bit mode
-EOF
-
-my $getOptionsResult = GetOptions(
-    'help' => \$showHelp,
-    '64-bit!' => \$run64Bit
-);
-
-if (!$getOptionsResult || $showHelp) {
-    print STDERR $usage;
-    exit 1;
-}
-
-setRun64Bit($run64Bit);
 setConfiguration();
 
 # Check to see that all the frameworks are built.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
@@ -103,7 +103,6 @@ sub writeToFile($$);
 # Argument handling
 my $addPlatformExceptions = 0;
 my $complexText = 0;
-my $configuration = configuration();
 my $guardMalloc = '';
 my $httpdPort = 8000;
 my $httpdSSLPort = 8443;
@@ -134,7 +133,6 @@ my $reverseTests = 0;
 my $randomizeTests = 0;
 my $mergeDepth;
 my @leaksFilenames;
-my $run64Bit;
 
 # Default to --no-http for Qt, Gtk and wx for now.
 $testHTTP = 0 if (isQt() || isGtk() || isWx());
@@ -209,15 +207,12 @@ Usage: $programName [options] [testdir|testpath ...]
   --valgrind                      Run DumpRenderTree inside valgrind (Qt/Linux only)
   -v|--verbose                    More verbose output (overrides --quiet)
   -m|--merge-leak-depth arg       Merges leak callStacks and prints the number of unique leaks beneath a callstack depth of arg.  Defaults to 5.
-  --64-bit                        run in 64bit mode
 EOF
 
-# Process @ARGV for configuration switches before calling GetOptions()
-$configuration = passedConfiguration() || configuration();
+setConfiguration();
 
 my $getOptionsResult = GetOptions(
     'complex-text' => \$complexText,
-    'c|configuration=s' => \$configuration,
     'guard-malloc|g' => \$guardMalloc,
     'help' => \$showHelp,
     'http!' => \$testHTTP,
@@ -247,7 +242,6 @@ my $getOptionsResult = GetOptions(
     'root=s' => \$root,
     'add-platform-exceptions' => \$addPlatformExceptions,
     'merge-leak-depth|m:5' => \$mergeDepth,
-    '64-bit!' => \$run64Bit
 );
 
 if (!$getOptionsResult || $showHelp) {
@@ -260,7 +254,7 @@ my $skippedOnly = $treatSkipped eq "only";
 
 !$skippedOnly || @ARGV == 0 or die "--skipped=only cannot be used when tests are specified on the command line.";
 
-setConfiguration($configuration);
+my $configuration = configuration();
 
 $testsPerDumpTool = 1000 if !$testsPerDumpTool;
 
@@ -277,19 +271,13 @@ setConfigurationProductDir(Cwd::abs_path($root)) if (defined($root));
 my $productDir = productDir();
 $productDir .= "/bin" if isQt();
 $productDir .= "/Programs" if isGtk();
-setRun64Bit($run64Bit);
 
 chdirWebKit();
 
 if (!defined($root)) {
     # Push the parameters to build-dumprendertree as an array
     my @args = argumentsForConfiguration();
 
-    if (isAppleMacWebKit()) {
-        my $arch = preferredArchitecture();
-        push(@args, "ARCHS=$arch");
-    }
-
     my $buildResult = system "WebKitTools/Scripts/build-dumprendertree", @args;
     if ($buildResult) {
         print STDERR "Compiling DumpRenderTree failed!\n";
@@ -1246,13 +1234,8 @@ sub openDumpTool()
         setPathForRunningWebKitApp(\%ENV) if isCygwin();
     }
 
-    exportArchPreference();
+    my @args = ($dumpTool, @toolArgs);
 
-    my @args = @toolArgs;
-    unshift @args, $dumpTool;
-    if (isAppleMacWebKit and !isTiger()) {
-        unshift @args, "arch";
-    }
     if ($useValgrind) {
         unshift @args, "valgrind";
     } 
diff --git a/WebKitTools/Scripts/set-webkit-configuration b/WebKitTools/Scripts/set-webkit-configuration
@@ -31,11 +31,49 @@ use FindBin;
 use lib $FindBin::Bin;
 use webkitdirs;
 
+my $programName = basename($0);
+my $usage = <<EOF;
+Usage: $programName [options]
+  --32-bit                Set the default architecture to 32-bit
+  --64-bit                Set the default architecture to 64-bit
+  --debug                 Set the default configuration to debug
+  --release               Set the default configuration to release
+EOF
+
 my $configuration = passedConfiguration();
-die "Please specify either --debug or --release.\n" if !$configuration;
+my $architecture = passedArchitecture();
+
+if (!$architecture) {
+    # Handle --64-bit explicitly here, as we don't want our other scripts to accept it
+    for my $i (0 .. $#ARGV) {
+        my $opt = $ARGV[$i];
+        if ($opt =~ /^--64-bit$/i) {
+            splice(@ARGV, $i, 1);
+            $architecture = 'x86_64';
+        }
+    }
+}
+
+if (!$configuration && !$architecture) {
+    print STDERR $usage;
+    exit 1;
+}
 
 my $baseProductDir = baseProductDir();
 system "mkdir", "-p", "$baseProductDir";
-open CONFIGURATION, ">", "$baseProductDir/Configuration" or die;
-print CONFIGURATION $configuration;
-close CONFIGURATION;
+
+if ($configuration) {
+    open CONFIGURATION, ">", "$baseProductDir/Configuration" or die;
+    print CONFIGURATION $configuration;
+    close CONFIGURATION;
+}
+
+if ($architecture) {
+    if ($architecture ne "x86_64") {
+        open ARCHITECTURE, ">", "$baseProductDir/Architecture" or die;
+        print ARCHITECTURE $architecture;
+        close ARCHITECTURE;
+    } else {
+        unlink "$baseProductDir/Architecture";
+    }
+}
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
