125179 2013-12-03 13:23:53 -0800 [Win] Support 64-bit Application Support Libraries Location 2013-12-03 13:48:04 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 125180 1 bfulgham bfulgham commit-queue dbates oldest_to_newest 956070 0 bfulgham 2013-12-03 13:23:53 -0800 Currently we don't expect WebKit users on Windows to be working with 64-bit builds. Our test infrastructure needs a way to support 32-bit and 64-bit runtimes so that we can develop and test these configurations. For now, use an environment variable WEBKIT_64_SUPPORT to specify the path to 64-bit versions of libxml2.dll, libxslt.dll, etc. In the future, these will be available someplace like "C:\Program Files\..." and we can remove this code. 956074 1 218333 bfulgham 2013-12-03 13:36:37 -0800 Created attachment 218333 Patch 956075 2 218333 thorton 2013-12-03 13:39:44 -0800 Comment on attachment 218333 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218333&action=review > Tools/ChangeLog:10 > + to speficy these locations. specify > Tools/Scripts/webkitdirs.pm:1577 > + # FIXME: Remove the following in https://webkit.org/b/125180 maybe these should say "FIXME (125180): Remove this temporary workaround" or something. Not sure the style. > Tools/Scripts/webkitdirs.pm:1614 > + print "WEBKIT_64_SUPPORT is set to: ", $ENV{"WEBKIT_64_SUPPORT"}, "\n" if isWin64(); #FIXME: Remove in https://webkit.org/b/125180 space after # > Tools/Scripts/webkitdirs.pm:2128 > + return $ENV{"WEBKIT_64_SUPPORT"}, "\n" if isWin64(); #FIXME: Remove in https://webkit.org/b/125180 space after # 956079 3 bfulgham 2013-12-03 13:48:04 -0800 Committed r160035: <http://trac.webkit.org/changeset/160035> 218333 2013-12-03 13:36:37 -0800 2013-12-03 13:39:43 -0800 Patch bug-125179-20131203133637.patch text/plain 2665 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE2MDAzMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDEzLTEyLTAzICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIFN1cHBvcnQgNjQtYml0IEFwcGxpY2F0aW9uIFN1cHBvcnQgTGli cmFyaWVzIExvY2F0aW9uIAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTI1MTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRW5hYmxlIHRoZSB1c2VyIHRvIHNwZWNpZnkgYSBsb2NhdGlvbiBmb3IgNjQtYml0 IHN1cHBvcnQgbGlicmFyaWVzIChzdWNoIGFzIGxpYnhtbDIsIElDVSwgZXRjLikKKyAgICAgICAg b24gV2luZG93cyB1bnRpbCBhbiBvZmZpY2lhbCBkaXN0cmlidXRpb24gaXMgYXZhaWxhYmxlIHRo YXQgcHJvcGVybHkgY3JlYXRlcyByZWdpc3RyeSBzZXR0aW5ncworICAgICAgICB0byBzcGVmaWN5 IHRoZXNlIGxvY2F0aW9ucy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAg ICAgICAgKHNldHVwQXBwbGVXaW5FbnYpOiBOb3RpZnkgdXNlciB0byBzZXQgV0VCS0lUXzY0X1NV UFBPUlQgZW52aXJvbm1lbnQgdmFyaWFibGUgaWYgbmVlZGVkLgorICAgICAgICAoc2V0dXBDeWd3 aW5FbnYpOiBSZXBvcnQgV0VXQktJVF82NF9TVVBQT1JUIHBhdGggd2hlbiBydW5uaW5nIDY0LWJp dCBidWlsZHMuCisgICAgICAgIChhcHBsZUFwcGxpY2F0aW9uU3VwcG9ydFBhdGgpOiBBZGQgV0VC S0lUXzY0X1NVUFBPUlQgbG9jYXRpb24gdG8gcnVudGltZSBlbnZpcm9ubWVudCB3aGVuCisgICAg ICAgIHJ1bm5pbmcgNjQtYml0IGJ1aWxkcy4KKwogMjAxMy0xMi0wMyAgTWFyayBIYWhuZW5iZXJn ICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAgIHJ1bi1qc2Mtc3RyZXNzLXRlc3Rz IG9ubHkgc3VwcG9ydHMgaG9zdCBlbnZpcm9ubWVudHMgdGhhdCBoYXZlIG1ha2UgaW5zdGFsbGVk CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiAxNjAwMTEpCisrKyBUb29scy9TY3JpcHRz L3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkKQEAgLTE1NzQsNiArMTU3NCwxMSBAQCBzdWIg c2V0dXBBcHBsZVdpbkVudigpCiAgICAgICAgICAgICBwcmludCAiICAgICAgICAgdG8gYmUgYWJs ZSBidWlsZCBXZWJLaXQgZnJvbSB3aXRoaW4gVmlzdWFsIFN0dWRpbyAyMDEwIGFuZCBuZXdlci5c blxuIjsKICAgICAgICAgfQogICAgIH0KKyAgICAjIEZJWE1FOiBSZW1vdmUgdGhlIGZvbGxvd2lu ZyBpbiBodHRwczovL3dlYmtpdC5vcmcvYi8xMjUxODAKKyAgICBpZiAoaXNXaW42NCgpIGFuZCAh JEVOVnsnV0VCS0lUXzY0X1NVUFBPUlQnfSkgeworICAgICAgICBwcmludCAiV2FybmluZzogWW91 IG11c3Qgc2V0IHRoZSAnV0VCS0lUXzY0X1NVUFBPUlQnIGVudmlyb25tZW50IHZhcmlhYmxlXG4i OworICAgICAgICBwcmludCAiICAgICAgICAgdG8gYmUgYWJsZSBydW4gV2ViS2l0IG9yIEphdmFT Y3JpcHRDb3JlIHRlc3RzLlxuXG4iOworICAgIH0KIH0KIAogc3ViIHNldHVwQ3lnd2luRW52KCkK QEAgLTE2MDYsNiArMTYxMSw3IEBAIHN1YiBzZXR1cEN5Z3dpbkVudigpCiAgICAgcHJpbnQgIkJ1 aWxkaW5nIHJlc3VsdHMgaW50bzogIiwgYmFzZVByb2R1Y3REaXIoKSwgIlxuIjsKICAgICBwcmlu dCAiV0VCS0lUX09VVFBVVERJUiBpcyBzZXQgdG86ICIsICRFTlZ7IldFQktJVF9PVVRQVVRESVIi fSwgIlxuIjsKICAgICBwcmludCAiV0VCS0lUX0xJQlJBUklFUyBpcyBzZXQgdG86ICIsICRFTlZ7 IldFQktJVF9MSUJSQVJJRVMifSwgIlxuIjsKKyAgICBwcmludCAiV0VCS0lUXzY0X1NVUFBPUlQg aXMgc2V0IHRvOiAiLCAkRU5WeyJXRUJLSVRfNjRfU1VQUE9SVCJ9LCAiXG4iIGlmIGlzV2luNjQo KTsgI0ZJWE1FOiBSZW1vdmUgaW4gaHR0cHM6Ly93ZWJraXQub3JnL2IvMTI1MTgwCiB9CiAKIHN1 YiBkaWVJZldpbmRvd3NQbGF0Zm9ybVNES05vdEluc3RhbGxlZApAQCAtMjExOCw2ICsyMTI0LDEw IEBAIHN1YiBidWlsZEd0a1Byb2plY3QKIAogc3ViIGFwcGxlQXBwbGljYXRpb25TdXBwb3J0UGF0 aAogeworICAgIGlmIChpc1dpbjY0KCkpIHsKKyAgICAgICAgcmV0dXJuICRFTlZ7IldFQktJVF82 NF9TVVBQT1JUIn0sICJcbiIgaWYgaXNXaW42NCgpOyAjRklYTUU6IFJlbW92ZSBpbiBodHRwczov L3dlYmtpdC5vcmcvYi8xMjUxODAKKyAgICB9CisKICAgICBvcGVuIElOU1RBTExfRElSLCAiPC9w cm9jL3JlZ2lzdHJ5L0hLRVlfTE9DQUxfTUFDSElORS9TT0ZUV0FSRS9BcHBsZVwgSW5jLi9BcHBs ZVwgQXBwbGljYXRpb25cIFN1cHBvcnQvSW5zdGFsbERpciI7CiAgICAgbXkgJHBhdGggPSA8SU5T VEFMTF9ESVI+OwogICAgICRwYXRoID1+IHMvW1xyXG5ceDAwXS4qLy87Cg==