From 71db91543b670fae32ff05aee732a817466e2726 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Sat, 9 Feb 2013 19:09:03 +0000 Subject: [PATCH] build-webkit: document sdk, debug, release, device, and simulator options https://bugs.webkit.org/show_bug.cgi?id=109221 Patch by David Farler 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 --- Tools/ChangeLog | 10 ++++++++++ Tools/Scripts/build-webkit | 6 +++++- Tools/Scripts/webkitdirs.pm | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 81505a63a3ec..408a8ebab817 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,13 @@ +2013-02-09 David Farler + + 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 [chromium] move context menu data tracking to TestRunner library diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit index c0bd82fe60aa..88948a6c7dbb 100755 --- a/Tools/Scripts/build-webkit +++ b/Tools/Scripts/build-webkit @@ -108,7 +108,11 @@ my $usage = < 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 6f3b0c7fadec..f9120cde3614 100755 --- 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()); -- 2.36.0