29802 2009-09-28 04:38:08 -0700 [Qt] Make build-webkit script work on Windows 2009-09-29 09:20:02 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows XP RESOLVED FIXED Qt P2 Normal --- 29656 1 ossy webkit-unassigned commit-queue ddkilzer oldest_to_newest 150483 0 ossy 2009-09-28 04:38:08 -0700 If using cmd.exe shell on Windows, you should give correct parameters to mkdir command. The mkdir doesn't handle slashes in filepath, but backslashes. And if you pass -p parameter to mkdir, it will create directory named -p. You can create 1\2\3 directory structure without any additional switch on Windows. 150484 1 40225 ossy 2009-09-28 04:45:05 -0700 Created attachment 40225 proposed patch 150718 2 40225 ddkilzer 2009-09-28 16:49:25 -0700 Comment on attachment 40225 proposed patch Overall, this is a nice clean-up! Comments below. > + my $mkdirParentsSwitch = (($^O eq "MSWin32") ? "" : "-p"); A couple things here: - Instead of making a custom $mkdirParentsSwitch variable, I'd rather see you add an @mkdirArgs variable, and only add the "-p" switch to it if necessary. my @mkdirArgs; push @mkdirArgs, "-p" if !isWindows(); - The ($^O eq "MSWin32") test should really be isWindows() instead. (If you don't want to test for Cygwin, then fix isWindows() to only test for Windows, and update run-webkit-test to use "isCygwin() || isWindows()" in the place where it uses isWindows() now.) The rest of the changes look good! r- to address the above issues. 150884 3 40297 ossy 2009-09-29 05:52:18 -0700 Created attachment 40297 proposed patch Thx for constructive suggestions, I followed them, and patch updated. 150885 4 40298 ossy 2009-09-29 05:54:07 -0700 Created attachment 40298 proposed patch 150934 5 40298 ddkilzer 2009-09-29 09:07:07 -0700 Comment on attachment 40298 proposed patch Very nice! r=me 150937 6 40298 commit-queue 2009-09-29 09:19:42 -0700 Comment on attachment 40298 proposed patch Clearing flags on attachment: 40298 Committed r48880: <http://trac.webkit.org/changeset/48880> 150938 7 commit-queue 2009-09-29 09:20:02 -0700 All reviewed patches have been landed. Closing bug. 40225 2009-09-28 04:45:05 -0700 2009-09-29 05:52:18 -0700 proposed patch buildwebkit.patch text/plain 1692 ossy ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYjI4YzNmLi41ZGM0ZTAwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDkt MjggIENzYWJhIE9zenRyb2dvbmFjICA8b3N6aUBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBNYWtlIGJ1aWxkLXdl YmtpdCBzY3JpcHQgd29yayBvbiBXaW5kb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yOTgwMgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJz LnBtOgorICAgICAgICBSZW1vdmVkIHVubmVjZXNzYXJ5IC1wIHN3aXRjaCBmb3IgbWtkaXIgb24g V2luZG93cy4KKyAgICAgICAgVXNlIGNhbm9uaWNhbCBwYXRoLCB3aGljaCB1c2VzIHNsYXNoZXMg b3IgYmFja3NsYXNoZXMgZGVwZW5kcyBvbiBwbGF0Zm9ybS4KKwogMjAwOS0wOS0yNyAgSmFrdWIg V2llY3pvcmVrICA8ZmF3MjE3QGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBkM2I5ZTAwLi5mZmE5MGQ0 IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0zMCw2ICszMCw3IEBAIHVzZSBzdHJp Y3Q7CiB1c2Ugd2FybmluZ3M7CiB1c2UgRmluZEJpbjsKIHVzZSBGaWxlOjpCYXNlbmFtZTsKK3Vz ZSBGaWxlOjpTcGVjOwogdXNlIFBPU0lYOwogdXNlIFZDU1V0aWxzOwogCkBAIC0xMzAzLDE2ICsx MzA0LDE3IEBAIHN1YiBidWlsZFFNYWtlUHJvamVjdCgkQCkKICAgICAgICAgfQogICAgIH0KIAot ICAgIG15ICRkaXIgPSBiYXNlUHJvZHVjdERpcigpOworICAgIG15ICRkaXIgPSBGaWxlOjpTcGVj LT5jYW5vbnBhdGgoYmFzZVByb2R1Y3REaXIoKSk7CisgICAgbXkgJG1rZGlyUGFyZW50c1N3aXRj aCA9ICgoJF5PIGVxICJNU1dpbjMyIikgPyAiIiA6ICItcCIpOwogICAgIGlmICghIC1kICRkaXIp IHsKLSAgICAgICAgc3lzdGVtICJta2RpciIsICItcCIsICIkZGlyIjsKKyAgICAgICAgc3lzdGVt ICJta2RpciIsICRta2RpclBhcmVudHNTd2l0Y2gsICIkZGlyIjsKICAgICAgICAgaWYgKCEgLWQg JGRpcikgewogICAgICAgICAgICAgZGllICJGYWlsZWQgdG8gY3JlYXRlIHByb2R1Y3QgZGlyZWN0 b3J5ICIgLiAkZGlyOwogICAgICAgICB9CiAgICAgfQotICAgICRkaXIgPSAkZGlyIC4gIi8kY29u ZmlnIjsKKyAgICAkZGlyID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkZGlyLCAkY29uZmlnKTsKICAg ICBpZiAoISAtZCAkZGlyKSB7Ci0gICAgICAgIHN5c3RlbSAibWtkaXIiLCAiLXAiLCAiJGRpciI7 CisgICAgICAgIHN5c3RlbSAibWtkaXIiLCAkbWtkaXJQYXJlbnRzU3dpdGNoLCAiJGRpciI7CiAg ICAgICAgIGlmICghIC1kICRkaXIpIHsKICAgICAgICAgICAgIGRpZSAiRmFpbGVkIHRvIGNyZWF0 ZSBidWlsZCBkaXJlY3RvcnkgIiAuICRkaXI7CiAgICAgICAgIH0K 40297 2009-09-29 05:52:18 -0700 2009-09-29 05:54:07 -0700 proposed patch buildwebkit.patch text/plain 1689 ossy ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwppbmRleCBmNjlmNzcxLi4yZmM0YWNlIDEw MDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKKysrIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCkBAIC0xNzgsNyArMTc4LDcgQEAgaWYg KGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgICAgICAkcGxhdGZvcm0gPSAicXQtbWFjIjsKICAg ICB9IGVsc2lmIChpc0xpbnV4KCkpIHsKICAgICAgICAgJHBsYXRmb3JtID0gInF0LWxpbnV4IjsK LSAgICB9IGVsc2lmIChpc1dpbmRvd3MoKSkgeworICAgIH0gZWxzaWYgKGlzV2luZG93cygpIHx8 IGlzQ3lnd2luKCkpIHsKICAgICAgICAgJHBsYXRmb3JtID0gInF0LXdpbiI7CiAgICAgfSBlbHNl IHsKICAgICAgICAgJHBsYXRmb3JtID0gInF0IjsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpp bmRleCA2ZmRlZDFhLi4zYzdiNTM3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0z MSw2ICszMSw3IEBAIHVzZSBzdHJpY3Q7CiB1c2Ugd2FybmluZ3M7CiB1c2UgRmluZEJpbjsKIHVz ZSBGaWxlOjpCYXNlbmFtZTsKK3VzZSBGaWxlOjpTcGVjOwogdXNlIFBPU0lYOwogdXNlIFZDU1V0 aWxzOwogCkBAIC04NjUsNyArODY2LDcgQEAgc3ViIGlzRGFyd2luKCkKIAogc3ViIGlzV2luZG93 cygpCiB7Ci0gICAgcmV0dXJuIGlzQ3lnd2luKCkgfHwgKCReTyBlcSAiTVNXaW4zMiIpIHx8IDA7 CisgICAgcmV0dXJuICgkXk8gZXEgIk1TV2luMzIiKSB8fCAwOwogfQogCiBzdWIgaXNMaW51eCgp CkBAIC0xMzA0LDE2ICsxMzA1LDE4IEBAIHN1YiBidWlsZFFNYWtlUHJvamVjdCgkQCkKICAgICAg ICAgfQogICAgIH0KIAotICAgIG15ICRkaXIgPSBiYXNlUHJvZHVjdERpcigpOworICAgIG15ICRk aXIgPSBGaWxlOjpTcGVjLT5jYW5vbnBhdGgoYmFzZVByb2R1Y3REaXIoKSk7CisgICAgbXkgQG1r ZGlyQXJnczsKKyAgICBwdXNoIEBta2RpckFyZ3MsICItcCIgaWYgIWlzV2luZG93cygpOwogICAg IGlmICghIC1kICRkaXIpIHsKLSAgICAgICAgc3lzdGVtICJta2RpciIsICItcCIsICIkZGlyIjsK KyAgICAgICAgc3lzdGVtICJta2RpciIsIEBta2RpckFyZ3MsICIkZGlyIjsKICAgICAgICAgaWYg KCEgLWQgJGRpcikgewogICAgICAgICAgICAgZGllICJGYWlsZWQgdG8gY3JlYXRlIHByb2R1Y3Qg ZGlyZWN0b3J5ICIgLiAkZGlyOwogICAgICAgICB9CiAgICAgfQotICAgICRkaXIgPSAkZGlyIC4g Ii8kY29uZmlnIjsKKyAgICAkZGlyID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkZGlyLCAkY29uZmln KTsKICAgICBpZiAoISAtZCAkZGlyKSB7Ci0gICAgICAgIHN5c3RlbSAibWtkaXIiLCAiLXAiLCAi JGRpciI7CisgICAgICAgIHN5c3RlbSAibWtkaXIiLCBAbWtkaXJBcmdzLCAiJGRpciI7CiAgICAg ICAgIGlmICghIC1kICRkaXIpIHsKICAgICAgICAgICAgIGRpZSAiRmFpbGVkIHRvIGNyZWF0ZSBi dWlsZCBkaXJlY3RvcnkgIiAuICRkaXI7CiAgICAgICAgIH0K 40298 2009-09-29 05:54:07 -0700 2009-09-29 09:19:42 -0700 proposed patch buildwebkit.patch text/plain 2434 ossy ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4MDQ5YzRkLi44ZGQ2Mzc1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDkt MjkgIENzYWJhIE9zenRyb2dvbmFjICA8b3N6aUBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBNYWtlIGJ1aWxkLXdl YmtpdCBzY3JpcHQgd29yayBvbiBXaW5kb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yOTgwMgorCisgICAgICAgICogU2NyaXB0cy9ydW4td2Via2l0 LXRlc3RzOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgIC0gUmVt b3ZlZCB1bm5lY2Vzc2FyeSAtcCBzd2l0Y2ggZm9yIG1rZGlyIG9uIFdpbmRvd3MuCisgICAgICAg ICAtIFVzZSBjYW5vbmljYWwgcGF0aCwgd2hpY2ggdXNlcyBzbGFzaGVzIG9yIGJhY2tzbGFzaGVz IGRlcGVuZHMgb24gcGxhdGZvcm0uCisgICAgICAgICAtIGlzV2luZG93cygpIG9ubHkgdGVzdCBm b3IgV2luZG93cyBhbmQgbm90IGZvciBDeXF3aW4uCisKIDIwMDktMDktMjggIEZ1bWl0b3NoaSBV a2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlk ZWwuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKaW5kZXggZjY5Zjc3MS4uMmZjNGFj ZSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwpAQCAtMTc4LDcgKzE3OCw3IEBA IGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAgJHBsYXRmb3JtID0gInF0LW1hYyI7 CiAgICAgfSBlbHNpZiAoaXNMaW51eCgpKSB7CiAgICAgICAgICRwbGF0Zm9ybSA9ICJxdC1saW51 eCI7Ci0gICAgfSBlbHNpZiAoaXNXaW5kb3dzKCkpIHsKKyAgICB9IGVsc2lmIChpc1dpbmRvd3Mo KSB8fCBpc0N5Z3dpbigpKSB7CiAgICAgICAgICRwbGF0Zm9ybSA9ICJxdC13aW4iOwogICAgIH0g ZWxzZSB7CiAgICAgICAgICRwbGF0Zm9ybSA9ICJxdCI7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMu cG0KaW5kZXggNmZkZWQxYS4uM2M3YjUzNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpA QCAtMzEsNiArMzEsNyBAQCB1c2Ugc3RyaWN0OwogdXNlIHdhcm5pbmdzOwogdXNlIEZpbmRCaW47 CiB1c2UgRmlsZTo6QmFzZW5hbWU7Cit1c2UgRmlsZTo6U3BlYzsKIHVzZSBQT1NJWDsKIHVzZSBW Q1NVdGlsczsKIApAQCAtODY1LDcgKzg2Niw3IEBAIHN1YiBpc0RhcndpbigpCiAKIHN1YiBpc1dp bmRvd3MoKQogewotICAgIHJldHVybiBpc0N5Z3dpbigpIHx8ICgkXk8gZXEgIk1TV2luMzIiKSB8 fCAwOworICAgIHJldHVybiAoJF5PIGVxICJNU1dpbjMyIikgfHwgMDsKIH0KIAogc3ViIGlzTGlu dXgoKQpAQCAtMTMwNCwxNiArMTMwNSwxOCBAQCBzdWIgYnVpbGRRTWFrZVByb2plY3QoJEApCiAg ICAgICAgIH0KICAgICB9CiAKLSAgICBteSAkZGlyID0gYmFzZVByb2R1Y3REaXIoKTsKKyAgICBt eSAkZGlyID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKGJhc2VQcm9kdWN0RGlyKCkpOworICAgIG15 IEBta2RpckFyZ3M7CisgICAgcHVzaCBAbWtkaXJBcmdzLCAiLXAiIGlmICFpc1dpbmRvd3MoKTsK ICAgICBpZiAoISAtZCAkZGlyKSB7Ci0gICAgICAgIHN5c3RlbSAibWtkaXIiLCAiLXAiLCAiJGRp ciI7CisgICAgICAgIHN5c3RlbSAibWtkaXIiLCBAbWtkaXJBcmdzLCAiJGRpciI7CiAgICAgICAg IGlmICghIC1kICRkaXIpIHsKICAgICAgICAgICAgIGRpZSAiRmFpbGVkIHRvIGNyZWF0ZSBwcm9k dWN0IGRpcmVjdG9yeSAiIC4gJGRpcjsKICAgICAgICAgfQogICAgIH0KLSAgICAkZGlyID0gJGRp ciAuICIvJGNvbmZpZyI7CisgICAgJGRpciA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJGRpciwgJGNv bmZpZyk7CiAgICAgaWYgKCEgLWQgJGRpcikgewotICAgICAgICBzeXN0ZW0gIm1rZGlyIiwgIi1w IiwgIiRkaXIiOworICAgICAgICBzeXN0ZW0gIm1rZGlyIiwgQG1rZGlyQXJncywgIiRkaXIiOwog ICAgICAgICBpZiAoISAtZCAkZGlyKSB7CiAgICAgICAgICAgICBkaWUgIkZhaWxlZCB0byBjcmVh dGUgYnVpbGQgZGlyZWN0b3J5ICIgLiAkZGlyOwogICAgICAgICB9Cg==