140623 2015-01-19 10:26:12 -0800 [iOS] Do not hard-code iphoneos.internal SDK in buildXCodeProject() 2015-01-19 11:05:08 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 140585 1 ddkilzer ddkilzer ap darin dbates ddkilzer jake.nielsen.webkit mrowe msaboff oldest_to_newest 1062387 0 ddkilzer 2015-01-19 10:26:12 -0800 When starting the ios-ews queue, the following command is run to kick off a build: Tools/Scripts/build-webkit --release --sdk=iphoneos ARCHS=armv7 However, buildXCodeProject() changes the SDK from 'iphoneos' to 'iphoneos.internal', causing an error: xcodebuild: error: SDK "iphoneos.internal" cannot be located. The fix is to stop buildXCodeProject() from assuming that building for the device always means using the internal SDK. 1062390 1 244907 ddkilzer 2015-01-19 10:33:30 -0800 Created attachment 244907 Patch v1 1062392 2 244907 dbates 2015-01-19 10:35:36 -0800 Comment on attachment 244907 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=244907&action=review > Tools/Scripts/webkitdirs.pm:438 > + $xcodeSDK ||= $hasInternalSDK ? 'iphoneos.internal' : 'iphoneos'; Nit: We should take this opportunity to use double quotes instead of single quotes to be more consistent with the majority of the Perl code. 1062394 3 ddkilzer 2015-01-19 10:36:21 -0800 This also makes --device prefer the "iphoneos.internal" SDK if it is installed, else it falls back to the "iphoneos" SDK. 1062399 4 244907 ap 2015-01-19 10:39:17 -0800 Comment on attachment 244907 Patch v1 r=me too. I think that this patch needs to fix build-webkit --help output: $ build-webkit --help ... --device Use the current iphoneos.internal SDK (iOS only) Also, perhaps EWS should use --device now, not --sdk=iphoneos. Not a big deal though. 1062400 5 244907 dbates 2015-01-19 10:40:14 -0800 Comment on attachment 244907 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=244907&action=review > Tools/Scripts/webkitdirs.pm:1643 > Nit: We can write the simplify the if condition to isIOSWebKit(). 1062414 6 ddkilzer 2015-01-19 11:05:08 -0800 Committed r178656: <http://trac.webkit.org/changeset/178656> 244907 2015-01-19 10:33:30 -0800 2015-01-19 10:39:17 -0800 Patch v1 bug-140623-20150119103337.patch text/plain 2153 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NjQ3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWNlNDIyZTM2YzMzMjdhZWY1ZTllZjQzNjg3NWZkYzc0 ZGIxZjU4MC4uODliZDk3NDc5YWIyMDhkMDk2OThlNjBjZjliOGFlOTQ0ZDVjODBhZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE1LTAxLTE5ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgW2lPU10gRG8gbm90IGhhcmQtY29kZSBpcGhvbmVvcy5pbnRlcm5hbCBTREsgaW4gYnVp bGRYQ29kZVByb2plY3QoKQorICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi8xNDA2MjM+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVYY29kZVNESyk6IFdoZW4gcGFzc2lu ZyAtLWRldmljZSwgcHJlZmVyIHRoZSBpbnRlcm5hbAorICAgICAgICBpT1MgU0RLIGlmIGl0IGV4 aXN0cywgZWxzZSBmYWxsIGJhY2sgdG8gdGhlIGV4dGVybmFsIGlPUyBTREsuCisgICAgICAgIChi dWlsZFhDb2RlUHJvamVjdCk6IFVzZSB4Y29kZVNESygpIGFzIC1zZGsgYXJndW1lbnQgZm9yCisg ICAgICAgIHhjb2RlYnVpbGQgaW5zdGVhZCBvZiB0cnlpbmcgdG8gc2FuaXRpemUgdmFsdWVzLgor CiAyMDE1LTAxLTE5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K IAogICAgICAgICBbR1RLXSBbV0syXSBUZXN0V2ViS2l0V2ViVmlldyBzbmFwc2hvdCBmYWlscwpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCmluZGV4IDAyYjIzYjQ2YjI3YjNmYzU1OGFkYzBjYmIxNTNiMmExZGZiM2Ix ZDMuLjk2OTFlYmEwZGYzYTFmNWNhY2M2ODc0ZjVjZmU1NDMzYmIxZTk4OWEgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KQEAgLTQzNCw3ICs0MzQsOCBAQCBzdWIgZGV0ZXJtaW5lWGNvZGVTREsKICAgICAgICAg JHhjb2RlU0RLID0gJHNkazsKICAgICB9CiAgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1v dmVGcm9tQVJHVigiLS1kZXZpY2UiKSkgewotICAgICAgICAkeGNvZGVTREsgfHw9ICdpcGhvbmVv cy5pbnRlcm5hbCc7CisgICAgICAgIG15ICRoYXNJbnRlcm5hbFNESyA9IGV4aXRTdGF0dXMoc3lz dGVtKCJ4Y3J1biAtLXNkayBpcGhvbmVvcy5pbnRlcm5hbCAtLXNob3ctc2RrLXZlcnNpb24gPiAv ZGV2L251bGwgMj4mMSIpKSA9PSAwOworICAgICAgICAkeGNvZGVTREsgfHw9ICRoYXNJbnRlcm5h bFNESyA/ICdpcGhvbmVvcy5pbnRlcm5hbCcgOiAnaXBob25lb3MnOwogICAgIH0KICAgICBpZiAo Y2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLXNpbSIpIHx8CiAgICAgICAgIGNo ZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1zaW11bGF0b3IiKSB8fApAQCAtMTYz OCw4ICsxNjM5LDcgQEAgc3ViIGJ1aWxkWENvZGVQcm9qZWN0KCQkQCkKICAgICAgICAgcHVzaChA ZXh0cmFPcHRpb25zLCAiY2xlYW4iKTsKICAgICB9CiAKLSAgICBwdXNoKEBleHRyYU9wdGlvbnMs ICgiLXNkayIsICJpcGhvbmVzaW11bGF0b3IiKSkgaWYgd2lsbFVzZUlPU1NpbXVsYXRvclNES1do ZW5CdWlsZGluZygpOwotICAgIHB1c2goQGV4dHJhT3B0aW9ucywgKCItc2RrIiwgImlwaG9uZW9z LmludGVybmFsIikpIGlmIHdpbGxVc2VJT1NEZXZpY2VTREtXaGVuQnVpbGRpbmcoKTsKKyAgICBw dXNoKEBleHRyYU9wdGlvbnMsICgiLXNkayIsIHhjb2RlU0RLKCkpKSBpZiAod2lsbFVzZUlPU1Np bXVsYXRvclNES1doZW5CdWlsZGluZygpIHx8IHdpbGxVc2VJT1NEZXZpY2VTREtXaGVuQnVpbGRp bmcoKSk7CiAKICAgICBjaG9tcCgkRU5We0RTWU1VVElMX05VTV9USFJFQURTfSA9IGBzeXNjdGwg LW4gaHcuYWN0aXZlY3B1YCk7CiAgICAgcmV0dXJuIHN5c3RlbSAieGNvZGVidWlsZCIsICItcHJv amVjdCIsICIkcHJvamVjdC54Y29kZXByb2oiLCBAZXh0cmFPcHRpb25zOwo=