build-webkit: document sdk, debug, release, device, and simulator options

https://bugs.webkit.org/show_bug.cgi?id=109221

Patch by David Farler <dfarler@apple.com> on 2013-02-09
Reviewed by David Kilzer.

* Scripts/build-webkit: Add options to usage
* Scripts/webkitdirs.pm: Remove --deploy and --devel checks

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 81505a63a3ec42b0bc87a4c22a2d5051dc006c33..408a8ebab817e76348b9881125957eb7b499a65f 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2013-02-09  David Farler  <dfarler@apple.com>
+
+        build-webkit: document sdk, debug, release, device, and simulator options
+        https://bugs.webkit.org/show_bug.cgi?id=109221
+
+        Reviewed by David Kilzer.
+
+        * Scripts/build-webkit: Add options to usage
+        * Scripts/webkitdirs.pm: Remove --deploy and --devel checks
+
 2013-02-09  Jochen Eisinger  <jochen@chromium.org>
 
         [chromium] move context menu data tracking to TestRunner library

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index c0bd82fe60aa17e5927f6da8ec45d772957309a3..88948a6c7dbb1000cc5d08b7126ffde8f5a67c2c 100755 (executable)
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -108,7 +108,11 @@ my $usage = <<EOF;
 Usage: $programName [options] [options to pass to build system]
   --help                            Show this help message
   --clean                           Cleanup the build directory
-  --debug                           Compile in debug mode
+  --debug                           Compile with Debug configuration
+  --release                         Compile with Release configuration
+  --sdk=<sdk>                       Use a specific Xcode SDK (iOS and Mac only)
+  --device                          Use the current iphoneos.internal SDK (iOS only)
+  --simulator                       Use the current iphonesimulator SDK (iOS only)
   --gyp                             Use GYP-generated project files
   --coverage                        Enable Code Coverage support (Mac only)
 

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 6f3b0c7fadecf2c2ab2a7eeab630682750db2c7a..f9120cde3614d3a435010739caf74468e02a07ba 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -590,13 +590,13 @@ sub determinePassedConfiguration
 
     for my $i (0 .. $#ARGV) {
         my $opt = $ARGV[$i];
-        if ($opt =~ /^--debug$/i || $opt =~ /^--devel/i) {
+        if ($opt =~ /^--debug$/i) {
             splice(@ARGV, $i, 1);
             $passedConfiguration = "Debug";
             $passedConfiguration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin());
             return;
         }
-        if ($opt =~ /^--release$/i || $opt =~ /^--deploy/i) {
+        if ($opt =~ /^--release$/i) {
             splice(@ARGV, $i, 1);
             $passedConfiguration = "Release";
             $passedConfiguration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin());