124380 2013-11-14 14:27:39 -0800 [Win] Improve support for command line build of 64-bit JSC 2013-11-14 20:56:49 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham commit-queue dbates webkit-bug-importer oldest_to_newest 950849 0 bfulgham 2013-11-14 14:27:39 -0800 The existing build scripts improperly include the "|x64" suffix to the build configuration when chaining scripts together, such as when using "run-javascriptcore-tests". This patch removes this problem so that 32-bit and 64-bit JSC build and tests can be run from the command line. 950850 1 216981 bfulgham 2013-11-14 14:31:21 -0800 Created attachment 216981 Patch 950852 2 webkit-bug-importer 2013-11-14 14:34:49 -0800 <rdar://problem/15473874> 950898 3 216981 ddkilzer 2013-11-14 16:26:24 -0800 Comment on attachment 216981 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=216981&action=review r=me! > Tools/Scripts/webkitdirs.pm:377 > + push(@args, '--debug') if ($configuration =~ "Debug"); > + push(@args, '--release') if ($configuration =~ "Release"); Nit: Maybe match on "^Debug" and "^Release" Or do you want other (less valid) things to work as well? 950942 4 bfulgham 2013-11-14 20:56:05 -0800 Committed r159328: <http://trac.webkit.org/changeset/159328> 950943 5 bfulgham 2013-11-14 20:56:49 -0800 I incorporated David's improvement. 216981 2013-11-14 14:31:21 -0800 2013-11-14 16:26:24 -0800 Patch bug-124380-20131114143120.patch text/plain 2665 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1OTMxMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDEzLTExLTE0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIEltcHJvdmUgc3VwcG9ydCBmb3IgY29tbWFuZCBsaW5lIGJ1aWxk cyBvZiA2NC1iaXQgSlNDCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjQzODAKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAg ICAgKGFyZ3VtZW50c0ZvckNvbmZpZ3VyYXRpb24pOiBSZWNvZ25pemUgYWxsIGZsYXZvcnMgb2Yg RGVidWcgYW5kIFJlbGVhc2UgKGkuZS4sICdEZWJ1ZycsCisgICAgICAgICdEZWJ1Z3xXaW4zMics ICdEZWJ1Z3x4NjQnKSB3aGVuIHBhc3NpbmcgYXJndW1lbnRzIHRvIGNoaWxkIHByb2Nlc3Nlcy4K KyAgICAgICAgKGRldGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24pOiBEb24ndCBzdWZmaXggY29u ZmlndXJhdGlvbiB3aXRoICJ8V2luMzIiIG9yICJ8eDY0Ii4gVGhhdCdzCisgICAgICAgIHdoYXQg dGhlICIkY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbyIgdmFsdWUgaXMgZm9yLgorCiAyMDEz LTExLTE0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAg UmVtb3ZlIGR1cGxpY2F0ZSBlbnRyeS4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDE1 OTMwNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAt MzczLDggKzM3Myw4IEBAIHN1YiBhcmd1bWVudHNGb3JDb25maWd1cmF0aW9uKCkKICAgICBkZXRl cm1pbmVBcmNoaXRlY3R1cmUoKTsKIAogICAgIG15IEBhcmdzID0gKCk7Ci0gICAgcHVzaChAYXJn cywgJy0tZGVidWcnKSBpZiAkY29uZmlndXJhdGlvbiBlcSAiRGVidWciOwotICAgIHB1c2goQGFy Z3MsICctLXJlbGVhc2UnKSBpZiAkY29uZmlndXJhdGlvbiBlcSAiUmVsZWFzZSI7CisgICAgcHVz aChAYXJncywgJy0tZGVidWcnKSBpZiAoJGNvbmZpZ3VyYXRpb24gPX4gIkRlYnVnIik7CisgICAg cHVzaChAYXJncywgJy0tcmVsZWFzZScpIGlmICgkY29uZmlndXJhdGlvbiA9fiAiUmVsZWFzZSIp OwogICAgIHB1c2goQGFyZ3MsICctLTMyLWJpdCcpIGlmICgkYXJjaGl0ZWN0dXJlIG5lICJ4ODZf NjQiIGFuZCAhaXNXaW42NCgpKTsKICAgICBwdXNoKEBhcmdzLCAnLS02NC1iaXQnKSBpZiAoaXNX aW42NCgpKTsKICAgICBwdXNoKEBhcmdzLCAnLS1ndGsnKSBpZiBpc0d0aygpOwpAQCAtNjIwLDI0 ICs2MjAsMTggQEAgc3ViIGRldGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24KICAgICAgICAgICAg IHNwbGljZShAQVJHViwgJGksIDEpOwogICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24g PSAiRGVidWciOwogICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gIl9XaW5DYWly byIgaWYgKGlzV2luQ2Fpcm8oKSAmJiBpc0N5Z3dpbigpKTsKLSAgICAgICAgICAgICRwYXNzZWRD b25maWd1cmF0aW9uIC49ICJ8eDY0IiBpZiBpc1dpbjY0KCk7Ci0gICAgICAgICAgICAkcGFzc2Vk Q29uZmlndXJhdGlvbiAuPSAifFdpbjMyIiBpZiBpc1dpbmRvd3MoKSAmJiAhaXNXaW42NCgpOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmICgkb3B0ID1+IC9eLS1y ZWxlYXNlJC9pKSB7CiAgICAgICAgICAgICBzcGxpY2UoQEFSR1YsICRpLCAxKTsKICAgICAgICAg ICAgICRwYXNzZWRDb25maWd1cmF0aW9uID0gIlJlbGVhc2UiOwogICAgICAgICAgICAgJHBhc3Nl ZENvbmZpZ3VyYXRpb24gLj0gIl9XaW5DYWlybyIgaWYgKGlzV2luQ2Fpcm8oKSAmJiBpc0N5Z3dp bigpKTsKLSAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJ8eDY0IiBpZiBpc1dp bjY0KCk7Ci0gICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAifFdpbjMyIiBpZiBp c1dpbmRvd3MoKSAmJiAhaXNXaW42NCgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAgICAgICAgIGlmICgkb3B0ID1+IC9eLS1wcm9maWwoZXxpbmcpJC9pKSB7CiAgICAgICAgICAg ICBzcGxpY2UoQEFSR1YsICRpLCAxKTsKICAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9u ID0gIlByb2ZpbGluZyI7CiAgICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAiX1dp bkNhaXJvIiBpZiAoaXNXaW5DYWlybygpICYmIGlzQ3lnd2luKCkpOwotICAgICAgICAgICAgJHBh c3NlZENvbmZpZ3VyYXRpb24gLj0gInx4NjQiIGlmIGlzV2luNjQoKTsKLSAgICAgICAgICAgICRw YXNzZWRDb25maWd1cmF0aW9uIC49ICJ8V2luMzIiIGlmIGlzV2luZG93cygpICYmICFpc1dpbjY0 KCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9Cg==