116109 2013-05-14 10:36:01 -0700 [Windows] Switch to embedded manifest commands for launcher executables 2013-05-14 10:56:39 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham lucas.de.marchi oldest_to_newest 888913 0 bfulgham 2013-05-14 10:36:01 -0700 I recently added an external manifest file to the Windows build (see Bug 115935). Instead, it is easier to maintain embedded manifest definitions, especially since most of our tools derive from the same DLLLauncherMain.cpp source file. This change updates DLLLaunherMain.cpp with a conditional manifest command that instructions VS2010 (or newer) builds to select the specific VS2005 runtime used to build the various WebKitAuxiliaryLibraries and WebKitSupportLibraries components. 888914 1 201732 bfulgham 2013-05-14 10:38:30 -0700 Created attachment 201732 Patch 888916 2 201732 darin 2013-05-14 10:39:30 -0700 Comment on attachment 201732 Patch rs=me 888932 3 bfulgham 2013-05-14 10:56:39 -0700 Committed r150080: <http://trac.webkit.org/changeset/150080> 201732 2013-05-14 10:38:30 -0700 2013-05-14 10:39:30 -0700 Patch bug-116109-20130514103724.patch text/plain 2940 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MDA3MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDEzLTA1LTE0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBTd2l0Y2ggdG8gZW1iZWRkZWQgbWFuaWZlc3QgY29tbWFu ZHMgZm9yIGxhdW5jaGVyIGV4ZWN1dGFibGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MTA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXaW5MYXVuY2hlci9XaW5MYXVuY2hlci52Y3hwcm9qL1dp bkxhdW5jaGVyLnZjeHByb2o6IFJlbW92ZSB0aGUKKyAgICAgICAgbm93LXVudXNlZCBXaW5MYXVu Y2hlci5leGUubWFuaWZlc3QgZmlsZS4KKyAgICAgICAgKiBXaW5MYXVuY2hlci9XaW5MYXVuY2hl ci52Y3hwcm9qL1dpbkxhdW5jaGVyLnZjeHByb2ouZmlsdGVyczogRGl0dG8uCisgICAgICAgICog d2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFpbi5jcHA6IEFkZCBlbWJlZGRlZCBtYW5pZmVz dCBjb21tYW5kCisgICAgICAgIHdoZW4gYnVpbGRpbmcgd2l0aCBWUzIwMTAgb3IgbmV3ZXIuCisK IDIwMTMtMDUtMTMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZGVkIHRlc3RSdW5uZXIuc2V0UHJpbnRpbmcuCkluZGV4OiBUb29scy9XaW5M YXVuY2hlci9XaW5MYXVuY2hlci52Y3hwcm9qL1dpbkxhdW5jaGVyLnZjeHByb2oKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIudmN4cHJvai9XaW5MYXVuY2hlci52 Y3hwcm9qCShyZXZpc2lvbiAxNTAwNzIpCisrKyBUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hl ci52Y3hwcm9qL1dpbkxhdW5jaGVyLnZjeHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTEwNCw5ICsx MDQsNiBAQAogICAgIDxOb25lIEluY2x1ZGU9IldpbkxhdW5jaGVyUG9zdEJ1aWxkLmNtZCIgLz4N CiAgICAgPE5vbmUgSW5jbHVkZT0iV2luTGF1bmNoZXJQcmVCdWlsZC5jbWQiIC8+DQogICA8L0l0 ZW1Hcm91cD4NCi0gIDxJdGVtR3JvdXA+DQotICAgIDxNYW5pZmVzdCBJbmNsdWRlPSJXaW5MYXVu Y2hlci5leGUubWFuaWZlc3QiIC8+DQotICA8L0l0ZW1Hcm91cD4NCiAgIDxJbXBvcnQgUHJvamVj dD0iJChWQ1RhcmdldHNQYXRoKVxNaWNyb3NvZnQuQ3BwLnRhcmdldHMiIC8+DQogICA8SW1wb3J0 R3JvdXAgTGFiZWw9IkV4dGVuc2lvblRhcmdldHMiPg0KICAgPC9JbXBvcnRHcm91cD4NCkluZGV4 OiBUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci52Y3hwcm9qL1dpbkxhdW5jaGVyLnZjeHBy b2ouZmlsdGVycwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci52 Y3hwcm9qL1dpbkxhdW5jaGVyLnZjeHByb2ouZmlsdGVycwkocmV2aXNpb24gMTUwMDcyKQorKysg VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIudmN4cHJvai9XaW5MYXVuY2hlci52Y3hwcm9q LmZpbHRlcnMJKHdvcmtpbmcgY29weSkKQEAgLTMwLDkgKzMwLDQgQEAKICAgICA8Tm9uZSBJbmNs dWRlPSJXaW5MYXVuY2hlclBvc3RCdWlsZC5jbWQiIC8+DQogICAgIDxOb25lIEluY2x1ZGU9Ildp bkxhdW5jaGVyUHJlQnVpbGQuY21kIiAvPg0KICAgPC9JdGVtR3JvdXA+DQotICA8SXRlbUdyb3Vw Pg0KLSAgICA8TWFuaWZlc3QgSW5jbHVkZT0iV2luTGF1bmNoZXIuZXhlLm1hbmlmZXN0Ij4NCi0g ICAgICA8RmlsdGVyPlJlc291cmNlIEZpbGVzPC9GaWx0ZXI+DQotICAgIDwvTWFuaWZlc3Q+DQot ICA8L0l0ZW1Hcm91cD4NCiA8L1Byb2plY3Q+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpJ bmRleDogVG9vbHMvd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFpbi5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvd2luL0RMTExhdW5jaGVyL0RMTExhdW5jaGVyTWFpbi5jcHAJKHJldmlzaW9u IDE1MDA3MikKKysrIFRvb2xzL3dpbi9ETExMYXVuY2hlci9ETExMYXVuY2hlck1haW4uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCw5IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAjZW5k aWYKIAogI3ByYWdtYSBjb21tZW50KGxpbmtlciwgIi9tYW5pZmVzdGRlcGVuZGVuY3k6XCJ0eXBl PSd3aW4zMicgbmFtZT0nTWljcm9zb2Z0LldpbmRvd3MuQ29tbW9uLUNvbnRyb2xzJyB2ZXJzaW9u PSc2LjAuMC4wJyBwcm9jZXNzb3JBcmNoaXRlY3R1cmU9JyIgUFJPQ0VTU09SQVJDSElURUNUVVJF ICInIHB1YmxpY0tleVRva2VuPSc2NTk1YjY0MTQ0Y2NmMWRmJyBsYW5ndWFnZT0nKidcIiIpCisj aWYgZGVmaW5lZChfTVNDX1ZFUikgJiYgKF9NU0NfVkVSID49IDE2MDApCisjcHJhZ21hIGNvbW1l bnQobGlua2VyLCAiL21hbmlmZXN0ZGVwZW5kZW5jeTpcInR5cGU9J3dpbjMyJyBuYW1lPSdNaWNy b3NvZnQuVkM4MC5DUlQnIHZlcnNpb249JzguMC41MDcyNy42MTk1JyBwcm9jZXNzb3JBcmNoaXRl Y3R1cmU9JyIgUFJPQ0VTU09SQVJDSElURUNUVVJFICInIHB1YmxpY0tleVRva2VuPScxZmM4YjNi OWExZTE4ZTNiJyBsYW5ndWFnZT0nKidcIiIpCisjZW5kaWYKIAogc3RhdGljIHZvaWQgZW5hYmxl VGVybWluYXRpb25PbkhlYXBDb3JydXB0aW9uKCkKIHsK