132826 2014-05-12 10:25:33 -0700 [Win] Correct Cygwin Path Confusion in WebInspectorUI Build 2014-05-12 15:20:09 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 132023 1 bfulgham bfulgham bfulgham commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1008638 0 bfulgham 2014-05-12 10:25:33 -0700 Cygwin's Python 2.7 requires very specific path handling to work around some nuances in the way the Python distribution is installed under Cygwin (see Bug 132023 for details, as well as <http://trac.webkit.org/changeset/167685>). This patch corrects another place in our build system where we are not explicit about where to find Python under Cygwin. 1008639 1 webkit-bug-importer 2014-05-12 10:26:25 -0700 <rdar://problem/16885618> 1008640 2 webkit-bug-importer 2014-05-12 10:26:28 -0700 <rdar://problem/16885619> 1008641 3 231305 bfulgham 2014-05-12 10:28:54 -0700 Created attachment 231305 Patch 1008642 4 231305 joepeck 2014-05-12 10:32:32 -0700 Comment on attachment 231305 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231305&action=review r=me > Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl:79 > +my $python = ($^O =~ /cygwin/) ? "/usr/bin/python" : "python"; Nit: Would be nice to have a more readable for of "$^O". Since off-hand I have no idea what it means. 1008643 5 231305 joepeck 2014-05-12 10:33:01 -0700 Comment on attachment 231305 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231305&action=review >> Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl:79 >> +my $python = ($^O =~ /cygwin/) ? "/usr/bin/python" : "python"; > > Nit: Would be nice to have a more readable for of "$^O". Since off-hand I have no idea what it means. s/for of/version of/ 1008645 6 231306 bfulgham 2014-05-12 10:35:25 -0700 Created attachment 231306 Patch 1008647 7 231306 joepeck 2014-05-12 10:38:42 -0700 Comment on attachment 231306 Patch Much nicer! Thanks. r=me 1008753 8 231306 commit-queue 2014-05-12 15:20:05 -0700 Comment on attachment 231306 Patch Clearing flags on attachment: 231306 Committed r168648: <http://trac.webkit.org/changeset/168648> 1008754 9 commit-queue 2014-05-12 15:20:09 -0700 All reviewed patches have been landed. Closing bug. 231305 2014-05-12 10:28:54 -0700 2014-05-12 10:35:22 -0700 Patch bug-132826-20140512102831.patch text/plain 3338 bfulgham SW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkocmV2aXNpb24gMTY4NjIzKQorKysgU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDE0LTA1LTEyICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAg ICAgIFtXaW5dIENvcnJlY3QgQ3lnd2luIFBhdGggQ29uZnVzaW9uIGluIFdlYkluc3BlY3RvclVJ IEJ1aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzI4MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFNjcmlwdHMvY29weS11c2VyLWludGVyZmFjZS1yZXNvdXJjZXMucGw6IElmIHRoZSBidWlsZCBp cyBydW5uaW5nCisgICAgICAgIHVuZGVyIEN5Z3dpbiwgYmUgc3VyZSB0byB1c2UgJy91c3IvYmlu L3B5dGhvbicsIGluc3RlYWQgb2YganVzdAorICAgICAgICAncHl0aG9uJyB0byBhdm9pZCBidWls ZCBlcnJvcnMuCisKIDIwMTQtMDUtMDkgIEFsYmVydG8gR2FyY2lhICA8YmVydG9AaWdhbGlhLmNv bT4KIAogICAgICAgICBqc21pbi5weSBsaWNlbnNlIGhlYWRlciBjb25mdXNpbmcsIG1lbnRpb25z IG5vbi1mcmVlIGxpY2Vuc2UKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2Nv cHktdXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJ bnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCShyZXZp c2lvbiAxNjg2MjMpCisrKyBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb3B5LXVzZXIt aW50ZXJmYWNlLXJlc291cmNlcy5wbAkod29ya2luZyBjb3B5KQpAQCAtNzYsNiArNzYsNyBAQCBt eSAkTElDRU5TRSA9IDw8J0VPRic7CiAgKi8KIEVPRgogCitteSAkcHl0aG9uID0gKCReTyA9fiAv Y3lnd2luLykgPyAiL3Vzci9iaW4vcHl0aG9uIiA6ICJweXRob24iOwogbXkgJGRlcml2ZWRTb3Vy Y2VzRGlyID0gJEVOVnsnREVSSVZFRF9TT1VSQ0VTX0RJUid9OwogbXkgJHNjcmlwdHNSb290ID0g RmlsZTo6U3BlYy0+Y2F0ZGlyKCRFTlZ7J1NSQ1JPT1QnfSwgJ1NjcmlwdHMnKTsKIG15ICR1aVJv b3QgPSBGaWxlOjpTcGVjLT5jYXRkaXIoJEVOVnsnU1JDUk9PVCd9LCAnVXNlckludGVyZmFjZScp OwpAQCAtMTQxLDE0ICsxNDIsMTQgQEAgaWYgKGRlZmluZWQgJEVOVnsnQ09NQklORV9JTlNQRUNU T1JfUkVTTwogICAgICMgTWluaWZ5IHRoZSBNYWluLmpzIGFuZCBNYWluLmNzcyBmaWxlcywgd2l0 aCBNYWluLmpzIGFwcGVuZGluZyB0byB0aGUgbGljZW5zZSB0aGF0IHdhcyBleHBvcnRlZCBhYm92 ZS4KICAgICBteSAkanNNaW5TY3JpcHQgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRzY3JpcHRzUm9v dCwgJ2pzbWluLnB5Jyk7CiAgICAgbXkgJGNzc01pblNjcmlwdCA9IEZpbGU6OlNwZWMtPmNhdGZp bGUoJHNjcmlwdHNSb290LCAnY3NzbWluLnB5Jyk7Ci0gICAgc3lzdGVtKHFxKHB5dGhvbiAiJGpz TWluU2NyaXB0IiA8ICIkZGVyaXZlZFNvdXJjZXNNYWluSlMiID4+ICIkdGFyZ2V0TWFpbkpTIikp IGFuZCBkaWUgIkZhaWxlZCB0byBtaW5pZnkgJGRlcml2ZWRTb3VyY2VzTWFpbkpTOiAkISI7Ci0g ICAgc3lzdGVtKHFxKHB5dGhvbiAiJGNzc01pblNjcmlwdCIgPCAiJGRlcml2ZWRTb3VyY2VzTWFp bkNTUyIgPj4gIiR0YXJnZXRNYWluQ1NTIikpIGFuZCBkaWUgIkZhaWxlZCB0byBtaW5pZnkgJGRl cml2ZWRTb3VyY2VzTWFpbkNTUzogJCEiOworICAgIHN5c3RlbShxcSgiJHB5dGhvbiIgIiRqc01p blNjcmlwdCIgPCAiJGRlcml2ZWRTb3VyY2VzTWFpbkpTIiA+PiAiJHRhcmdldE1haW5KUyIpKSBh bmQgZGllICJGYWlsZWQgdG8gbWluaWZ5ICRkZXJpdmVkU291cmNlc01haW5KUzogJCEiOworICAg IHN5c3RlbShxcSgiJHB5dGhvbiIgIiRjc3NNaW5TY3JpcHQiIDwgIiRkZXJpdmVkU291cmNlc01h aW5DU1MiID4+ICIkdGFyZ2V0TWFpbkNTUyIpKSBhbmQgZGllICJGYWlsZWQgdG8gbWluaWZ5ICRk ZXJpdmVkU291cmNlc01haW5DU1M6ICQhIjsKIAogICAgICMgTWluaWZ5IHRoZSBDb2RlTWlycm9y LmpzIGFuZCBDb2RlTWlycm9yLmNzcyBmaWxlcywgYXBwZW5kaW5nIHRvIHRoZSBsaWNlbnNlIHRo YXQgd2FzIGV4cG9ydGVkIGFib3ZlLgogICAgIG15ICRkZXJpdmVkU291cmVzc0NvZGVNaXJyb3JK UyA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJGRlcml2ZWRTb3VyY2VzRGlyLCAnQ29kZU1pcnJvci5q cycpOwogICAgIG15ICRkZXJpdmVkU291cmNlc0NvZGVNaXJyb3JDU1MgPSBGaWxlOjpTcGVjLT5j YXRmaWxlKCRkZXJpdmVkU291cmNlc0RpciwgJ0NvZGVNaXJyb3IuY3NzJyk7Ci0gICAgc3lzdGVt KHFxKHB5dGhvbiAiJGpzTWluU2NyaXB0IiA8ICIkZGVyaXZlZFNvdXJlc3NDb2RlTWlycm9ySlMi ID4+ICIkdGFyZ2V0Q29kZU1pcnJvckpTIikpIGFuZCBkaWUgIkZhaWxlZCB0byBtaW5pZnkgJGRl cml2ZWRTb3VyZXNzQ29kZU1pcnJvckpTOiAkISI7Ci0gICAgc3lzdGVtKHFxKHB5dGhvbiAiJGNz c01pblNjcmlwdCIgPCAiJGRlcml2ZWRTb3VyY2VzQ29kZU1pcnJvckNTUyIgPj4gIiR0YXJnZXRD b2RlTWlycm9yQ1NTIikpIGFuZCBkaWUgIkZhaWxlZCB0byBtaW5pZnkgJGRlcml2ZWRTb3VyY2Vz Q29kZU1pcnJvckNTUzogJCEiOworICAgIHN5c3RlbShxcSgiJHB5dGhvbiIgIiRqc01pblNjcmlw dCIgPCAiJGRlcml2ZWRTb3VyZXNzQ29kZU1pcnJvckpTIiA+PiAiJHRhcmdldENvZGVNaXJyb3JK UyIpKSBhbmQgZGllICJGYWlsZWQgdG8gbWluaWZ5ICRkZXJpdmVkU291cmVzc0NvZGVNaXJyb3JK UzogJCEiOworICAgIHN5c3RlbShxcSgiJHB5dGhvbiIgIiRjc3NNaW5TY3JpcHQiIDwgIiRkZXJp dmVkU291cmNlc0NvZGVNaXJyb3JDU1MiID4+ICIkdGFyZ2V0Q29kZU1pcnJvckNTUyIpKSBhbmQg ZGllICJGYWlsZWQgdG8gbWluaWZ5ICRkZXJpdmVkU291cmNlc0NvZGVNaXJyb3JDU1M6ICQhIjsK IAogICAgICMgQ29weSBvdmVyIE1haW4uaHRtbCBhbmQgdGhlIEltYWdlcyBkaXJlY3RvcnkuCiAg ICAgY29weSgkZGVyaXZlZFNvdXJjZXNNYWluSFRNTCwgRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkdGFy Z2V0UmVzb3VyY2VQYXRoLCAnTWFpbi5odG1sJykpOwo= 231306 2014-05-12 10:35:25 -0700 2014-05-12 15:20:04 -0700 Patch bug-132826-20140512103502.patch text/plain 3468 bfulgham SW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkocmV2aXNpb24gMTY4NjIzKQorKysgU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDE0LTA1LTEyICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAg ICAgIFtXaW5dIENvcnJlY3QgQ3lnd2luIFBhdGggQ29uZnVzaW9uIGluIFdlYkluc3BlY3RvclVJ IEJ1aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzI4MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFNjcmlwdHMvY29weS11c2VyLWludGVyZmFjZS1yZXNvdXJjZXMucGw6IElmIHRoZSBidWlsZCBp cyBydW5uaW5nCisgICAgICAgIHVuZGVyIEN5Z3dpbiwgYmUgc3VyZSB0byB1c2UgJy91c3IvYmlu L3B5dGhvbicsIGluc3RlYWQgb2YganVzdAorICAgICAgICAncHl0aG9uJyB0byBhdm9pZCBidWls ZCBlcnJvcnMuCisKIDIwMTQtMDUtMDkgIEFsYmVydG8gR2FyY2lhICA8YmVydG9AaWdhbGlhLmNv bT4KIAogICAgICAgICBqc21pbi5weSBsaWNlbnNlIGhlYWRlciBjb25mdXNpbmcsIG1lbnRpb25z IG5vbi1mcmVlIGxpY2Vuc2UKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2Nv cHktdXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJ bnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCShyZXZp c2lvbiAxNjg2MjMpCisrKyBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb3B5LXVzZXIt aW50ZXJmYWNlLXJlc291cmNlcy5wbAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDYgQEAKICMh L3Vzci9iaW4vcGVybCAtdwogCit1c2UgRW5nbGlzaDsKIHVzZSBGaWxlOjpDb3B5IHF3KGNvcHkp OwogdXNlIEZpbGU6OlBhdGggcXcobWFrZV9wYXRoKTsKIHVzZSBGaWxlOjpTcGVjOwpAQCAtNzYs NiArNzcsNyBAQCBteSAkTElDRU5TRSA9IDw8J0VPRic7CiAgKi8KIEVPRgogCitteSAkcHl0aG9u ID0gKCRPU05BTUUgPX4gL2N5Z3dpbi8pID8gIi91c3IvYmluL3B5dGhvbiIgOiAicHl0aG9uIjsK IG15ICRkZXJpdmVkU291cmNlc0RpciA9ICRFTlZ7J0RFUklWRURfU09VUkNFU19ESVInfTsKIG15 ICRzY3JpcHRzUm9vdCA9IEZpbGU6OlNwZWMtPmNhdGRpcigkRU5WeydTUkNST09UJ30sICdTY3Jp cHRzJyk7CiBteSAkdWlSb290ID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRFTlZ7J1NSQ1JPT1QnfSwg J1VzZXJJbnRlcmZhY2UnKTsKQEAgLTE0MSwxNCArMTQzLDE0IEBAIGlmIChkZWZpbmVkICRFTlZ7 J0NPTUJJTkVfSU5TUEVDVE9SX1JFU08KICAgICAjIE1pbmlmeSB0aGUgTWFpbi5qcyBhbmQgTWFp bi5jc3MgZmlsZXMsIHdpdGggTWFpbi5qcyBhcHBlbmRpbmcgdG8gdGhlIGxpY2Vuc2UgdGhhdCB3 YXMgZXhwb3J0ZWQgYWJvdmUuCiAgICAgbXkgJGpzTWluU2NyaXB0ID0gRmlsZTo6U3BlYy0+Y2F0 ZmlsZSgkc2NyaXB0c1Jvb3QsICdqc21pbi5weScpOwogICAgIG15ICRjc3NNaW5TY3JpcHQgPSBG aWxlOjpTcGVjLT5jYXRmaWxlKCRzY3JpcHRzUm9vdCwgJ2Nzc21pbi5weScpOwotICAgIHN5c3Rl bShxcShweXRob24gIiRqc01pblNjcmlwdCIgPCAiJGRlcml2ZWRTb3VyY2VzTWFpbkpTIiA+PiAi JHRhcmdldE1haW5KUyIpKSBhbmQgZGllICJGYWlsZWQgdG8gbWluaWZ5ICRkZXJpdmVkU291cmNl c01haW5KUzogJCEiOwotICAgIHN5c3RlbShxcShweXRob24gIiRjc3NNaW5TY3JpcHQiIDwgIiRk ZXJpdmVkU291cmNlc01haW5DU1MiID4+ICIkdGFyZ2V0TWFpbkNTUyIpKSBhbmQgZGllICJGYWls ZWQgdG8gbWluaWZ5ICRkZXJpdmVkU291cmNlc01haW5DU1M6ICQhIjsKKyAgICBzeXN0ZW0ocXEo IiRweXRob24iICIkanNNaW5TY3JpcHQiIDwgIiRkZXJpdmVkU291cmNlc01haW5KUyIgPj4gIiR0 YXJnZXRNYWluSlMiKSkgYW5kIGRpZSAiRmFpbGVkIHRvIG1pbmlmeSAkZGVyaXZlZFNvdXJjZXNN YWluSlM6ICQhIjsKKyAgICBzeXN0ZW0ocXEoIiRweXRob24iICIkY3NzTWluU2NyaXB0IiA8ICIk ZGVyaXZlZFNvdXJjZXNNYWluQ1NTIiA+PiAiJHRhcmdldE1haW5DU1MiKSkgYW5kIGRpZSAiRmFp bGVkIHRvIG1pbmlmeSAkZGVyaXZlZFNvdXJjZXNNYWluQ1NTOiAkISI7CiAKICAgICAjIE1pbmlm eSB0aGUgQ29kZU1pcnJvci5qcyBhbmQgQ29kZU1pcnJvci5jc3MgZmlsZXMsIGFwcGVuZGluZyB0 byB0aGUgbGljZW5zZSB0aGF0IHdhcyBleHBvcnRlZCBhYm92ZS4KICAgICBteSAkZGVyaXZlZFNv dXJlc3NDb2RlTWlycm9ySlMgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRkZXJpdmVkU291cmNlc0Rp ciwgJ0NvZGVNaXJyb3IuanMnKTsKICAgICBteSAkZGVyaXZlZFNvdXJjZXNDb2RlTWlycm9yQ1NT ID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkZGVyaXZlZFNvdXJjZXNEaXIsICdDb2RlTWlycm9yLmNz cycpOwotICAgIHN5c3RlbShxcShweXRob24gIiRqc01pblNjcmlwdCIgPCAiJGRlcml2ZWRTb3Vy ZXNzQ29kZU1pcnJvckpTIiA+PiAiJHRhcmdldENvZGVNaXJyb3JKUyIpKSBhbmQgZGllICJGYWls ZWQgdG8gbWluaWZ5ICRkZXJpdmVkU291cmVzc0NvZGVNaXJyb3JKUzogJCEiOwotICAgIHN5c3Rl bShxcShweXRob24gIiRjc3NNaW5TY3JpcHQiIDwgIiRkZXJpdmVkU291cmNlc0NvZGVNaXJyb3JD U1MiID4+ICIkdGFyZ2V0Q29kZU1pcnJvckNTUyIpKSBhbmQgZGllICJGYWlsZWQgdG8gbWluaWZ5 ICRkZXJpdmVkU291cmNlc0NvZGVNaXJyb3JDU1M6ICQhIjsKKyAgICBzeXN0ZW0ocXEoIiRweXRo b24iICIkanNNaW5TY3JpcHQiIDwgIiRkZXJpdmVkU291cmVzc0NvZGVNaXJyb3JKUyIgPj4gIiR0 YXJnZXRDb2RlTWlycm9ySlMiKSkgYW5kIGRpZSAiRmFpbGVkIHRvIG1pbmlmeSAkZGVyaXZlZFNv dXJlc3NDb2RlTWlycm9ySlM6ICQhIjsKKyAgICBzeXN0ZW0ocXEoIiRweXRob24iICIkY3NzTWlu U2NyaXB0IiA8ICIkZGVyaXZlZFNvdXJjZXNDb2RlTWlycm9yQ1NTIiA+PiAiJHRhcmdldENvZGVN aXJyb3JDU1MiKSkgYW5kIGRpZSAiRmFpbGVkIHRvIG1pbmlmeSAkZGVyaXZlZFNvdXJjZXNDb2Rl TWlycm9yQ1NTOiAkISI7CiAKICAgICAjIENvcHkgb3ZlciBNYWluLmh0bWwgYW5kIHRoZSBJbWFn ZXMgZGlyZWN0b3J5LgogICAgIGNvcHkoJGRlcml2ZWRTb3VyY2VzTWFpbkhUTUwsIEZpbGU6OlNw ZWMtPmNhdGZpbGUoJHRhcmdldFJlc291cmNlUGF0aCwgJ01haW4uaHRtbCcpKTsK