119351 2013-07-31 14:17:06 -0700 [Windows] Winlauncher shouldn't look for Safari Install Directory 2013-07-31 16:07:02 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham oldest_to_newest 913487 0 bfulgham 2013-07-31 14:17:06 -0700 The way we distribute the support libraries needed by WinLauncher and other software has changed. Instead of looking for the Safari directory (which may not exist), use the 'Common Files' target location where all support libraries are installed. This will avoid set-up problems on new systems, and make it easier to setup and deploy build/test bots. 913491 1 207877 bfulgham 2013-07-31 14:26:31 -0700 Created attachment 207877 Patch 913503 2 207877 darin 2013-07-31 15:29:38 -0700 Comment on attachment 207877 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207877&action=review > Tools/win/DLLLauncher/DLLLauncherMain.cpp:124 > +static bool directoryExists(wstring path) I suggest const wstring& here. 913506 3 bfulgham 2013-07-31 15:36:07 -0700 (In reply to comment #2) > (From update of attachment 207877 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=207877&action=review > > > Tools/win/DLLLauncher/DLLLauncherMain.cpp:124 > > +static bool directoryExists(wstring path) > > I suggest const wstring& here. Ah! Missed that. Thanks! 913517 4 bfulgham 2013-07-31 16:07:02 -0700 Committed r153544: <http://trac.webkit.org/changeset/153544> 207877 2013-07-31 14:26:31 -0700 2013-07-31 15:29:37 -0700 Patch bug-119351-20130731142634.patch text/plain 2864 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MzU0MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDEzLTA3LTMxICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBXaW5sYXVuY2hlciBzaG91bGRuJ3QgbG9vayBmb3IgU2Fm YXJpIEluc3RhbGwgRGlyZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTkzNTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHdpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3BwOiBEb24n dCBjaGVjayByZWdpc3RyeSBmb3IKKyAgICAgICAgdGhlIFNhZmFyaSBpbnN0YWxsIGxvY2F0aW9u LiBJbnN0ZWFkLCB1c2UgdGhlIHByb3BlciBzdXBwb3J0CisgICAgICAgIGxpYnJhcnkgcGF0aCBm b3IgdGhlIGJ1aWxkIGFyY2hpdGVjdHVyZS4KKwogMjAxMy0wNy0zMSAgQmVtIEpvbmVzLUJleSAg PGJqb25lc2JlQGFkb2JlLmNvbT4KIAogICAgICAgICBVcGRhdGUgc2NyaXB0cyB0byByZWZlcmVu Y2UgY29udHJpYnV0b3JzLmpzb24gaW5zdGVhZCBvZiBjb21taXR0ZXJzLnB5IGluIG1lc3NhZ2lu ZwpJbmRleDogVG9vbHMvd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFpbi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFpbi5jcHAJKHJldmlz aW9uIDE1MzU0MSkKKysrIFRvb2xzL3dpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC05NSwxMSArOTUsNiBAQCBzdGF0aWMgd3N0cmluZyBhcHBsZVBh dGhGcm9tUmVnaXN0cnkoY29uCiAgICAgcmV0dXJuIHBhdGg7CiB9CiAKLXN0YXRpYyB3c3RyaW5n IGFwcGxlQXBwbGljYXRpb25TdXBwb3J0RGlyZWN0b3J5KCkKLXsKLSAgICByZXR1cm4gYXBwbGVQ YXRoRnJvbVJlZ2lzdHJ5KEwiU09GVFdBUkVcXEFwcGxlIEluYy5cXEFwcGxlIEFwcGxpY2F0aW9u IFN1cHBvcnQiLCBMIkluc3RhbGxEaXIiKTsKLX0KLQogc3RhdGljIHdzdHJpbmcgY29weUVudmly b25tZW50VmFyaWFibGUoY29uc3Qgd3N0cmluZyYgdmFyaWFibGUpCiB7CiAgICAgRFdPUkQgbGVu Z3RoID0gOjpHZXRFbnZpcm9ubWVudFZhcmlhYmxlVyh2YXJpYWJsZS5jX3N0cigpLCAwLCAwKTsK QEAgLTEyNiwyNiArMTIxLDI0IEBAIHN0YXRpYyBpbnQgZmF0YWxFcnJvcihjb25zdCB3c3RyaW5n JiBwcm8KICAgICByZXR1cm4gMTsKIH0KIAorc3RhdGljIGJvb2wgZGlyZWN0b3J5RXhpc3RzKHdz dHJpbmcgcGF0aCkKK3sKKyAgICBEV09SRCBhdHRyaWIgPSA6OkdldEZpbGVBdHRyaWJ1dGVzKHBh dGguY19zdHIoKSk7CisKKyAgICByZXR1cm4gKChhdHRyaWIgIT0gSU5WQUxJRF9GSUxFX0FUVFJJ QlVURVMpICYmIChhdHRyaWIgJiBGSUxFX0FUVFJJQlVURV9ESVJFQ1RPUlkpKTsKK30KKwogc3Rh dGljIGJvb2wgbW9kaWZ5UGF0aChjb25zdCB3c3RyaW5nJiBwcm9ncmFtTmFtZSkKIHsKLSAgICBz dHJ1Y3QgewotICAgICAgICB3c3RyaW5nIHNvZnR3YXJlU3ViS2V5OwotICAgICAgICB3c3RyaW5n IHByb2R1Y3ROYW1lOwotICAgIH0gcHJvZHVjdHNbXSA9IHsKLSAgICAgICAgeyBMIkFwcGxlIElu Yy4iLCBMIkFwcGxlIEFwcGxpY2F0aW9uIFN1cHBvcnQiIH0sCi0gICAgICAgIHsgTCJBcHBsZSBD b21wdXRlciwgSW5jLiIsIEwiU2FmYXJpIiB9LAotICAgIH07Ci0KLSAgICB3c3RyaW5nIHBhdGhQ cmVmaXg7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBfY291bnRvZihwcm9kdWN0cyk7ICsr aSkgewotICAgICAgICB3c3RyaW5nIGRpcmVjdG9yeSA9IGFwcGxlUGF0aEZyb21SZWdpc3RyeShM IlNPRlRXQVJFXFwiICsgcHJvZHVjdHNbaV0uc29mdHdhcmVTdWJLZXkgKyBMIlxcIiArIHByb2R1 Y3RzW2ldLnByb2R1Y3ROYW1lLCBMIkluc3RhbGxEaXIiKTsKLSAgICAgICAgaWYgKGRpcmVjdG9y eS5lbXB0eSgpKSB7Ci0gICAgICAgICAgICBmYXRhbEVycm9yKHByb2dyYW1OYW1lLCBMIkZhaWxl ZCB0byBkZXRlcm1pbmUgcGF0aCB0byAiICsgcHJvZHVjdHNbaV0ucHJvZHVjdE5hbWUgKyBMIiBk aXJlY3RvcnkuIik7Ci0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLSAgICAg ICAgaWYgKGkpCi0gICAgICAgICAgICBwYXRoUHJlZml4ICs9IEwnOyc7Ci0gICAgICAgIHBhdGhQ cmVmaXggKz0gZGlyZWN0b3J5OworI2lmIGRlZmluZWQoX01fWDY0KQorICAgIHN0YXRpYyBjb25z dCB3c3RyaW5nIHBhdGhQcmVmaXggPSBMIkM6XFxQcm9ncmFtIEZpbGVzXFxDb21tb24gRmlsZXNc XEFwcGxlXFxBcHBsZSBBcHBsaWNhdGlvbiBTdXBwb3J0IjsKKyNlbHNlCisgICAgc3RhdGljIGNv bnN0IHdzdHJpbmcgcGF0aFByZWZpeCA9IEwiQzpcXFByb2dyYW0gRmlsZXMgKHg4NilcXENvbW1v biBGaWxlc1xcQXBwbGVcXEFwcGxlIEFwcGxpY2F0aW9uIFN1cHBvcnQiOworI2VuZGlmCisKKyAg ICBpZiAoIWRpcmVjdG9yeUV4aXN0cyhwYXRoUHJlZml4KSkgeworICAgICAgICBmYXRhbEVycm9y KHByb2dyYW1OYW1lLCBMIkZhaWxlZCB0byBkZXRlcm1pbmUgcGF0aCB0byBBQVMgZGlyZWN0b3J5 LiIpOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgaWYgKHByZXBlbmRQYXRo KHBhdGhQcmVmaXgpKQo=