129380 2014-02-26 10:43:18 -0800 [GTK][CMake] build-webkit should rerun cmake if the Makefile is missing 2014-03-05 08:46:46 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson commit-queue dbates oldest_to_newest 984804 0 mrobinson 2014-02-26 10:43:18 -0800 We try to avoid running cmake when we don't have to. There are circumstances where CMake creates the CMake cache, but not the Makefile or the Makefile is removed. In those cases, we should rerun cmake instead of skipping it. 984815 1 225268 mrobinson 2014-02-26 11:17:30 -0800 Created attachment 225268 Patch 987264 2 225268 pnormand 2014-03-05 08:07:42 -0800 Comment on attachment 225268 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225268&action=review > Tools/Scripts/webkitdirs.pm:1982 > + if (isGtk() && -e cmakeCachePath() && -e File::Spec->catdir(baseProductDir(), configuration(), "Makefile")) { Shouldn't it be catfile? 987268 3 225268 pnormand 2014-03-05 08:26:51 -0800 Comment on attachment 225268 Patch Well it would work with catdir but if you can use catfile for consistency sake before landing it'd be great :) 987277 4 mrobinson 2014-03-05 08:46:46 -0800 Committed r165111: <http://trac.webkit.org/changeset/165111> 225268 2014-02-26 11:17:30 -0800 2014-03-05 08:26:50 -0800 Patch bug-129380-20140226111730.patch text/plain 1451 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NzIyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzg5NWUzZTM3YmU5ZDhlY2FmZDE0Zjg0NzQ5MDg3Mjg3 MDU1ZjFiMC4uNzk3NTcxMjVkODRkY2IwYTdjMmM5N2IwMGFmM2U0MjQ4ZDRlODA5YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2 IEBACiAyMDE0LTAyLTI2ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K IAorICAgICAgICBbR1RLXVtDTWFrZV0gYnVpbGQtd2Via2l0IHNob3VsZCByZXJ1biBjbWFrZSBp ZiB0aGUgTWFrZWZpbGUgaXMgbWlzc2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI5MzgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChnZW5l cmF0ZUJ1aWxkU3lzdGVtRnJvbUNNYWtlUHJvamVjdCk6IENoZWNrIGZvciB0aGUgZXhpc3RlbmNl IG9mIHRoZSBNYWtlZmlsZSBiZWZvcmUKKyAgICAgICAgc2tpcHBpbmcgQ01ha2UgZXhlY3V0aW9u LgorCisyMDE0LTAyLTI2ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K KwogICAgICAgICBFTkFCTEVfUFJPTUlTRVMgaXMgaW1wcm9wZXJseSBzcGVjaWZpZWQgYXMgRU5B QkxFX1BST01JU0UgaW4gRmVhdHVyZXMucG0KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyOTM3NwogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggMWY4MDZkYThi MjA1N2IxMjQ0NmM3NTFmZjcwZjdhYjY3MTVjZmQ3NS4uYzM5M2M4ZWNjMjU5M2QxMGViZTY0OWE5 YzVjMDY5MjdkYzU2MzFhYyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTk3OSw3ICsxOTc5LDcgQEAg c3ViIGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0CiAgICAgY2hkaXIoJGJ1aWxk UGF0aCkgb3IgZGllOwogCiAgICAgIyBGb3IgR1RLKyB3ZSB0cnkgdG8gYmUgc21hcnQgYWJvdXQg d2hlbiB0byByZXJ1biBjbWFrZSwgc28gdGhhdCB3ZSBjYW4gaGF2ZSBmYXN0ZXIgaW5jcmVtZW50 YWwgYnVpbGRzLgotICAgIGlmIChpc0d0aygpICYmIC1lIGNtYWtlQ2FjaGVQYXRoKCkpIHsKKyAg ICBpZiAoaXNHdGsoKSAmJiAtZSBjbWFrZUNhY2hlUGF0aCgpICYmIC1lIEZpbGU6OlNwZWMtPmNh dGRpcihiYXNlUHJvZHVjdERpcigpLCBjb25maWd1cmF0aW9uKCksICJNYWtlZmlsZSIpKSB7CiAg ICAgICAgIHJldHVybiAwOwogICAgIH0KIAo=