29157 2009-09-10 15:26:38 -0700 [Qt] Add the ability to specify the mkspec when building with qmake 2009-10-05 22:28:51 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED INVALID Qt P2 Enhancement --- 0 ben webkit-unassigned eric vestbo oldest_to_newest 146368 0 39387 ben 2009-09-10 15:26:38 -0700 Created attachment 39387 patch for webkitdirs.pm It would be nice to specify the qt mkspec to build with. For example on mac you can compile with gcc, gcc-llvm or clang as they are all compatible. 149671 1 abarth 2009-09-23 23:00:32 -0700 I really wanted to review this patch, but it made my brain explode. 149804 2 39387 eric 2009-09-24 13:06:47 -0700 Comment on attachment 39387 patch for webkitdirs.pm If you want a non-qt person to review this you'll need to explain better in your ChangeLog what this does and why it's a good thing. 149920 3 ben 2009-09-24 19:26:01 -0700 By default the qmake build system of webkit uses the compiler spec that qt was built with. On OS X for example I built qt for gcc and so the default mkspec is gcc. If I want to test out building QtWebKit with gcc-llvm you currently have to make a special build or qt. This patch ads support so you can specify the mkspec on the build-webkit script. 150426 4 39387 hausmann 2009-09-27 14:19:48 -0700 Comment on attachment 39387 patch for webkitdirs.pm My perl is rusty. Tor Arne, I heard your perl skillz are pretty l33t these days ;-). Could you take a look at this one? 152244 5 39387 vestbo 2009-10-05 03:06:05 -0700 Comment on attachment 39387 patch for webkitdirs.pm Hmm, you should be able to set the spec already using --qmakearg="-spec macx-llvm", or using the QMAKESPEC environment variable. The only thing your patch does as far as I can tell is it makes sure we read the correct spec when determining whether to use nmake or make to build. If you want to support that I'd init the spec to $ENV{"QMAKESPEC"} || "default" in buildQMakeProject() and then pull out the spec on line 1290 if the arg is -spec, and then pass that on to qtMakeCommand(). Also, you can do my ($qmakebin, $spec) = @_; 152250 6 vestbo 2009-10-05 03:49:39 -0700 r49088 fixed an issue with the --qmakearg="-spec macx-llvm" syntax. 39387 2009-09-10 15:26:38 -0700 2009-10-05 03:06:04 -0700 patch for webkitdirs.pm qmake.patch text/plain 2778 ben RnJvbSBjM2MwZmExMTdlYTI3ZDI4NjhmODhmNTcwYTY1OGQ1NDJkZTI2MzRkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5qYW1pbiBDIE1leWVyIDxiZW5qYW1pbi5tZXllckB0b3Jj aG1vYmlsZS5jb20+CkRhdGU6IFRodSwgMTAgU2VwIDIwMDkgMTg6MTk6MTkgLTA0MDAKU3ViamVj dDogMjAwOS0wOS0xMCAgQmVuamFtaW4gQyBNZXllciAgPGJlbmphbWluLm1leWVyQHRvcmNobW9i aWxlLmNvbT4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgICBF bmhhbmNlIHRoZSBxbWFrZSBidWlsZCB0byBiZSBhYmxlIHRvIHNwZWNpZnkgdGhlIG1rc3BlYyB2 aWEgLS1zcGVjIG9yIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBRTUFLRVNQRUMKCiAgICAgICAg KiBTY3JpcHRzL3dlYmtpdGRpcnMucG06Ci0tLQogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nICAgICAg ICAgICAgIHwgICAgOCArKysrKysrKwogV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt IHwgICAyMyArKysrKysrKysrKysrKysrKystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNl cnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5n ZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCAzNGI3YjFlLi4yZDBiNDFhIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTEgQEAKKzIwMDktMDktMTAgIEJlbmphbWluIEMgTWV5ZXIgIDxiZW5qYW1p bi5tZXllckB0b3JjaG1vYmlsZS5jb20+CisgICAgICAgIAorICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIEVuaGFuY2UgdGhlIHFtYWtlIGJ1aWxk IHRvIGJlIGFibGUgdG8gc3BlY2lmeSB0aGUgbWtzcGVjIHZpYSAtLXNwZWMgb3IgdGhlIGVudmly b25tZW50IHZhcmlhYmxlIFFNQUtFU1BFQworICAgICAgICAKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdGRpcnMucG06CisKIDIwMDktMDktMDcgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9s bGl2aWVycy5jb20+CiAKICAgICAgICAgd3ggYnVpbGQgZml4ZXMgZm9yIHd4IFNWTiB0cnVuay4K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCA5Y2I5YzlmLi4zNmIzZWFlIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0xMTI0LDExICsxMTI0LDE5IEBAIHN1YiByZXRyaWV2 ZVFNYWtlc3BlY1ZhcgogICAgIHJldHVybiAkY29tcGlsZXI7CiB9CiAKLXN1YiBxdE1ha2VDb21t YW5kKCQpCitzdWIgcXRNYWtlQ29tbWFuZCgkJCkKIHsKLSAgICBteSAoJHFtYWtlYmluKSA9IEBf OworICAgIG15ICgkcW1ha2ViaW4sJHNwZWMpID0gKCRfWzBdLCAkX1sxXSk7CiAgICAgY2hvbXAo bXkgJG1rc3BlYyA9IGAkcW1ha2ViaW4gLXF1ZXJ5IFFNQUtFX01LU1BFQ1NgKTsKLSAgICAkbWtz cGVjIC49ICIvZGVmYXVsdCI7CisKKyAgICBpZiAoZGVmaW5lZCgkbWtzcGVjKSkgeworICAgICAg ICAkbWtzcGVjID1+IHMvXFwvXC8vZzsKKyAgICB9CisgICAgaWYgKGRlZmluZWQoJHNwZWMpKSB7 CisgICAgICAgICRta3NwZWMgLj0gIi8iLiAkc3BlYzsKKyAgICB9IGVsc2UgeworICAgICAgICAk bWtzcGVjIC49ICIvZGVmYXVsdCI7CisgICAgfQogICAgIG15ICRjb21waWxlciA9IHJldHJpZXZl UU1ha2VzcGVjVmFyKCIkbWtzcGVjL3FtYWtlLmNvbmYiLCAiUU1BS0VfQ0MiKTsKIAogICAgICNw cmludCAiZGVmYXVsdCBzcGVjOiAiIC4gJG1rc3BlYyAuICJcbiI7CkBAIC0xMjI4LDYgKzEyMzYs NyBAQCBzdWIgYnVpbGRRTWFrZVByb2plY3QoJEApCiAKICAgICBteSAkcW1ha2ViaW4gPSAicW1h a2UiOyAjIEFsbG93IG92ZXJyaWRlIG9mIHRoZSBxbWFrZSBiaW5hcnkgZnJvbSAkUEFUSAogICAg IG15ICRtYWtlYXJncyA9ICIiOworICAgIG15ICRzcGVjOwogICAgIGZvciBteSAkaSAoMCAuLiAk I2J1aWxkUGFyYW1zKSB7CiAgICAgICAgIG15ICRvcHQgPSAkYnVpbGRQYXJhbXNbJGldOwogICAg ICAgICBpZiAoJG9wdCA9fiAvXi0tcW1ha2U9KC4qKS9pICkgewpAQCAtMTIzNiwxMiArMTI0NSwx NiBAQCBzdWIgYnVpbGRRTWFrZVByb2plY3QoJEApCiAgICAgICAgICAgICBwdXNoIEBidWlsZEFy Z3MsICQxOwogICAgICAgICB9IGVsc2lmICgkb3B0ID1+IC9eLS1tYWtlYXJncz0oLiopL2kgKSB7 CiAgICAgICAgICAgICAkbWFrZWFyZ3MgPSAkMTsKKyAgICAgICAgfSBlbHNpZiAoJG9wdCA9fiAv Xi0tc3BlYz0oLiopL2kgKSB7CisgICAgICAgICAgICAkc3BlYyA9ICQxOwogICAgICAgICB9IGVs c2UgewogICAgICAgICAgICAgcHVzaCBAYnVpbGRBcmdzLCAkb3B0OwogICAgICAgICB9CiAgICAg fQotCi0gICAgbXkgJG1ha2UgPSBxdE1ha2VDb21tYW5kKCRxbWFrZWJpbik7CisgICAgdW5sZXNz KGRlZmluZWQoJHNwZWMpKSB7CisgICAgICAgICRzcGVjID0gJEVOVnsiUU1BS0VTUEVDIn07Cisg ICAgfQorICAgIG15ICRtYWtlID0gcXRNYWtlQ29tbWFuZCgkcW1ha2ViaW4sICRzcGVjKTsKICAg ICBteSAkY29uZmlnID0gY29uZmlndXJhdGlvbigpOwogICAgIG15ICRwcmVmaXggPSAkRU5WeyJX ZWJLaXRJbnN0YWxsYXRpb25QcmVmaXgifTsKIAotLSAKMS42LjAuNAoK