16315 2007-12-05 17:37:40 -0800 FindSafari Needs Path-Only Option 2007-12-16 17:33:26 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 16314 1 bfulgham webkit-unassigned aroben oldest_to_newest 63396 0 bfulgham 2007-12-05 17:37:40 -0800 I wrote a little script (see Bug #16314) to launch Drosera. Unfortunately, the "FindSafari.exe /printSafariLauncher" command outputs both the environment needed to run as well as the launch command for Safari. FindSafari would be more useful to something like the Drosera script if it could just output the environment commands (perhaps with a "/printSafariEnvironment" option) What I currently get from FindSafari is this: ==================================================== $ ./FindSafari.exe /printSafariLauncher @echo off mkdir 2>NUL "%TMP%\WebKitNightly\Safari.resources" xcopy /y /i /d "C:\Program Files\Safari\Safari.exe" "%TMP%\WebKitNightly" xcopy /y /i /d /e "C:\Program Files\Safari\Safari.resources" "%TMP%\WebKitNightl y\Safari.resources" set PATH="%CD%;C:\Program Files\Safari\;%PATH%" "%TMP%\WebKitNightly\Safari.exe" /customWebKit ==================================================== What I would *LIKE* is this: ==================================================== $ ./FindSafari.exe /printSafariLauncher @echo off mkdir 2>NUL "%TMP%\WebKitNightly\Safari.resources" xcopy /y /i /d "C:\Program Files\Safari\Safari.exe" "%TMP%\WebKitNightly" xcopy /y /i /d /e "C:\Program Files\Safari\Safari.resources" "%TMP%\WebKitNightl y\Safari.resources" set PATH="%CD%;C:\Program Files\Safari\;%PATH%" ==================================================== 63530 1 17759 bfulgham 2007-12-06 14:16:56 -0800 Created attachment 17759 Modification to FindSafari.exe to emit environment information only. The attached patch modifies FindSafari to avoid issuing the command to launch Safari. This is useful to allow use of Drosera on the Windows platform (see Bug #16314). 64071 2 17759 aroben 2007-12-12 22:31:18 -0800 Comment on attachment 17759 Modification to FindSafari.exe to emit environment information only. + if (!printEnvironment) + { Our code style guidelines say that the brace should be on the same line as the if. See <http://webkit.org/coding/coding-style.html>. It seems a little strange that if you pass both /printSafariLauncher and /printSafariEnvironment, you only get the environment and don't get a launcher at all. Perhaps /printSafariLauncher should override /printSafariEnvironment? r- so that the above can be considered. 64104 3 17877 bfulgham 2007-12-13 13:04:28 -0800 Created attachment 17877 Updated patch based on initial review. Updated patch based on aroben's review comments. 64114 4 17877 aroben 2007-12-13 14:50:07 -0800 Comment on attachment 17877 Updated patch based on initial review. Looks like you uploaded the same patch again by accident. 64115 5 17883 bfulgham 2007-12-13 15:17:47 -0800 Created attachment 17883 Updated based on review. 64116 6 17883 bfulgham 2007-12-13 15:19:13 -0800 Comment on attachment 17883 Updated based on review. This should be the correct patch. 64117 7 17883 aroben 2007-12-13 15:55:07 -0800 Comment on attachment 17883 Updated based on review. + * ChangeLog: We normally don't list the ChangeLog in the list of changed files. r=me. Thanks for the patch! 64449 8 mrowe 2007-12-16 17:33:26 -0800 Landed in r28788. 17759 2007-12-06 14:16:56 -0800 2007-12-13 13:04:28 -0800 Modification to FindSafari.exe to emit environment information only. FindSafari.patch text/plain 1986 bfulgham SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI4NDk3 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTAgQEAKKzIwMDctMTIt MDYgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBGaW5kU2FmYXJpL0ZpbmRTYWZhcmku Y3BwOgorICAgICAgICAoX3RtYWluKToKKwogMjAwNy0xMi0wNiAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSBtYWluLmMgdG8gbWFpbi5jcHAg aGVyZSB0b28uCkluZGV4OiBGaW5kU2FmYXJpL0ZpbmRTYWZhcmkuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IEZpbmRTYWZhcmkvRmluZFNhZmFyaS5jcHAJKHJldmlzaW9uIDI4NDg2KQorKysgRmluZFNhZmFy aS9GaW5kU2FmYXJpLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI5LDYgKzEyOSw3IEBAIGludCBf dG1haW4oaW50IGFyZ2MsIFRDSEFSKiBhcmd2W10pCiAgICAgfQogCiAgICAgYm9vbCBwcmludExh dW5jaGVyID0gZmFsc2U7CisgICAgYm9vbCBwcmludEVudmlyb25tZW50ID0gZmFsc2U7CiAgICAg Ym9vbCBkZWJ1Z2dlciA9IGZhbHNlOwogCiAgICAgZm9yIChpbnQgaSA9IDE7IGkgPCBhcmdjOyAr K2kpIHsKQEAgLTEzNiwxMyArMTM3LDE3IEBAIGludCBfdG1haW4oaW50IGFyZ2MsIFRDSEFSKiBh cmd2W10pCiAgICAgICAgICAgICBwcmludExhdW5jaGVyID0gdHJ1ZTsKICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICB9CisgICAgICAgIGlmICghX3Rjc2NtcChhcmd2W2ldLCBURVhUKCIv cHJpbnRTYWZhcmlFbnZpcm9ubWVudCIpKSkgeworICAgICAgICAgICAgcHJpbnRFbnZpcm9ubWVu dCA9IHRydWU7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAgICAgICBpZiAo IV90Y3NjbXAoYXJndltpXSwgVEVYVCgiL2RlYnVnZ2VyIikpKSB7CiAgICAgICAgICAgICBkZWJ1 Z2dlciA9IHRydWU7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgIH0KIAot ICAgIGlmICghcHJpbnRMYXVuY2hlcikgeworICAgIGlmICghcHJpbnRMYXVuY2hlciAmJiAhcHJp bnRFbnZpcm9ubWVudCkgewogICAgICAgICBfdHByaW50ZihURVhUKCIlc1xuIiksIHBhdGgpOwog ICAgICAgICBmcmVlKHBhdGgpOwogICAgICAgICByZXR1cm4gMDsKQEAgLTE3Niw5ICsxODEsMTQg QEAgaW50IF90bWFpbihpbnQgYXJnYywgVENIQVIqIGFyZ3ZbXSkKICAgICB9CiAKICAgICBMUENU U1RSKiBlbmRMaW5lcyA9IGRlYnVnZ2VyID8gZGVidWdnZXJMaW5lcyA6IGxhdW5jaExpbmVzOwot ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCAoZGVidWdnZXIgPyBBUlJBWVNJWkUoZGVidWdn ZXJMaW5lcykgOiBBUlJBWVNJWkUobGF1bmNoTGluZXMpKTsgKytpKSB7Ci0gICAgICAgIF90cHJp bnRmKGVuZExpbmVzW2ldLCBjb21tYW5kKTsKLSAgICAgICAgX3RwcmludGYoVEVYVCgiXG4iKSk7 CisKKyAgICAvLyBEb24ndCBwcmludCBsYXVuY2ggY29tbWFuZCBpZiB3ZSBqdXN0IHdhbnQgdGhl IGVudmlyb25tZW50IHNldCB1cC4uLgorICAgIGlmICghcHJpbnRFbnZpcm9ubWVudCkKKyAgICB7 CisgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IChkZWJ1Z2dlciA/IEFSUkFZU0laRShk ZWJ1Z2dlckxpbmVzKSA6IEFSUkFZU0laRShsYXVuY2hMaW5lcykpOyArK2kpIHsKKyAgICAgICAg ICAgX3RwcmludGYoZW5kTGluZXNbaV0sIGNvbW1hbmQpOworICAgICAgICAgICBfdHByaW50ZihU RVhUKCJcbiIpKTsKKyAgICAgICB9CiAgICAgfQogCiAgICAgZnJlZShwYXRoKTsK 17877 2007-12-13 13:04:28 -0800 2007-12-13 15:17:47 -0800 Updated patch based on initial review. FindSafari.patch text/plain 1986 bfulgham SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI4NDk3 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTAgQEAKKzIwMDctMTIt MDYgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBGaW5kU2FmYXJpL0ZpbmRTYWZhcmku Y3BwOgorICAgICAgICAoX3RtYWluKToKKwogMjAwNy0xMi0wNiAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSBtYWluLmMgdG8gbWFpbi5jcHAg aGVyZSB0b28uCkluZGV4OiBGaW5kU2FmYXJpL0ZpbmRTYWZhcmkuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IEZpbmRTYWZhcmkvRmluZFNhZmFyaS5jcHAJKHJldmlzaW9uIDI4NDg2KQorKysgRmluZFNhZmFy aS9GaW5kU2FmYXJpLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI5LDYgKzEyOSw3IEBAIGludCBf dG1haW4oaW50IGFyZ2MsIFRDSEFSKiBhcmd2W10pCiAgICAgfQogCiAgICAgYm9vbCBwcmludExh dW5jaGVyID0gZmFsc2U7CisgICAgYm9vbCBwcmludEVudmlyb25tZW50ID0gZmFsc2U7CiAgICAg Ym9vbCBkZWJ1Z2dlciA9IGZhbHNlOwogCiAgICAgZm9yIChpbnQgaSA9IDE7IGkgPCBhcmdjOyAr K2kpIHsKQEAgLTEzNiwxMyArMTM3LDE3IEBAIGludCBfdG1haW4oaW50IGFyZ2MsIFRDSEFSKiBh cmd2W10pCiAgICAgICAgICAgICBwcmludExhdW5jaGVyID0gdHJ1ZTsKICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICB9CisgICAgICAgIGlmICghX3Rjc2NtcChhcmd2W2ldLCBURVhUKCIv cHJpbnRTYWZhcmlFbnZpcm9ubWVudCIpKSkgeworICAgICAgICAgICAgcHJpbnRFbnZpcm9ubWVu dCA9IHRydWU7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAgICAgICBpZiAo IV90Y3NjbXAoYXJndltpXSwgVEVYVCgiL2RlYnVnZ2VyIikpKSB7CiAgICAgICAgICAgICBkZWJ1 Z2dlciA9IHRydWU7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgIH0KIAot ICAgIGlmICghcHJpbnRMYXVuY2hlcikgeworICAgIGlmICghcHJpbnRMYXVuY2hlciAmJiAhcHJp bnRFbnZpcm9ubWVudCkgewogICAgICAgICBfdHByaW50ZihURVhUKCIlc1xuIiksIHBhdGgpOwog ICAgICAgICBmcmVlKHBhdGgpOwogICAgICAgICByZXR1cm4gMDsKQEAgLTE3Niw5ICsxODEsMTQg QEAgaW50IF90bWFpbihpbnQgYXJnYywgVENIQVIqIGFyZ3ZbXSkKICAgICB9CiAKICAgICBMUENU U1RSKiBlbmRMaW5lcyA9IGRlYnVnZ2VyID8gZGVidWdnZXJMaW5lcyA6IGxhdW5jaExpbmVzOwot ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCAoZGVidWdnZXIgPyBBUlJBWVNJWkUoZGVidWdn ZXJMaW5lcykgOiBBUlJBWVNJWkUobGF1bmNoTGluZXMpKTsgKytpKSB7Ci0gICAgICAgIF90cHJp bnRmKGVuZExpbmVzW2ldLCBjb21tYW5kKTsKLSAgICAgICAgX3RwcmludGYoVEVYVCgiXG4iKSk7 CisKKyAgICAvLyBEb24ndCBwcmludCBsYXVuY2ggY29tbWFuZCBpZiB3ZSBqdXN0IHdhbnQgdGhl IGVudmlyb25tZW50IHNldCB1cC4uLgorICAgIGlmICghcHJpbnRFbnZpcm9ubWVudCkKKyAgICB7 CisgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IChkZWJ1Z2dlciA/IEFSUkFZU0laRShk ZWJ1Z2dlckxpbmVzKSA6IEFSUkFZU0laRShsYXVuY2hMaW5lcykpOyArK2kpIHsKKyAgICAgICAg ICAgX3RwcmludGYoZW5kTGluZXNbaV0sIGNvbW1hbmQpOworICAgICAgICAgICBfdHByaW50ZihU RVhUKCJcbiIpKTsKKyAgICAgICB9CiAgICAgfQogCiAgICAgZnJlZShwYXRoKTsK 17883 2007-12-13 15:17:47 -0800 2007-12-13 15:55:07 -0800 Updated based on review. FindSafari.patch text/plain 2277 bfulgham SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI4Njkz KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDctMTIt MTMgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTYzMTUKKyAgICAgICAgRmluZFNhZmFyaSBuZWVkcyBhIHBhdGgtb25s eSBvcHRpb24uCisKKyAgICAgICAgKiBDaGFuZ2VMb2c6CisgICAgICAgICogRmluZFNhZmFyaS9G aW5kU2FmYXJpLmNwcDoKKyAgICAgICAgKF90bWFpbik6CisKKwogMjAwNy0xMi0xMiAgS2V2aW4g TWNDdWxsb3VnaCAgPGttY2N1bGxvdWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBBbGljZSBhbmQgU2FtLgpJbmRleDogRmluZFNhZmFyaS9GaW5kU2FmYXJpLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBGaW5kU2FmYXJpL0ZpbmRTYWZhcmkuY3BwCShyZXZpc2lvbiAyODY1NykKKysrIEZp bmRTYWZhcmkvRmluZFNhZmFyaS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyOSw2ICsxMjksNyBA QCBpbnQgX3RtYWluKGludCBhcmdjLCBUQ0hBUiogYXJndltdKQogICAgIH0KIAogICAgIGJvb2wg cHJpbnRMYXVuY2hlciA9IGZhbHNlOworICAgIGJvb2wgcHJpbnRFbnZpcm9ubWVudCA9IGZhbHNl OwogICAgIGJvb2wgZGVidWdnZXIgPSBmYWxzZTsKIAogICAgIGZvciAoaW50IGkgPSAxOyBpIDwg YXJnYzsgKytpKSB7CkBAIC0xMzYsMTMgKzEzNywyMiBAQCBpbnQgX3RtYWluKGludCBhcmdjLCBU Q0hBUiogYXJndltdKQogICAgICAgICAgICAgcHJpbnRMYXVuY2hlciA9IHRydWU7CiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgfQorICAgICAgICBpZiAoIV90Y3NjbXAoYXJndltpXSwg VEVYVCgiL3ByaW50U2FmYXJpRW52aXJvbm1lbnQiKSkpIHsKKyAgICAgICAgICAgIHByaW50RW52 aXJvbm1lbnQgPSB0cnVlOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KICAgICAg ICAgaWYgKCFfdGNzY21wKGFyZ3ZbaV0sIFRFWFQoIi9kZWJ1Z2dlciIpKSkgewogICAgICAgICAg ICAgZGVidWdnZXIgPSB0cnVlOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAg ICB9CiAKLSAgICBpZiAoIXByaW50TGF1bmNoZXIpIHsKKyAgICAvLyBwcmludExhdW5jaGVyIGlz IGluY2x1c2l2ZSBvZiBwcmludEVudmlyb25tZW50LCBzbyBkbyBub3QKKyAgICAvLyBsZWF2ZSBi b3RoIGVuYWJsZWQ6CisgICAgaWYgKHByaW50TGF1bmNoZXIgJiYgcHJpbnRFbnZpcm9ubWVudCkK KyAgICAgICAgcHJpbnRFbnZpcm9ubWVudCA9IGZhbHNlOworCisgICAgaWYgKCFwcmludExhdW5j aGVyICYmICFwcmludEVudmlyb25tZW50KSB7CiAgICAgICAgIF90cHJpbnRmKFRFWFQoIiVzXG4i KSwgcGF0aCk7CiAgICAgICAgIGZyZWUocGF0aCk7CiAgICAgICAgIHJldHVybiAwOwpAQCAtMTc2 LDkgKzE4NiwxMyBAQCBpbnQgX3RtYWluKGludCBhcmdjLCBUQ0hBUiogYXJndltdKQogICAgIH0K IAogICAgIExQQ1RTVFIqIGVuZExpbmVzID0gZGVidWdnZXIgPyBkZWJ1Z2dlckxpbmVzIDogbGF1 bmNoTGluZXM7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IChkZWJ1Z2dlciA/IEFSUkFZ U0laRShkZWJ1Z2dlckxpbmVzKSA6IEFSUkFZU0laRShsYXVuY2hMaW5lcykpOyArK2kpIHsKLSAg ICAgICAgX3RwcmludGYoZW5kTGluZXNbaV0sIGNvbW1hbmQpOwotICAgICAgICBfdHByaW50ZihU RVhUKCJcbiIpKTsKKworICAgIC8vIERvbid0IHByaW50IGxhdW5jaCBjb21tYW5kIGlmIHdlIGp1 c3Qgd2FudCB0aGUgZW52aXJvbm1lbnQgc2V0IHVwLi4uCisgICAgaWYgKCFwcmludEVudmlyb25t ZW50KSB7CisgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IChkZWJ1Z2dlciA/IEFSUkFZ U0laRShkZWJ1Z2dlckxpbmVzKSA6IEFSUkFZU0laRShsYXVuY2hMaW5lcykpOyArK2kpIHsKKyAg ICAgICAgICAgX3RwcmludGYoZW5kTGluZXNbaV0sIGNvbW1hbmQpOworICAgICAgICAgICBfdHBy aW50ZihURVhUKCJcbiIpKTsKKyAgICAgICB9CiAgICAgfQogCiAgICAgZnJlZShwYXRoKTsK