Title: [168648] trunk/Source/WebInspectorUI
- Revision
- 168648
- Author
- bfulg...@apple.com
- Date
- 2014-05-12 15:19:35 -0700 (Mon, 12 May 2014)
Log Message
[Win] Correct Cygwin Path Confusion in WebInspectorUI Build
https://bugs.webkit.org/show_bug.cgi?id=132826
Reviewed by Joseph Pecoraro.
* Scripts/copy-user-interface-resources.pl: If the build is running
under Cygwin, be sure to use '/usr/bin/python', instead of just
'python' to avoid build errors.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (168647 => 168648)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-05-12 21:38:02 UTC (rev 168647)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-05-12 22:19:35 UTC (rev 168648)
@@ -1,3 +1,14 @@
+2014-05-12 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Correct Cygwin Path Confusion in WebInspectorUI Build
+ https://bugs.webkit.org/show_bug.cgi?id=132826
+
+ Reviewed by Joseph Pecoraro.
+
+ * Scripts/copy-user-interface-resources.pl: If the build is running
+ under Cygwin, be sure to use '/usr/bin/python', instead of just
+ 'python' to avoid build errors.
+
2014-05-09 Alberto Garcia <be...@igalia.com>
jsmin.py license header confusing, mentions non-free license
Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (168647 => 168648)
--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2014-05-12 21:38:02 UTC (rev 168647)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2014-05-12 22:19:35 UTC (rev 168648)
@@ -1,5 +1,6 @@
#!/usr/bin/perl -w
+use English;
use File::Copy qw(copy);
use File::Path qw(make_path);
use File::Spec;
@@ -76,6 +77,7 @@
*/
EOF
+my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python" : "python";
my $derivedSourcesDir = $ENV{'DERIVED_SOURCES_DIR'};
my $scriptsRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'Scripts');
my $uiRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'UserInterface');
@@ -141,14 +143,14 @@
# Minify the Main.js and Main.css files, with Main.js appending to the license that was exported above.
my $jsMinScript = File::Spec->catfile($scriptsRoot, 'jsmin.py');
my $cssMinScript = File::Spec->catfile($scriptsRoot, 'cssmin.py');
- system(qq(python "$jsMinScript" < "$derivedSourcesMainJS" >> "$targetMainJS")) and die "Failed to minify $derivedSourcesMainJS: $!";
- system(qq(python "$cssMinScript" < "$derivedSourcesMainCSS" >> "$targetMainCSS")) and die "Failed to minify $derivedSourcesMainCSS: $!";
+ system(qq("$python" "$jsMinScript" < "$derivedSourcesMainJS" >> "$targetMainJS")) and die "Failed to minify $derivedSourcesMainJS: $!";
+ system(qq("$python" "$cssMinScript" < "$derivedSourcesMainCSS" >> "$targetMainCSS")) and die "Failed to minify $derivedSourcesMainCSS: $!";
# Minify the CodeMirror.js and CodeMirror.css files, appending to the license that was exported above.
my $derivedSouressCodeMirrorJS = File::Spec->catfile($derivedSourcesDir, 'CodeMirror.js');
my $derivedSourcesCodeMirrorCSS = File::Spec->catfile($derivedSourcesDir, 'CodeMirror.css');
- system(qq(python "$jsMinScript" < "$derivedSouressCodeMirrorJS" >> "$targetCodeMirrorJS")) and die "Failed to minify $derivedSouressCodeMirrorJS: $!";
- system(qq(python "$cssMinScript" < "$derivedSourcesCodeMirrorCSS" >> "$targetCodeMirrorCSS")) and die "Failed to minify $derivedSourcesCodeMirrorCSS: $!";
+ system(qq("$python" "$jsMinScript" < "$derivedSouressCodeMirrorJS" >> "$targetCodeMirrorJS")) and die "Failed to minify $derivedSouressCodeMirrorJS: $!";
+ system(qq("$python" "$cssMinScript" < "$derivedSourcesCodeMirrorCSS" >> "$targetCodeMirrorCSS")) and die "Failed to minify $derivedSourcesCodeMirrorCSS: $!";
# Copy over Main.html and the Images directory.
copy($derivedSourcesMainHTML, File::Spec->catfile($targetResourcePath, 'Main.html'));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
