7122 2006-02-06 22:36:19 -0800 make build-webkit work for win32 2006-02-06 23:01:35 -0800 1 1 1 Unclassified WebKit Tools / Tests 420+ PC Windows XP RESOLVED FIXED P2 Normal --- 1 eric eric oldest_to_newest 31678 0 eric 2006-02-06 22:36:19 -0800 the attached patch fixes build-webkit for win32. This unblocks the win32 buildbot. 31679 1 6316 eric 2006-02-06 22:37:02 -0800 Created attachment 6316 patch to fix build-webkit on win32 31680 2 6316 hyatt 2006-02-06 22:39:06 -0800 Comment on attachment 6316 patch to fix build-webkit on win32 r=me 6316 2006-02-06 22:37:02 -0800 2006-02-06 22:39:06 -0800 patch to fix build-webkit on win32 windows-build.patch text/plain 6314 eric SW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDEyNjA4KQorKysgV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0xMjgsNiAr MTI4LDEyIEBAIHN1YiBwcm9kdWN0RGlyCiAgICAgcmV0dXJuICRjb25maWd1cmF0aW9uUHJvZHVj dERpcjsKIH0KIAorc3ViIGNvbmZpZ3VyYXRpb24oKQoreworICAgIGRldGVybWluZUNvbmZpZ3Vy YXRpb24oKTsKKyAgICByZXR1cm4gJGNvbmZpZ3VyYXRpb247Cit9CisKIHN1YiBYY29kZU9wdGlv bnMKIHsKICAgICBkZXRlcm1pbmVCYXNlUHJvZHVjdERpcigpOwpAQCAtMjUxLDI0ICsyNTcsMzgg QEAgc3ViIGNoZWNrV2ViQ29yZVNWR1N1cHBvcnQKICAgICByZXR1cm4gJGhhc1NWRzsKIH0KIAor CitzdWIgaXNDeWd3aW4oKQoreworICAgIHJldHVybiAoJF5PIGVxICJjeWd3aW4iKTsKK30KKwor c3ViIGlzT1NYKCkKK3sKKyAgICByZXR1cm4gKCReTyBlcSAiZGFyd2luIik7Cit9CisKIHN1YiBj aGVja1JlcXVpcmVkU3lzdGVtQ29uZmlnCiB7Ci0gICAgY2hvbXAobXkgJHByb2R1Y3RWZXJzaW9u ID0gYHN3X3ZlcnMgLXByb2R1Y3RWZXJzaW9uYCk7Ci0gICAgaWYgKCRwcm9kdWN0VmVyc2lvbiBs dCAiMTAuNCIpIHsKLSAgICAgICAgcHJpbnQgIioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipcbiI7Ci0gICAgICAgIHByaW50ICJNYWMg T1MgWCBWZXJzaW9uIDEwLjQuMCBvciBsYXRlciBpcyByZXF1aXJlZCB0byBidWlsZCBXZWJLaXQu XG4iOwotICAgICAgICBwcmludCAiWW91IGhhdmUgIiAuICRwcm9kdWN0VmVyc2lvbiAuICIsIHRo dXMgdGhlIGJ1aWxkIHdpbGwgbW9zdCBsaWtlbHkgZmFpbC5cbiI7Ci0gICAgICAgIHByaW50ICIq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqXG4iOwotICAgIH0KLSAgICBteSAkeGNvZGVWZXJzaW9uID0gYHhjb2RlYnVpbGQgLXZlcnNp b25gOwotICAgIGlmICgkeGNvZGVWZXJzaW9uICF+IC9EZXZUb29sc0NvcmUtKFxkKykvIHx8ICQx IDwgNjIwKSB7Ci0gICAgICAgIHByaW50ICIqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqXG4iOwotICAgICAgICBwcmludCAiWGNvZGUg VmVyc2lvbiAyLjEgb3IgbGF0ZXIgaXMgcmVxdWlyZWQgdG8gYnVpbGQgV2ViS2l0LlxuIjsKLSAg ICAgICAgcHJpbnQgIllvdSBoYXZlIGFuIGVhcmxpZXIgdmVyc2lvbiBvZiBYY29kZSwgdGh1cyB0 aGUgYnVpbGQgd2lsbFxuIjsKLSAgICAgICAgcHJpbnQgIm1vc3QgbGlrZWx5IGZhaWwuICBUaGUg bGF0ZXN0IFhjb2RlIGlzIGF2YWlsYWJsZSBmcm9tIHRoZSB3ZWI6XG4iOwotICAgICAgICBwcmlu dCAiaHR0cDovL2RldmVsb3Blci5hcHBsZS5jb20vdG9vbHMveGNvZGVcbiI7Ci0gICAgICAgIHBy aW50ICIqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqXG4iOworICAgIGlmIChpc09TWCgpKSB7CisgICAgICAgIGNob21wKG15ICRwcm9k dWN0VmVyc2lvbiA9IGBzd192ZXJzIC1wcm9kdWN0VmVyc2lvbmApOworICAgICAgICBpZiAoJHBy b2R1Y3RWZXJzaW9uIGx0ICIxMC40IikgeworICAgICAgICAgICAgcHJpbnQgIioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipcbiI7Cisg ICAgICAgICAgICBwcmludCAiTWFjIE9TIFggVmVyc2lvbiAxMC40LjAgb3IgbGF0ZXIgaXMgcmVx dWlyZWQgdG8gYnVpbGQgV2ViS2l0LlxuIjsKKyAgICAgICAgICAgIHByaW50ICJZb3UgaGF2ZSAi IC4gJHByb2R1Y3RWZXJzaW9uIC4gIiwgdGh1cyB0aGUgYnVpbGQgd2lsbCBtb3N0IGxpa2VseSBm YWlsLlxuIjsKKyAgICAgICAgICAgIHByaW50ICIqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqXG4iOworICAgICAgICB9CisgICAgICAg IG15ICR4Y29kZVZlcnNpb24gPSBgeGNvZGVidWlsZCAtdmVyc2lvbmA7CisgICAgICAgIGlmICgk eGNvZGVWZXJzaW9uICF+IC9EZXZUb29sc0NvcmUtKFxkKykvIHx8ICQxIDwgNjIwKSB7CisgICAg ICAgICAgICBwcmludCAiKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKlxuIjsKKyAgICAgICAgICAgIHByaW50ICJYY29kZSBWZXJzaW9u IDIuMSBvciBsYXRlciBpcyByZXF1aXJlZCB0byBidWlsZCBXZWJLaXQuXG4iOworICAgICAgICAg ICAgcHJpbnQgIllvdSBoYXZlIGFuIGVhcmxpZXIgdmVyc2lvbiBvZiBYY29kZSwgdGh1cyB0aGUg YnVpbGQgd2lsbFxuIjsKKyAgICAgICAgICAgIHByaW50ICJtb3N0IGxpa2VseSBmYWlsLiAgVGhl IGxhdGVzdCBYY29kZSBpcyBhdmFpbGFibGUgZnJvbSB0aGUgd2ViOlxuIjsKKyAgICAgICAgICAg IHByaW50ICJodHRwOi8vZGV2ZWxvcGVyLmFwcGxlLmNvbS90b29scy94Y29kZVxuIjsKKyAgICAg ICAgICAgIHByaW50ICIqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqXG4iOworICAgICAgICB9CiAgICAgfQorICAgICMgV2luMzIgYW5k IG90aGVyIHBsYXRmb3JtcyBtYXkgd2FudCB0byBjaGVjayBmb3IgbWluaW11bSBjb25maWcKIH0K IAogMTsKSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShyZXZpc2lvbiAxMjYwOCkKKysr IFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CSh3b3JraW5nIGNvcHkpCkBAIC01NSwy MSArNTUsMzAgQEAgZm9yIG15ICRkaXIgKEBwcm9qZWN0cywgQG90aGVyRGlycykgewogICAgIH0K IH0KIAotIyBDb3B5IGxpYnJhcnkgYW5kIGhlYWRlciBmcm9tIFdlYktpdExpYnJhcmllcyB0byBh IGZpbmRhYmxlIHBsYWNlIGluIHRoZSBwcm9kdWN0IGRpcmVjdG9yeS4KLW15ICRzcmNMaWIgPSAi V2ViS2l0TGlicmFyaWVzL2xpYldlYktpdFN5c3RlbUludGVyZmFjZS5hIjsKLW15ICRsaWIgPSAi JHByb2R1Y3REaXIvbGliV2ViS2l0U3lzdGVtSW50ZXJmYWNlLmEiOwotaWYgKCEtZSAkbGliIHx8 IC1NICRsaWIgPiAtTSAkc3JjTGliKSB7Ci0gICAgcHJpbnQgIlVwZGF0aW5nICRsaWJcbiI7Ci0g ICAgc3lzdGVtICJkaXR0byIsICRzcmNMaWIsICRsaWI7Ci0gICAgc3lzdGVtICJyYW5saWIiLCAk bGliOworaWYgKGlzT1NYKCkpIHsKKyAgICAjIENvcHkgbGlicmFyeSBhbmQgaGVhZGVyIGZyb20g V2ViS2l0TGlicmFyaWVzIHRvIGEgZmluZGFibGUgcGxhY2UgaW4gdGhlIHByb2R1Y3QgZGlyZWN0 b3J5LgorICAgIG15ICRzcmNMaWIgPSAiV2ViS2l0TGlicmFyaWVzL2xpYldlYktpdFN5c3RlbUlu dGVyZmFjZS5hIjsKKyAgICBteSAkbGliID0gIiRwcm9kdWN0RGlyL2xpYldlYktpdFN5c3RlbUlu dGVyZmFjZS5hIjsKKyAgICBpZiAoIS1lICRsaWIgfHwgLU0gJGxpYiA+IC1NICRzcmNMaWIpIHsK KyAgICAgICAgcHJpbnQgIlVwZGF0aW5nICRsaWJcbiI7CisgICAgICAgIHN5c3RlbSAiZGl0dG8i LCAkc3JjTGliLCAkbGliOworICAgICAgICBzeXN0ZW0gInJhbmxpYiIsICRsaWI7CisgICAgfQor ICAgIAorICAgIG15ICRzcmNIZWFkZXIgPSAiV2ViS2l0TGlicmFyaWVzL1dlYktpdFN5c3RlbUlu dGVyZmFjZS5oIjsKKyAgICBteSAkaGVhZGVyID0gIiRwcm9kdWN0RGlyL3Vzci9sb2NhbC9pbmNs dWRlL1dlYktpdFN5c3RlbUludGVyZmFjZS5oIjsKKyAgICBpZiAoIS1lICRoZWFkZXIgfHwgLU0g JGhlYWRlciA+IC1NICRzcmNIZWFkZXIpIHsKKyAgICAgICAgcHJpbnQgIlVwZGF0aW5nICRoZWFk ZXJcbiI7CisgICAgICAgIHN5c3RlbSAibWtkaXIiLCAiLXAiLCAiJHByb2R1Y3REaXIvdXNyL2xv Y2FsL2luY2x1ZGUiOworICAgICAgICBzeXN0ZW0gImRpdHRvIiwgJHNyY0hlYWRlciwgJGhlYWRl cjsKKyAgICB9CiB9CiAKLW15ICRzcmNIZWFkZXIgPSAiV2ViS2l0TGlicmFyaWVzL1dlYktpdFN5 c3RlbUludGVyZmFjZS5oIjsKLW15ICRoZWFkZXIgPSAiJHByb2R1Y3REaXIvdXNyL2xvY2FsL2lu Y2x1ZGUvV2ViS2l0U3lzdGVtSW50ZXJmYWNlLmgiOwotaWYgKCEtZSAkaGVhZGVyIHx8IC1NICRo ZWFkZXIgPiAtTSAkc3JjSGVhZGVyKSB7Ci0gICAgcHJpbnQgIlVwZGF0aW5nICRoZWFkZXJcbiI7 Ci0gICAgc3lzdGVtICJta2RpciIsICItcCIsICIkcHJvZHVjdERpci91c3IvbG9jYWwvaW5jbHVk ZSI7Ci0gICAgc3lzdGVtICJkaXR0byIsICRzcmNIZWFkZXIsICRoZWFkZXI7CitteSAkZGV2ZW52 UGF0aDsKK2lmIChpc0N5Z3dpbigpKSB7CisgICAgbXkgJHByb2dyYW1GaWxlc1BhdGggPSBgY3ln cGF0aCAiJEVOVnsnUFJPR1JBTUZJTEVTJ30iYDsKKyAgICBjaG9tcCAkcHJvZ3JhbUZpbGVzUGF0 aDsKKyAgICAkZGV2ZW52UGF0aCA9ICIkcHJvZ3JhbUZpbGVzUGF0aC9NaWNyb3NvZnQgVmlzdWFs IFN0dWRpbyA4L0NvbW1vbjcvSURFL2RldmVudi5leGUiOwogfQogCiAjIEZvcmNlIHJlLWxpbmsg b2YgZXhpc3RpbmcgbGlicmFyaWVzIGlmIGRpZmZlcmVudCB0aGFuIGV4cGVjdGVkCkBAIC03OSwx MiArODgsMjMgQEAgcmVtb3ZlTGlicmFyeURlcGVuZGluZ09uU1ZHKCJXZWJDb3JlIiwgJAogZm9y IG15ICRkaXIgKEBwcm9qZWN0cykgewogICAgIGNoZGlyICRkaXIgb3IgZGllOwogICAgIG15ICRy ZXN1bHQgPSAwOwotICAgIGlmICgkZGlyIGVxICJKYXZhU2NyaXB0Q29yZSIpIHsKLSAgICAgICAg JHJlc3VsdCA9IHN5c3RlbSAieGNvZGVidWlsZCIsICItcHJvamVjdCIsICIkZGlyLnhjb2RlcHJv aiIsICItdGFyZ2V0IiwgIkFsbCIsIEBvcHRpb25zLCBAQVJHVjsKLSAgICB9IGVsc2lmICgkZGly IGVxICJXZWJDb3JlIikgewotICAgICAgICAkcmVzdWx0ID0gc3lzdGVtICJ4Y29kZWJ1aWxkIiwg Ii1wcm9qZWN0IiwgIiRkaXIueGNvZGVwcm9qIiwgQG9wdGlvbnMsIEBBUkdWLCBAc3ZnT3B0aW9u czsKLSAgICB9IGVsc2UgewotICAgICAgICAkcmVzdWx0ID0gc3lzdGVtICJ4Y29kZWJ1aWxkIiwg Ii1wcm9qZWN0IiwgIiRkaXIueGNvZGVwcm9qIiwgQG9wdGlvbnMsIEBBUkdWOworICAgIGlmIChp c09TWCgpKSB7CisgICAgICAgICMgRklYTUU6IFNob3VsZG4ndCB3ZSB1c2UgIm1ha2UiIGhlcmUg bm93YWRheXM/CisgICAgICAgIGlmICgkZGlyIGVxICJKYXZhU2NyaXB0Q29yZSIpIHsKKyAgICAg ICAgICAgICRyZXN1bHQgPSBzeXN0ZW0gInhjb2RlYnVpbGQiLCAiLXByb2plY3QiLCAiJGRpci54 Y29kZXByb2oiLCAiLXRhcmdldCIsICJBbGwiLCBAb3B0aW9ucywgQEFSR1Y7CisgICAgICAgIH0g ZWxzaWYgKCRkaXIgZXEgIldlYkNvcmUiKSB7CisgICAgICAgICAgICAkcmVzdWx0ID0gc3lzdGVt ICJ4Y29kZWJ1aWxkIiwgIi1wcm9qZWN0IiwgIiRkaXIueGNvZGVwcm9qIiwgQG9wdGlvbnMsIEBB UkdWLCBAc3ZnT3B0aW9uczsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICRyZXN1bHQg PSBzeXN0ZW0gInhjb2RlYnVpbGQiLCAiLXByb2plY3QiLCAiJGRpci54Y29kZXByb2oiLCBAb3B0 aW9ucywgQEFSR1Y7CisgICAgICAgIH0KKyAgICB9IGVsc2lmIChpc0N5Z3dpbigpKSB7CisgICAg ICAgIGlmICgoJGRpciBlcSAiSmF2YVNjcmlwdENvcmUiKSB8fCAoJGRpciBlcSAiV2ViQ29yZSIp KSB7CisgICAgICAgICAgICBjaGRpciAiJGRpci52Y3Byb2oiIG9yIGRpZSAiRmFpbGVkIHRvIGNk IGludG8gJGRpci52Y3Byb2pcbiI7CisgICAgICAgICAgICBteSAkY29uZmlnID0gY29uZmlndXJh dGlvbigpOworICAgICAgICAgICAgcHJpbnQgIiRkZXZlbnZQYXRoICRkaXIuc2xuIC9idWlsZCAk Y29uZmlnXG4iOworICAgICAgICAgICAgJHJlc3VsdCA9IHN5c3RlbSAkZGV2ZW52UGF0aCwgIiRk aXIuc2xuIiwgIi9idWlsZCIsICRjb25maWc7CisgICAgICAgICAgICBjaGRpciAiLi4iIG9yIGRp ZTsKKyAgICAgICAgfQogICAgIH0KICAgICBleGl0IFdFWElUU1RBVFVTKCRyZXN1bHQpIGlmIFdF WElUU1RBVFVTKCRyZXN1bHQpOwogICAgIGNoZGlyICIuLiIgb3IgZGllOwo=