149336 2015-09-17 22:24:22 -0700 Prevent build-webkit from building four times on Windows 2015-09-18 11:02:49 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen bfulgham commit-queue dbates oldest_to_newest 1127068 0 achristensen 2015-09-17 22:24:22 -0700 Prevent build-webkit from building four times on Windows 1127069 1 261492 achristensen 2015-09-17 22:30:26 -0700 Created attachment 261492 patch 1127139 2 261492 bfulgham 2015-09-18 10:01:22 -0700 Comment on attachment 261492 patch Nice solution! r=me. 1127140 3 bfulgham 2015-09-18 10:01:37 -0700 I'm super glad you figured this out! 1127161 4 achristensen 2015-09-18 11:02:49 -0700 http://trac.webkit.org/changeset/189973 261492 2015-09-17 22:30:26 -0700 2015-09-18 10:01:22 -0700 patch patch text/plain 5058 achristensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4OTk2NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE1LTA5LTE3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgUHJldmVudCBidWlsZC13ZWJraXQgZnJvbSBidWlsZGluZyBm b3VyIHRpbWVzIG9uIFdpbmRvd3MgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDkzMzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OgorICAgICAgICBNb3ZlIHRoZSBX aW5kb3dzIGNvZGUgb3V0IG9mIHRoZSBmb3IgbG9vcCBpdGVyYXRpbmcgb3ZlciBlYWNoIHN1YmRp cmVjdG9yeSB0byBiZSBidWlsZC4KKyAgICAgICAgVGhleSdyZSBidWlsdCBhbGwgYXQgb25jZS4K KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChidWlsZFZpc3VhbFN0 dWRpb1Byb2plY3QpOgorICAgICAgICAoY21ha2VHZW5lcmF0ZWRCdWlsZGZpbGUpOgorICAgICAg ICBEb24ndCBnZW5lcmF0ZSB0aGUgVmlzdWFsIFN0dWRpbyBzb2x1dGlvbiBpZiBpdCBhbHJlYWR5 IGV4aXN0cy4KKyAgICAgICAgSXQgd2lsbCBydW4gQ01ha2UgYWdhaW4gaWYgbmVjZXNzYXJ5Lgor CiAyMDE1LTA5LTE3ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFtpT1MgV0syXSBXVFIgZmFpbHMgdG8gc2V0IHRoZSBrZXkgd2luZG93IGluIHRoZSBV SUtpdCBzZW5zZQpJbmRleDogVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQJKHJldmlzaW9uIDE4OTk0MSkKKysrIFRvb2xz L1NjcmlwdHMvYnVpbGQtd2Via2l0CSh3b3JraW5nIGNvcHkpCkBAIC0yNDEsMzQgKzI0MSwxOSBA QAogICAgIGJ1aWxkQ01ha2VQcm9qZWN0T3JFeGl0KCRjbGVhbiwgY21ha2VCYXNlZFBvcnROYW1l KCksICRwcmVmaXhQYXRoLCAkbWFrZUFyZ3MsIChjbWFrZUJhc2VkUG9ydEFyZ3VtZW50cygpLCBA ZmVhdHVyZUFyZ3MpLCAkY21ha2VBcmdzKTsKIH0KIAotIyBCdWlsZCwgYW5kIGFib3J0IGlmIHRo ZSBidWlsZCBmYWlscy4KLWZvciBteSAkZGlyIChAcHJvamVjdHMpIHsKLSAgICBjaGRpciAkZGly IG9yIGRpZTsKLSAgICAkcmVzdWx0ID0gMDsKLQotICAgIG15ICRwcm9qZWN0ID0gYmFzZW5hbWUo JGRpcik7Ci0gICAgbXkgJGJhc2VQcm9kdWN0RGlyID0gYmFzZVByb2R1Y3REaXIoKTsKLSAgICBp ZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7Ci0gICAgICAgIG15IEBsb2NhbF9vcHRpb25zID0gQG9w dGlvbnM7Ci0gICAgICAgIHB1c2ggQGxvY2FsX29wdGlvbnMsIFhjb2RlQ292ZXJhZ2VTdXBwb3J0 T3B0aW9ucygpIGlmICRjb3ZlcmFnZVN1cHBvcnQ7Ci0gICAgICAgIHB1c2ggQGxvY2FsX29wdGlv bnMsIFhjb2RlU3RhdGljQW5hbHl6ZXJPcHRpb24oKSBpZiAkc2hvdWxkUnVuU3RhdGljQW5hbHl6 ZXI7Ci0gICAgICAgIG15ICRwcm9qZWN0UGF0aCA9ICRwcm9qZWN0ID1+IC9ndGVzdC8gPyAieGNv ZGUvZ3Rlc3QiIDogJHByb2plY3Q7Ci0gICAgICAgICRyZXN1bHQgPSBidWlsZFhDb2RlUHJvamVj dCgkcHJvamVjdFBhdGgsICRjbGVhbiwgQGxvY2FsX29wdGlvbnMsIEBBUkdWKTsKLSAgICB9IGVs c2lmIChpc0FwcGxlV2luV2ViS2l0KCkgfHwgaXNXaW5DYWlybygpKSB7Ci0gICAgICAgIGNoZGly V2ViS2l0KCk7Ci0gICAgICAgIGlmIChleGl0U3RhdHVzKGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9t Q01ha2VQcm9qZWN0KGlzV2luQ2Fpcm8oKSA/ICJXaW5DYWlybyIgOiAiQXBwbGVXaW4iKSkpIHsK LSAgICAgICAgICAgIGRpZSAiUnVuIFwiQzovUHJvZ3JhbSBGaWxlcyAoeDg2KS9NaWNyb3NvZnQg VmlzdWFsIFN0dWRpbyAxMi4wL1ZDL3ZjdmFyc2FsbC5iYXRcIiBiZWZvcmUgYnVpbGQtd2Via2l0 IHdoZW4gdXNpbmcgbmluamEiOwotICAgICAgICB9Ci0gICAgICAgIGlmIChjYW5Vc2VOaW5qYSgp KSB7Ci0gICAgICAgICAgICBjaGRpciAiV2ViS2l0QnVpbGQvIiAuIGNvbmZpZ3VyYXRpb24oKTsK LSAgICAgICAgICAgICRyZXN1bHQgPSBzeXN0ZW0oIm5pbmphIik7Ci0gICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICAkcmVzdWx0ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCJXZWJLaXRC dWlsZC8iIC4gY29uZmlndXJhdGlvbigpIC4gIi9XZWJLaXQuc2xuIiwgJGNsZWFuKTsKLSAgICAg ICAgfQorbXkgJGJhc2VQcm9kdWN0RGlyID0gYmFzZVByb2R1Y3REaXIoKTsKK2lmIChpc0FwcGxl V2luV2ViS2l0KCkgfHwgaXNXaW5DYWlybygpKSB7CisgICAgY2hkaXJXZWJLaXQoKTsKKyAgICBp ZiAoZXhpdFN0YXR1cyhnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNNYWtlUHJvamVjdChpc1dpbkNh aXJvKCkgPyAiV2luQ2Fpcm8iIDogIkFwcGxlV2luIikpKSB7CisgICAgICAgIGRpZSAiUnVuIFwi QzovUHJvZ3JhbSBGaWxlcyAoeDg2KS9NaWNyb3NvZnQgVmlzdWFsIFN0dWRpbyAxMi4wL1ZDL3Zj dmFyc2FsbC5iYXRcIiBiZWZvcmUgYnVpbGQtd2Via2l0IHdoZW4gdXNpbmcgbmluamEiOwogICAg IH0KLSAgICAjIFZhcmlvdXMgYnVpbGQqIGNhbGxzIGFib3ZlIG1heSBjaGFuZ2UgdGhlIENXRC4K ICAgICBjaGRpcldlYktpdCgpOwotCisgICAgaWYgKGNhblVzZU5pbmphKCkpIHsKKyAgICAgICAg Y2hkaXIgIldlYktpdEJ1aWxkLyIgLiBjb25maWd1cmF0aW9uKCk7CisgICAgICAgICRyZXN1bHQg PSBzeXN0ZW0oIm5pbmphIik7CisgICAgfSBlbHNlIHsKKyAgICAgICAgJHJlc3VsdCA9IGJ1aWxk VmlzdWFsU3R1ZGlvUHJvamVjdCgiV2ViS2l0QnVpbGQvIiAuIGNvbmZpZ3VyYXRpb24oKSAuICIv V2ViS2l0LnNsbiIsICRjbGVhbik7CisgICAgfQogICAgIGlmIChleGl0U3RhdHVzKCRyZXN1bHQp KSB7CiAgICAgICAgIG15ICRzY3JpcHREaXIgPSByZWxhdGl2ZVNjcmlwdHNEaXIoKTsKICAgICAg ICAgaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSB8fCBpc1dpbkNhaXJvKCkpIHsKQEAgLTI3OCw2ICsy NjMsMjcgQEAKICAgICAgICAgfQogICAgICAgICBleGl0IGV4aXRTdGF0dXMoJHJlc3VsdCk7CiAg ICAgfQorfSBlbHNpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7CisgICAgIyBCdWlsZCwgYW5kIGFi b3J0IGlmIHRoZSBidWlsZCBmYWlscy4KKyAgICBmb3IgbXkgJGRpciAoQHByb2plY3RzKSB7Cisg ICAgICAgIGNoZGlyICRkaXIgb3IgZGllOworICAgICAgICAkcmVzdWx0ID0gMDsKKworICAgICAg ICBteSAkcHJvamVjdCA9IGJhc2VuYW1lKCRkaXIpOworICAgICAgICAKKyAgICAgICAgbXkgQGxv Y2FsX29wdGlvbnMgPSBAb3B0aW9uczsKKyAgICAgICAgcHVzaCBAbG9jYWxfb3B0aW9ucywgWGNv ZGVDb3ZlcmFnZVN1cHBvcnRPcHRpb25zKCkgaWYgJGNvdmVyYWdlU3VwcG9ydDsKKyAgICAgICAg cHVzaCBAbG9jYWxfb3B0aW9ucywgWGNvZGVTdGF0aWNBbmFseXplck9wdGlvbigpIGlmICRzaG91 bGRSdW5TdGF0aWNBbmFseXplcjsKKyAgICAgICAgbXkgJHByb2plY3RQYXRoID0gJHByb2plY3Qg PX4gL2d0ZXN0LyA/ICJ4Y29kZS9ndGVzdCIgOiAkcHJvamVjdDsKKyAgICAgICAgJHJlc3VsdCA9 IGJ1aWxkWENvZGVQcm9qZWN0KCRwcm9qZWN0UGF0aCwgJGNsZWFuLCBAbG9jYWxfb3B0aW9ucywg QEFSR1YpOworCisgICAgICAgICMgVmFyaW91cyBidWlsZCogY2FsbHMgYWJvdmUgbWF5IGNoYW5n ZSB0aGUgQ1dELgorICAgICAgICBjaGRpcldlYktpdCgpOworCisgICAgICAgIGlmIChleGl0U3Rh dHVzKCRyZXN1bHQpKSB7CisgICAgICAgICAgICBleGl0IGV4aXRTdGF0dXMoJHJlc3VsdCk7Cisg ICAgICAgIH0KKyAgICB9CiB9CiAKICMgRG9uJ3QgcmVwb3J0IHRoZSAiV2ViS2l0IGlzIG5vdyBi dWlsdCIgbWVzc2FnZSBhZnRlciBhIGNsZWFuIG9wZXJhdGlvbi4KSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMu cG0JKHJldmlzaW9uIDE4OTk0MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29y a2luZyBjb3B5KQpAQCAtMTY3OCw3ICsxNjc4LDYgQEAKICAgICBteSAkd2FybmluZ0xvZ2dpbmcg PSAiL2ZscDE6TG9nRmlsZT0iIC4gJHdhcm5pbmdMb2dGaWxlIC4gIjtXYXJuaW5nc09ubHkiOwog CiAgICAgbXkgQGNvbW1hbmQgPSAoJHZjQnVpbGRQYXRoLCAiL3ZlcmJvc2l0eTptaW5pbWFsIiwg JHByb2plY3QsICRhY3Rpb24sICRjb25maWcsICRwbGF0Zm9ybSwgIi9mbCIsICRlcnJvckxvZ2dp bmcsICIvZmwxIiwgJHdhcm5pbmdMb2dnaW5nKTsKLQogICAgIHByaW50IGpvaW4oIiAiLCBAY29t bWFuZCksICJcbiI7CiAgICAgcmV0dXJuIHN5c3RlbSBAY29tbWFuZDsKIH0KQEAgLTE4MTIsNiAr MTgxMSw4IEBACiAgICAgbXkgKCR3aWxsVXNlTmluamEpID0gQF87CiAgICAgaWYgKCR3aWxsVXNl TmluamEpIHsKICAgICAgICAgcmV0dXJuIEZpbGU6OlNwZWMtPmNhdGZpbGUoYmFzZVByb2R1Y3RE aXIoKSwgY29uZmlndXJhdGlvbigpLCAiYnVpbGQubmluamEiKQorICAgIH0gZWxzaWYgKGlzV2lu ZG93cygpIHx8IGlzQ3lnd2luKCkpIHsKKyAgICAgICAgcmV0dXJuIEZpbGU6OlNwZWMtPmNhdGZp bGUoYmFzZVByb2R1Y3REaXIoKSwgY29uZmlndXJhdGlvbigpLCAiV2ViS2l0LnNsbiIpCiAgICAg fSBlbHNlIHsKICAgICAgICAgcmV0dXJuIEZpbGU6OlNwZWMtPmNhdGZpbGUoYmFzZVByb2R1Y3RE aXIoKSwgY29uZmlndXJhdGlvbigpLCAiTWFrZWZpbGUiKQogICAgIH0K