Title: [204580] trunk/Tools
- Revision
- 204580
- Author
- [email protected]
- Date
- 2016-08-17 16:08:26 -0700 (Wed, 17 Aug 2016)
Log Message
[Win] Remove old libraries from build inputs
https://bugs.webkit.org/show_bug.cgi?id=160949
Reviewed by Dean Jackson.
Modify the download script to remove the old 'icuuc.lib' and
'icuin.lib' files for Windows builds.
* Scripts/update-webkit-auxiliary-libs:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (204579 => 204580)
--- trunk/Tools/ChangeLog 2016-08-17 23:02:08 UTC (rev 204579)
+++ trunk/Tools/ChangeLog 2016-08-17 23:08:26 UTC (rev 204580)
@@ -1,3 +1,15 @@
+2016-08-17 Brent Fulgham <[email protected]>
+
+ [Win] Remove old libraries from build inputs
+ https://bugs.webkit.org/show_bug.cgi?id=160949
+
+ Reviewed by Dean Jackson.
+
+ Modify the download script to remove the old 'icuuc.lib' and
+ 'icuin.lib' files for Windows builds.
+
+ * Scripts/update-webkit-auxiliary-libs:
+
2016-08-17 Jonathan Bedard <[email protected]>
Extra logging for crash reason
Modified: trunk/Tools/Scripts/update-webkit-auxiliary-libs (204579 => 204580)
--- trunk/Tools/Scripts/update-webkit-auxiliary-libs 2016-08-17 23:02:08 UTC (rev 204579)
+++ trunk/Tools/Scripts/update-webkit-auxiliary-libs 2016-08-17 23:08:26 UTC (rev 204580)
@@ -31,6 +31,8 @@
use strict;
use warnings;
use FindBin;
+use lib $FindBin::Bin;
+use webkitdirs;
my $file = "WebKitAuxiliaryLibrary";
my $zipFile = "$file.zip";
@@ -38,3 +40,17 @@
my $command = "$FindBin::Bin/update-webkit-dependency";
system("perl", $command, $auxiliaryLibsURL, "win") == 0 or die;
+
+if (isAnyWindows()) {
+ # Get rid of ancient ICU cruft
+ my $sourceDir = sourceDir();
+ my $webkitLibrariesDir = $ENV{'WEBKIT_LIBRARIES'} || File::Spec->catdir($sourceDir, "WebKitLibraries", "win");
+
+ foreach ("icuin.lib", "icuuc.lib") {
+ my $filePath = File::Spec->catfile($webkitLibrariesDir, "lib32", $_);
+ if (-f $filePath) {
+ print "Removing old $filePath.\n";
+ unlink $filePath or warn "Failed to delete $file: $!\n";
+ }
+ }
+}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
