Title: [173889] trunk/Source/WebInspectorUI
- Revision
- 173889
- Author
- [email protected]
- Date
- 2014-09-23 14:08:36 -0700 (Tue, 23 Sep 2014)
Log Message
Web Inspector: Remove UserInterface/Images/gtk from Apple builds
https://bugs.webkit.org/show_bug.cgi?id=136955
Reviewed by Joseph Pecoraro.
* Scripts/copy-user-interface-resources.pl:
Remove Images/Legacy and Images/gtk on Mac and Windows builds by looking
at the MAC_OS_X_VERSION_MAJOR and OFFICIAL_BUILD environment vars.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (173888 => 173889)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-09-23 21:04:53 UTC (rev 173888)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-09-23 21:08:36 UTC (rev 173889)
@@ -1,3 +1,14 @@
+2014-09-23 Timothy Hatcher <[email protected]>
+
+ Web Inspector: Remove UserInterface/Images/gtk from Apple builds
+ https://bugs.webkit.org/show_bug.cgi?id=136955
+
+ Reviewed by Joseph Pecoraro.
+
+ * Scripts/copy-user-interface-resources.pl:
+ Remove Images/Legacy and Images/gtk on Mac and Windows builds by looking
+ at the MAC_OS_X_VERSION_MAJOR and OFFICIAL_BUILD environment vars.
+
2014-09-21 Saam Barati <[email protected]>
Web Inspector: fix TypeSet hierarchy in TypeTokenView
Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (173888 => 173889)
--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2014-09-23 21:04:53 UTC (rev 173888)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2014-09-23 21:08:36 UTC (rev 173889)
@@ -2,7 +2,7 @@
use English;
use File::Copy qw(copy);
-use File::Path qw(make_path);
+use File::Path qw(make_path remove_tree);
use File::Spec;
my $useDirCopy = 0;
@@ -178,6 +178,12 @@
ditto(File::Spec->catdir($uiRoot, 'Images'), File::Spec->catdir($targetResourcePath, 'Images'));
+ # Remove Images/Legacy on modern systems (OS X 10.10 Yosemite and greater or Windows).
+ remove_tree(File::Spec->catdir($targetResourcePath, 'Images', 'Legacy')) if (defined $ENV{'MAC_OS_X_VERSION_MAJOR'} && $ENV{'MAC_OS_X_VERSION_MAJOR'} ge 101000) or defined $ENV{'OFFICIAL_BUILD'};
+
+ # Remove Images/gtk on Mac and Windows builds.
+ remove_tree(File::Spec->catdir($targetResourcePath, 'Images', 'gtk')) if defined $ENV{'MAC_OS_X_VERSION_MAJOR'} or defined $ENV{'OFFICIAL_BUILD'};
+
# Copy the Legacy directory.
ditto(File::Spec->catfile($uiRoot, 'Protocol', 'Legacy'), File::Spec->catfile($protocolDir, 'Legacy'));
} else {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
