198130 2019-05-22 10:42:59 -0700 Use a different variable when testing for Xcode context in generate-xcfilelists 2019-05-22 12:09:37 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=197622 InRadar P2 Normal --- 1 krollin krollin commit-queue ews-watchlist glenn jbedard jer.noble webkit-bug-importer oldest_to_newest 1538262 0 krollin 2019-05-22 10:42:59 -0700 The generate-xcfilelists script can run stand-alone or in the context of Xcode. There are a couple of places where it helps to know which context is current. To determine the context, genreate-xfilelists checks an environment variable that should be defined only when Xcode is running. The variable chosen was XCODE_INSTALL_PATH. It turns out that this variable is not always defined. Therefore, switch to checking XCODE_PRODUCT_BUILD_VERSION. 1538263 1 webkit-bug-importer 2019-05-22 10:43:18 -0700 <rdar://problem/51032752> 1538264 2 370418 krollin 2019-05-22 10:46:23 -0700 Created attachment 370418 Patch 1538269 3 krollin 2019-05-22 10:50:41 -0700 I should have mentioned: the upshot of using XCODE_INSTALL_PATH and its being unexpectedly undefined was that an assertion was thrown when it shouldn't have been causing the xcfilelist-checking operation to abort, which also aborted the build. 1538305 4 370418 commit-queue 2019-05-22 12:09:35 -0700 Comment on attachment 370418 Patch Clearing flags on attachment: 370418 Committed r245635: <https://trac.webkit.org/changeset/245635> 1538306 5 commit-queue 2019-05-22 12:09:37 -0700 All reviewed patches have been landed. Closing bug. 370418 2019-05-22 10:46:23 -0700 2019-05-22 12:09:35 -0700 Patch bug-198130-20190522104623.patch text/plain 2422 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1NTY5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODFlYWJjNzVlMjgyNzE1ZGZkOGM0ZWU5MzUzMzkwMzA2 NjI4M2E3Zi4uMDk3N2Y4NWQ0OTIxODIzMTI3YzFmNmM0NGVmMWEyMjNiMDRjMzNmZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE5LTA1LTIyICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAg ICAgICBVc2UgYSBkaWZmZXJlbnQgdmFyaWFibGUgd2hlbiB0ZXN0aW5nIGZvciBYY29kZSBjb250 ZXh0IGluIGdlbmVyYXRlLXhjZmlsZWxpc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTgxMzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUxMDMy NzUyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSBnZW5lcmF0ZS14Y2ZpbGVsaXN0cyBzY3JpcHQgY2FuIHJ1biBzdGFuZC1hbG9uZSBvciBpbiB0 aGUgY29udGV4dAorICAgICAgICBvZiBYY29kZS4gVGhlcmUgYXJlIGEgY291cGxlIG9mIHBsYWNl cyB3aGVyZSBpdCBoZWxwcyB0byBrbm93IHdoaWNoCisgICAgICAgIGNvbnRleHQgaXMgY3VycmVu dC4gVG8gZGV0ZXJtaW5lIHRoZSBjb250ZXh0LCBnZW5yZWF0ZS14ZmlsZWxpc3RzCisgICAgICAg IGNoZWNrcyBhbiBlbnZpcm9ubWVudCB2YXJpYWJsZSB0aGF0IHNob3VsZCBiZSBkZWZpbmVkIG9u bHkgd2hlbiBYY29kZQorICAgICAgICBpcyBydW5uaW5nLiBUaGUgdmFyaWFibGUgY2hvc2VuIHdh cyBYQ09ERV9JTlNUQUxMX1BBVEguIEl0IHR1cm5zIG91dAorICAgICAgICB0aGF0IHRoaXMgdmFy aWFibGUgaXMgbm90IGFsd2F5cyBkZWZpbmVkLiBUaGVyZWZvcmUsIHN3aXRjaCB0bworICAgICAg ICBjaGVja2luZyBYQ09ERV9QUk9EVUNUX0JVSUxEX1ZFUlNJT04uCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2dlbmVyYXRlX3hjZmlsZWxpc3RzX2xpYi91dGlsLnB5OgorICAgICAgICAo c3VicHJvY2Vzc19ydW4pOgorICAgICAgICAoaXNfcnVubmluZ191bmRlcl94Y29kZSk6CisKIDIw MTktMDUtMjEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQuIEZpeCB0aGUgYnVpbGQgd2l0aCBIQVZFKEFDQ0VTU0lCSUxJVFkp IGRpc2FibGVkCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2dlbmVyYXRlX3hj ZmlsZWxpc3RzX2xpYi91dGlsLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9nZW5lcmF0ZV94 Y2ZpbGVsaXN0c19saWIvdXRpbC5weQppbmRleCAzM2ZmZTFiMjU2YmQ5ZjZmOGU3YmFlMWViNzYz NmRhZjdkYWZjYjg4Li5hYjYzNmM2N2IyMjAzNjg4NjVmYjc0ZDQyNTMxNWMxZjQwYjQ2ZDI0IDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2dlbmVyYXRlX3hjZmlsZWxpc3RzX2xp Yi91dGlsLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvZ2VuZXJhdGVfeGNmaWxlbGlz dHNfbGliL3V0aWwucHkKQEAgLTE4NiwxMCArMTg2LDE1IEBAIGRlZiBzdWJwcm9jZXNzX3J1bihh cmdzLCAqKmt3YXJncyk6CiAjIFV0aWxpdHkgZnVuY3Rpb24gdG8gYWxsb3cgdXMgdG8gdmVyaWZ5 IHRoYXQgd2UncmUgcnVubmluZyB1bmRlciBYY29kZSBvciBub3QuCiAjIEZvciBleGFtcGxlLCBp ZiB3ZSBhcmUgbm90LCB0aGVuIHdlIG5lZWQgdG8gbWFrZSBzdXJlIHRoYXQgd2UgZG9uJ3QgdHJ5 IHRvCiAjIGFjY2VzcyBYY29kZS1zcGVjaWZpYyBlbnZpcm9ubWVudCB2YXJpYWJsZXMuCisjCisj IE5vdGU6IFRoaXMgZnVuY3Rpb24gdXNlIHRvIGNoZWNrIFhDT0RFX0lOU1RBTExfUEFUSC4gQmVj YXVzZSBpZiBYY29kZSBpcworIyBydW5uaW5nLCBpdCBtdXN0IGhhdmUgYmVlbiBpbnN0YWxsZWQu IFRoYXQncyB0aGUgdGhlb3J5LCBhbnl3YXkuIEluCisjIGFjdHVhbGl0eSwgaXQgc2VlbXMgcG9z c2libGUgdG8gaW5zdGFsbCBYY29kZSB3aXRob3V0IHRoZSByZXN1bHQgaGF2aW5nCisjIFhDT0RF X0lOU1RBTExfUEFUSCBkZWZpbmVkLiBTbyBub3cgd2UgY2hlY2sgWENPREVfUFJPRFVDVF9CVUlM RF9WRVJTSU9OLgogCiBATG9nRW50cnlFeGl0R2xvYmFsCiBkZWYgaXNfcnVubmluZ191bmRlcl94 Y29kZSgpOgotICAgIHJldHVybiBvcy5lbnZpcm9uLmdldCgiWENPREVfSU5TVEFMTF9QQVRIIikK KyAgICByZXR1cm4gb3MuZW52aXJvbi5nZXQoIlhDT0RFX1BST0RVQ1RfQlVJTERfVkVSU0lPTiIp CiAKIAogIyBBbiBhcmdwYXJzZS5BY3Rpb24gc3ViY2xhc3MgdGhhdCB2YWxpZGF0ZXMgdGhlIHVz ZXItcHJvdmlkZWQgdmFsdWUgYWdhaW5zdCBhCg==