149757 2015-10-02 11:08:45 -0700 Provide "--no-ninja" option to avoid using Ninja 2015-10-02 14:44:34 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham achristensen bfulgham commit-queue dbates lforschler oldest_to_newest 1130262 0 bfulgham 2015-10-02 11:08:45 -0700 Now that we are using CMake, it's great to be able to use Ninja to do my daily builds. However, I sometimes need to regenerate a Visual Studio solution so that I can more easily navigate and edit the files in the solution. Unfortunately, as soon as you install Ninja you are locked into that generator for building. We need a "--no-ninja" argument so we can switch back and forth as needed. 1130268 1 262343 bfulgham 2015-10-02 11:27:59 -0700 Created attachment 262343 Patch 1130273 2 262343 achristensen 2015-10-02 12:17:28 -0700 Comment on attachment 262343 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262343&action=review > Tools/Scripts/webkitdirs.pm:1817 > + return if ($shouldNotUseNinja); I think this will return the opposite of what you intend. 1130287 3 262347 bfulgham 2015-10-02 12:56:05 -0700 Created attachment 262347 Patch 1130309 4 bfulgham 2015-10-02 14:44:34 -0700 Committed r190524: <http://trac.webkit.org/changeset/190524> 262343 2015-10-02 11:27:59 -0700 2015-10-02 12:56:02 -0700 Patch bug-149757-20151002114338.patch text/plain 1641 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5MDUxMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE1LTEwLTAyICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFByb3ZpZGUgIi0tbm8tbmluamEiIG9wdGlvbiB0byBhdm9pZCB1c2luZyBO aW5qYQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5 NzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IGEgbmV3IGNvbW1hbmQgbGluZSBhcmd1bWVudCB1bmRlcnN0b29kIGJ5IHdlYmtpdGRpcnMucG0g c28KKyAgICAgICAgdGhhdCB3ZSBjYW4gY29uZGl0aW9uYWxseSBhdm9pZCB1c2luZyBOaW5qYS4g VGhpcyBpcyBhbgorICAgICAgICAnb3B0LW91dCcgYXJndW1lbnQsIHNvIG5vIGV4aXN0aW5nIE5p bmphIHVzZXJzIHNob3VsZCBiZSBhZmZlY3RlZC4KKyAgICAgICAgCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoY2FuVXNlTmluamEpOiBDaGVjayBmb3Igb3B0aW9u IGFuZCBibG9jayBuaW5qYSBpZiBwcmVzZW50LgorCiAyMDE1LTEwLTAyICBCcmVudCBGdWxnaGFt ICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5dIFVucmV2aWV3ZWQgdGVzdCBm aXguCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiAxOTA1MDYpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkKQEAgLTEyMCw2ICsxMjAsNyBAQCBteSAk aXNJbnNwZWN0b3JGcm9udGVuZDsKIG15ICRzaG91bGRUYXJnZXRXZWJQcm9jZXNzOwogbXkgJHNo b3VsZFVzZVhQQ1NlcnZpY2VGb3JXZWJQcm9jZXNzOwogbXkgJHNob3VsZFVzZUd1YXJkTWFsbG9j OworbXkgJHNob3VsZE5vdFVzZU5pbmphOwogbXkgJHhjb2RlVmVyc2lvbjsKIAogIyBWYXJpYWJs ZXMgZm9yIFdpbjMyIHN1cHBvcnQKQEAgLTE4MDksNiArMTgxMCwxMiBAQCBzdWIgcmVtb3ZlQ01h a2VDYWNoZShAKQogCiBzdWIgY2FuVXNlTmluamEoQCkKIHsKKyAgICBpZiAoIWRlZmluZWQoJHNo b3VsZE5vdFVzZU5pbmphKSkgeworICAgICAgICAkc2hvdWxkTm90VXNlTmluamEgPSBjaGVja0Zv ckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tbm8tbmluamEiKTsKKyAgICB9CisKKyAgICBy ZXR1cm4gaWYgKCRzaG91bGROb3RVc2VOaW5qYSk7CisKICAgICAjIFRlc3QgYm90aCBuaW5qYSBh bmQgbmluamEtYnVpbGQuIEZlZG9yYSB1c2VzIG5pbmphLWJ1aWxkIGFuZCBoYXMgcGF0Y2hlZCBD TWFrZSB0byBhbHNvIGNhbGwgbmluamEtYnVpbGQuCiAgICAgcmV0dXJuIGNvbW1hbmRFeGlzdHMo Im5pbmphIikgfHwgY29tbWFuZEV4aXN0cygibmluamEtYnVpbGQiKTsKIH0K 262347 2015-10-02 12:56:05 -0700 2015-10-02 13:00:43 -0700 Patch bug-149757-20151002131143.patch text/plain 1661 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5MDUxMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE1LTEwLTAyICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFByb3ZpZGUgIi0tbm8tbmluamEiIG9wdGlvbiB0byBhdm9pZCB1c2luZyBO aW5qYQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5 NzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IGEgbmV3IGNvbW1hbmQgbGluZSBhcmd1bWVudCB1bmRlcnN0b29kIGJ5IHdlYmtpdGRpcnMucG0g c28KKyAgICAgICAgdGhhdCB3ZSBjYW4gY29uZGl0aW9uYWxseSBhdm9pZCB1c2luZyBOaW5qYS4g VGhpcyBpcyBhbgorICAgICAgICAnb3B0LW91dCcgYXJndW1lbnQsIHNvIG5vIGV4aXN0aW5nIE5p bmphIHVzZXJzIHNob3VsZCBiZSBhZmZlY3RlZC4KKyAgICAgICAgCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoY2FuVXNlTmluamEpOiBDaGVjayBmb3Igb3B0aW9u IGFuZCBibG9jayBuaW5qYSBpZiBwcmVzZW50LgorCiAyMDE1LTEwLTAyICBCcmVudCBGdWxnaGFt ICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5dIFVucmV2aWV3ZWQgdGVzdCBm aXguCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiAxOTA1MDYpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkKQEAgLTEyMCw2ICsxMjAsNyBAQCBteSAk aXNJbnNwZWN0b3JGcm9udGVuZDsKIG15ICRzaG91bGRUYXJnZXRXZWJQcm9jZXNzOwogbXkgJHNo b3VsZFVzZVhQQ1NlcnZpY2VGb3JXZWJQcm9jZXNzOwogbXkgJHNob3VsZFVzZUd1YXJkTWFsbG9j OworbXkgJHNob3VsZE5vdFVzZU5pbmphOwogbXkgJHhjb2RlVmVyc2lvbjsKIAogIyBWYXJpYWJs ZXMgZm9yIFdpbjMyIHN1cHBvcnQKQEAgLTE4MDksNiArMTgxMCwxNCBAQCBzdWIgcmVtb3ZlQ01h a2VDYWNoZShAKQogCiBzdWIgY2FuVXNlTmluamEoQCkKIHsKKyAgICBpZiAoIWRlZmluZWQoJHNo b3VsZE5vdFVzZU5pbmphKSkgeworICAgICAgICAkc2hvdWxkTm90VXNlTmluamEgPSBjaGVja0Zv ckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tbm8tbmluamEiKTsKKyAgICB9CisKKyAgICBp ZiAoJHNob3VsZE5vdFVzZU5pbmphKSB7CisgICAgICAgIHJldHVybiAwOworICAgIH0KKwogICAg ICMgVGVzdCBib3RoIG5pbmphIGFuZCBuaW5qYS1idWlsZC4gRmVkb3JhIHVzZXMgbmluamEtYnVp bGQgYW5kIGhhcyBwYXRjaGVkIENNYWtlIHRvIGFsc28gY2FsbCBuaW5qYS1idWlsZC4KICAgICBy ZXR1cm4gY29tbWFuZEV4aXN0cygibmluamEiKSB8fCBjb21tYW5kRXhpc3RzKCJuaW5qYS1idWls ZCIpOwogfQo=