Changeset 169088 in webkit

Timestamp:

May 19, 2014 5:43:59 PM (10 years ago)

Author:

ddkilzer@apple.com

Message:

[iOS] REGRESSION (r168910): webkitdirs.pm: Be more forgiving when parsing --sdk, --device and --sim
<​http://webkit.org/b/133089>

Reviewed by Darin Adler.

• Scripts/webkitdirs.pm:

(determineXcodeSDK): If both '--sdk SDKROOT' and '--sim' are
specified on the command line, we would remove the '--sdk'
arguments, but leave '--sim', potentially passing it along to
xcodebuild causing a build failure. This happens when
'old-run-webkit-tests --release --sim' invokes
build-dumprendertree when DumpRenderTree hasn't been built yet.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-05-19  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] REGRESSION (r168910): webkitdirs.pm: Be more forgiving when parsing --sdk, --device and --sim
+        <http://webkit.org/b/133089>
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitdirs.pm:
+        (determineXcodeSDK): If both '--sdk SDKROOT' and '--sim' are
+        specified on the command line, we would remove the '--sdk'
+        arguments, but leave '--sim', potentially passing it along to
+        xcodebuild causing a build failure.  This happens when
+        'old-run-webkit-tests --release --sim' invokes
+        build-dumprendertree when DumpRenderTree hasn't been built yet.
+
 2014-05-19  David Farler  <dfarler@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -399 +399 @@
     if (checkForArgumentAndRemoveFromARGVGettingValue("--sdk", \$sdk)) {
         $xcodeSDK = $sdk;
-    } elsif (checkForArgumentAndRemoveFromARGV("--device")) {
-        $xcodeSDK = 'iphoneos.internal';
-    } elsif (checkForArgumentAndRemoveFromARGV("--sim") ||
+    }
+    if (checkForArgumentAndRemoveFromARGV("--device")) {
+        $xcodeSDK ||= 'iphoneos.internal';
+    }
+    if (checkForArgumentAndRemoveFromARGV("--sim") ||
         checkForArgumentAndRemoveFromARGV("--simulator")) {
-        $xcodeSDK = 'iphonesimulator';
+        $xcodeSDK ||= 'iphonesimulator';
     }
 }