122357 2013-10-04 16:02:44 -0700 Teach webkitdirs.pm to honor the --64-bit flag 2013-10-04 16:57:57 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham commit-queue dbates ddkilzer webkit-bug-importer oldest_to_newest 936412 0 bfulgham 2013-10-04 16:02:44 -0700 The webkitdirs.pm module always inserts the "--32-bit" build flag into the list of arguments. This prevents a 64-bit build on Windows, even when you explicitly pass the "--64-bit" flag. This patch modifies the WebKit Perl modules to not override the user's explicit build target input. 936414 1 213414 bfulgham 2013-10-04 16:10:53 -0700 Created attachment 213414 Patch 936419 2 213414 ddkilzer 2013-10-04 16:29:37 -0700 Comment on attachment 213414 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213414&action=review r=me > Tools/Scripts/webkitdirs.pm:886 > + return $#matchingIndices > -1; I think this might be clearer: return scalar @matchingIndices > 0; Or: return scalar @matchingIndices; 936422 3 bfulgham 2013-10-04 16:33:19 -0700 Committed r156926: <http://trac.webkit.org/changeset/156926> 936427 4 bfulgham 2013-10-04 16:57:41 -0700 Please be sure to also include the small follow-up change: Committed r156928: <http://trac.webkit.org/changeset/r156928 > 936428 5 webkit-bug-importer 2013-10-04 16:57:57 -0700 <rdar://problem/15157760> 213414 2013-10-04 16:10:53 -0700 2013-10-04 16:29:36 -0700 Patch bug-122357-20131004161053.patch text/plain 2710 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1NjkyMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDEzLTEwLTA0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFRlYWNoIHdlYmtpdGRpcnMucG0gdG8gaG9ub3IgdGhlIC0tNjQtYml0IGZs YWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjM1 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoYXJndW1lbnRzRm9yQ29uZmlndXJhdGlvbik6 IE1vZGlmeSB0byBjaGVjayBpZiAtLTY0LWJpdCBpcyBzdXBwbGllZAorICAgICAgICBieSB0aGUg dXNlci4KKyAgICAgICAgKGZpbmRNYXRjaGluZ0FyZ3VtZW50cyk6IEFkZGVkLgorICAgICAgICAo aGFzQXJndW1lbnQpOiBBZGRlZC4KKyAgICAgICAgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVG cm9tQXJyYXlSZWYpOiBSZWZhY3RvciB0byB1c2UgdGhlIG5ldworICAgICAgICBmaW5kTWF0Y2hp bmdBcmd1bWVudHMgc3Vicm91dGluZS4KKwogMjAxMy0xMC0wNCAgQWxleGV5IFByb3NrdXJ5YWtv diAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgc3ZuLWNvbmZpZyBmb3IgbmV3IFZp c3VhbCBTdHVkaW8gZXh0ZW5zaW9ucwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gMTU2 OTE3KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0x MTQsNiArMTE0LDkgQEAgbXkgJHdpbGxVc2VWQ0V4cHJlc3NXaGVuQnVpbGRpbmcgPSAwOwogIyBE ZWZpbmVkIGluIFZDU1V0aWxzLgogc3ViIGV4aXRTdGF0dXMoJCk7CiAKK3N1YiBmaW5kTWF0Y2hp bmdBcmd1bWVudHMoJCQpOworc3ViIGhhc0FyZ3VtZW50KCQkKTsKKwogc3ViIGRldGVybWluZVNv dXJjZURpcgogewogICAgIHJldHVybiBpZiAkc291cmNlRGlyOwpAQCAtMzcyLDcgKzM3NSw3IEBA IHN1YiBhcmd1bWVudHNGb3JDb25maWd1cmF0aW9uKCkKICAgICBteSBAYXJncyA9ICgpOwogICAg IHB1c2goQGFyZ3MsICctLWRlYnVnJykgaWYgJGNvbmZpZ3VyYXRpb24gZXEgIkRlYnVnIjsKICAg ICBwdXNoKEBhcmdzLCAnLS1yZWxlYXNlJykgaWYgJGNvbmZpZ3VyYXRpb24gZXEgIlJlbGVhc2Ui OwotICAgIHB1c2goQGFyZ3MsICctLTMyLWJpdCcpIGlmICRhcmNoaXRlY3R1cmUgbmUgIng4Nl82 NCI7CisgICAgcHVzaChAYXJncywgJy0tMzItYml0JykgaWYgKCRhcmNoaXRlY3R1cmUgbmUgIng4 Nl82NCIgYW5kICFoYXNBcmd1bWVudCgnLS02NC1iaXQnLCBcQEFSR1YpKTsKICAgICBwdXNoKEBh cmdzLCAnLS1ndGsnKSBpZiBpc0d0aygpOwogICAgIHB1c2goQGFyZ3MsICctLWVmbCcpIGlmIGlz RWZsKCk7CiAgICAgcHVzaChAYXJncywgJy0td2luY2Fpcm8nKSBpZiBpc1dpbkNhaXJvKCk7CkBA IC04NjMsMTYgKzg2NiwzMCBAQCBzdWIgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdW CiAgICAgcmV0dXJuIGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQXJyYXlSZWYoJGFyZ1Rv Q2hlY2ssIFxAQVJHVik7CiB9CiAKLXN1YiBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFy cmF5UmVmCitzdWIgZmluZE1hdGNoaW5nQXJndW1lbnRzKCQkKQogewogICAgIG15ICgkYXJnVG9D aGVjaywgJGFycmF5UmVmKSA9IEBfOwotICAgIG15IEBpbmRpY2VzVG9SZW1vdmU7CisgICAgbXkg QG1hdGNoaW5nSW5kaWNlczsKICAgICBmb3JlYWNoIG15ICRpbmRleCAoMCAuLiAkIyRhcnJheVJl ZikgewogICAgICAgICBteSAkb3B0ID0gJCRhcnJheVJlZlskaW5kZXhdOwogICAgICAgICBpZiAo JG9wdCA9fiAvXiRhcmdUb0NoZWNrJC9pICkgewotICAgICAgICAgICAgcHVzaChAaW5kaWNlc1Rv UmVtb3ZlLCAkaW5kZXgpOworICAgICAgICAgICAgcHVzaChAbWF0Y2hpbmdJbmRpY2VzLCAkaW5k ZXgpOwogICAgICAgICB9CiAgICAgfQorICAgIHJldHVybiBAbWF0Y2hpbmdJbmRpY2VzOyAKK30K Kworc3ViIGhhc0FyZ3VtZW50KCQkKQoreworICAgIG15ICgkYXJnVG9DaGVjaywgJGFycmF5UmVm KSA9IEBfOworICAgIG15IEBtYXRjaGluZ0luZGljZXMgPSBmaW5kTWF0Y2hpbmdBcmd1bWVudHMo JGFyZ1RvQ2hlY2ssICRhcnJheVJlZik7CisgICAgcmV0dXJuICQjbWF0Y2hpbmdJbmRpY2VzID4g LTE7Cit9CisKK3N1YiBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFycmF5UmVmCit7Cisg ICAgbXkgKCRhcmdUb0NoZWNrLCAkYXJyYXlSZWYpID0gQF87CisgICAgbXkgQGluZGljZXNUb1Jl bW92ZSA9IGZpbmRNYXRjaGluZ0FyZ3VtZW50cygkYXJnVG9DaGVjaywgJGFycmF5UmVmKTsKICAg ICBmb3JlYWNoIG15ICRpbmRleCAoQGluZGljZXNUb1JlbW92ZSkgewogICAgICAgICBzcGxpY2Uo QCRhcnJheVJlZiwgJGluZGV4LCAxKTsKICAgICB9Cg==