160949 2016-08-17 15:05:28 -0700 [Win] Remove old libraries from build inputs 2016-08-17 16:10:02 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build PC Windows 10 RESOLVED FIXED P2 Normal --- 160904 1 bfulgham bfulgham ap bfulgham dbates ddkilzer dino oldest_to_newest 1220972 0 bfulgham 2016-08-17 15:05:28 -0700 For historical reasons, WebKit builds on Windows used "icuuc.lib" and "icuin.lib" as the names of the ICU libraries. At some point, these were changed to "libicuuc.lib" and "libicuin.lib" and the build system modified to use them. The updates in Bug 160904 use CMake's 'find_library' utility to locate the ICU locations. Unfortunately, on some build bots this logic finds the old copies of icuuc/icuin and attempts to use them to perform the build, causing a failure. This patch updates the "update-webkit-auxiliary-libraries" script to remove these two files when running on Windows or Cygwin. It does not change the behavior of the WinCairo build or other platforms. 1220974 1 286333 bfulgham 2016-08-17 15:14:15 -0700 Created attachment 286333 Patch 1220987 2 bfulgham 2016-08-17 16:10:02 -0700 Committed r204580: <http://trac.webkit.org/changeset/204580> 286333 2016-08-17 15:14:15 -0700 2016-08-17 15:22:30 -0700 Patch bug-160949-20160817151227.patch text/plain 1786 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwNDU3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE2LTA4LTE3ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIFJlbW92ZSBvbGQgbGlicmFyaWVzIGZyb20gYnVpbGQgaW5wdXRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjA5NDkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb2RpZnkg dGhlIGRvd25sb2FkIHNjcmlwdCB0byByZW1vdmUgdGhlIG9sZCAnaWN1dWMubGliJyBhbmQKKyAg ICAgICAgJ2ljdWluLmxpYicgZmlsZXMgZm9yIFdpbmRvd3MgYnVpbGRzLgorCisgICAgICAgICog U2NyaXB0cy91cGRhdGUtd2Via2l0LWF1eGlsaWFyeS1saWJzOgorCiAyMDE2LTA4LTE3ICBEYW4g QmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSAtW05TU3RyaW5n IGlzRXF1YWxUb1N0cmluZzpdIHJldHVybnMgTk8gZm9yIGFueSBXS05TU3RyaW5nIGFyZ3VtZW50 CkluZGV4OiBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtYXV4aWxpYXJ5LWxpYnMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWF1eGlsaWFyeS1saWJzCShyZXZp c2lvbiAyMDQ1NzApCisrKyBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtYXV4aWxpYXJ5LWxp YnMJKHdvcmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDggQEAKIHVzZSBzdHJpY3Q7CiB1c2Ugd2Fy bmluZ3M7CiB1c2UgRmluZEJpbjsKK3VzZSBsaWIgJEZpbmRCaW46OkJpbjsKK3VzZSB3ZWJraXRk aXJzOwogCiBteSAkZmlsZSA9ICJXZWJLaXRBdXhpbGlhcnlMaWJyYXJ5IjsKIG15ICR6aXBGaWxl ID0gIiRmaWxlLnppcCI7IApAQCAtMzgsMyArNDAsMTcgQEAgbXkgJGF1eGlsaWFyeUxpYnNVUkwg PSAiaHR0cHM6Ly9kZXZlbG9wZQogbXkgJGNvbW1hbmQgPSAiJEZpbmRCaW46OkJpbi91cGRhdGUt d2Via2l0LWRlcGVuZGVuY3kiOwogCiBzeXN0ZW0oInBlcmwiLCAkY29tbWFuZCwgJGF1eGlsaWFy eUxpYnNVUkwsICJ3aW4iKSA9PSAwIG9yIGRpZTsKKworaWYgKGlzQW55V2luZG93cygpKSB7Cisg ICAgIyBHZXQgcmlkIG9mIGFuY2llbnQgSUNVIGNydWZ0CisgICAgbXkgJHNvdXJjZURpciA9IHNv dXJjZURpcigpOworICAgIG15ICR3ZWJraXRMaWJyYXJpZXNEaXIgPSAkRU5WeydXRUJLSVRfTElC UkFSSUVTJ30gfHwgRmlsZTo6U3BlYy0+Y2F0ZGlyKCRzb3VyY2VEaXIsICJXZWJLaXRMaWJyYXJp ZXMiLCAid2luIik7CisKKyAgICBmb3JlYWNoICgiaWN1aW4ubGliIiwgImljdXVjLmxpYiIpIHsK KyAgICAgICAgbXkgJGZpbGVQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkd2Via2l0TGlicmFy aWVzRGlyLCAibGliMzIiLCAkXyk7CisgICAgICAgIGlmICgtZiAkZmlsZVBhdGgpIHsKKyAgICAg ICAgICAgIHByaW50ICJSZW1vdmluZyBvbGQgJGZpbGVQYXRoLlxuIjsKKyAgICAgICAgICAgIHVu bGluayAkZmlsZVBhdGggb3Igd2FybiAiRmFpbGVkIHRvIGRlbGV0ZSAkZmlsZTogJCFcbiI7Cisg ICAgICAgIH0KKyAgICB9Cit9Cg==