<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166962] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166962">166962</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-04-08 14:29:09 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Windows] Generate Optimized WebInspectorUI in Release Build
https://bugs.webkit.org/show_bug.cgi?id=120120
Reviewed by Timothy Hatcher.
* Scripts/copy-user-interface-resources.pl: Copied from Scripts/copy-user-interface-resources.sh.
* Scripts/copy-user-interface-resources.sh: Removed.
* Scripts/remove-console-asserts.pl:
* WebInspectorUI.vcxproj/WebInspectorUI.make: Added.
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Switch to Makefile style.
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters: Ditto.
* WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd: More work should
be done in the new build-webinspectorui.sh file.
* WebInspectorUI.vcxproj/build-webinspectorui.sh: Added.
* WebInspectorUI.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptsremoveconsoleassertspl">trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj">trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxprojfilters">trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIxcodeprojprojectpbxproj">trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcespl">trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUImake">trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruish">trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcessh">trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.sh</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIPostBuildcmd">trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (166961 => 166962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-04-08 21:22:35 UTC (rev 166961)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-04-08 21:29:09 UTC (rev 166962)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-08 Brent Fulgham <bfulgham@apple.com>
+
+ [Windows] Generate Optimized WebInspectorUI in Release Build
+ https://bugs.webkit.org/show_bug.cgi?id=120120
+
+ Reviewed by Timothy Hatcher.
+
+ * Scripts/copy-user-interface-resources.pl: Copied from Scripts/copy-user-interface-resources.sh.
+ * Scripts/copy-user-interface-resources.sh: Removed.
+ * Scripts/remove-console-asserts.pl:
+ * WebInspectorUI.vcxproj/WebInspectorUI.make: Added.
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Switch to Makefile style.
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters: Ditto.
+ * WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd: More work should
+ be done in the new build-webinspectorui.sh file.
+ * WebInspectorUI.vcxproj/build-webinspectorui.sh: Added.
+ * WebInspectorUI.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-04-08 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix corrupt APPLE_IMAGES_LICENSE.rtf after r165676.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcesplfromrev166893trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcessh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (from rev 166893, trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.sh) (0 => 166962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (rev 0)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2014-04-08 21:29:09 UTC (rev 166962)
</span><span class="lines">@@ -0,0 +1,163 @@
</span><ins>+#!/usr/bin/perl -w
+
+use File::Copy qw(copy);
+use File::Path qw(make_path);
+use File::Spec;
+
+my $useDirCopy = 0;
+
+# Not all systems (e.g., OS X) include File::Copy::Recursive. Only
+# use it if we have it installed.
+eval "use File::Copy::Recursive";
+unless ($@) {
+ $useDirCopy = 1;
+ File::Copy::Recursive->import();
+}
+
+sub ditto($$)
+{
+ my ($source, $destination) = @_;
+
+ if ($useDirCopy) {
+ File::Copy::Recursive::dircopy($source, $destination) or die "Unable to copy directory $source to $destination: $!";
+ } elsif ($^O eq 'darwin') {
+ system('ditto', $source, $destination);
+ } else {
+ die "Please install the PEP module File::Copy::Recursive";
+ }
+}
+
+sub seedFile($$)
+{
+ my ($targetFile, $seedText) = @_;
+
+ if (open(TARGET_FILE, '>', $targetFile)) {
+ print TARGET_FILE $seedText;
+ close(TARGET_FILE);
+ }
+}
+
+my $LICENSE = <<'EOF';
+/*
+ * Copyright (C) 2007-2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2009-2011 Google Inc. All rights reserved.
+ * Copyright (C) 2009-2010 Joseph Pecoraro. All rights reserved.
+ * Copyright (C) 2008 Matt Lilek. All rights reserved.
+ * Copyright (C) 2008-2009 Anthony Ricaud <rik@webkit.org>
+ * Copyright (C) 2009 280 North Inc. All Rights Reserved.
+ * Copyright (C) 2010 Nikita Vasilyev. All rights reserved.
+ * Copyright (C) 2011 Brian Grinstead All rights reserved.
+ * Copyright (C) 2013 Matt Holden <jftholden@yahoo.com>
+ * Copyright (C) 2013 Samsung Electronics. All rights reserved.
+ * Copyright (C) 2013 Seokju Kwon (seokju.kwon@gmail.com)
+ * Copyright (C) 2013 Adobe Systems Inc. All rights reserved.
+ * Copyright (C) 2013 University of Washington. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+EOF
+
+my $derivedSourcesDir = $ENV{'DERIVED_SOURCES_DIR'};
+my $scriptsRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'Scripts');
+my $uiRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'UserInterface');
+my $targetResourcePath = File::Spec->catdir($ENV{'TARGET_BUILD_DIR'}, $ENV{'UNLOCALIZED_RESOURCES_FOLDER_PATH'});
+my $protocolDir = File::Spec->catdir($targetResourcePath, 'Protocol');
+my $codeMirrorPath = File::Spec->catdir($uiRoot, 'External', 'CodeMirror');
+
+my $codeMirrorLicenseFile = File::Spec->catfile($codeMirrorPath, 'LICENSE');
+open(CMLFILE, '<', $codeMirrorLicenseFile) or die "Unable to open $codeMirrorLicenseFile: $!";
+my $CODE_MIRROR_LICENSE = "/*\n";
+while (<CMLFILE>) {
+ $CODE_MIRROR_LICENSE .= ' * ' . $_;
+}
+close(CMLFILE);
+$CODE_MIRROR_LICENSE .= " */\n";
+
+make_path($protocolDir, $targetResourcePath);
+
+# Copy over dynamically loaded files from other frameworks, even if we aren't combining resources.
+copy(File::Spec->catfile($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}, 'InspectorJSBackendCommands.js'), File::Spec->catfile($protocolDir, 'InspectorJSBackendCommands.js')) or die "Copy of InspectorJSBackendCommands.js failed: $!";
+copy(File::Spec->catfile($ENV{'WEBCORE_PRIVATE_HEADERS_DIR'}, 'InspectorWebBackendCommands.js'), File::Spec->catfile($protocolDir, 'InspectorWebBackendCommands.js')) or die "Copy of InspectorWebBackendCommands.js failed: $!";
+
+if (defined $ENV{'COMBINE_INSPECTOR_RESOURCES'} && ($ENV{'COMBINE_INSPECTOR_RESOURCES'} eq 'YES')) {
+ my $combineResourcesCmd = File::Spec->catfile($scriptsRoot, 'combine-resources.pl');
+
+ # Combine the JavaScript and CSS files in Production builds into single files (Main.js and Main.css).
+ system($combineResourcesCmd, '--input-html', File::Spec->catfile($uiRoot, 'Main.html'), '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Main.js', '--output-style-name', 'Main.css');
+
+ # Combine the CodeMirror JavaScript and CSS files in Production builds into single files (CodeMirror.js and CodeMirror.css).
+ my $derivedSourcesMainHTML = File::Spec->catfile($derivedSourcesDir, 'Main.html');
+ system($combineResourcesCmd, '--input-dir', 'External/CodeMirror', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'CodeMirror.js', '--output-style-name', 'CodeMirror.css');
+
+ # Remove console.assert calls from the Main.js file.
+ my $derivedSourcesMainJS = File::Spec->catfile($derivedSourcesDir, 'Main.js');
+ system(File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'), '--input-script', $derivedSourcesMainJS, '--output-script', $derivedSourcesMainJS);
+
+ # Fix Image URLs in the Main.css file by removing the "../".
+ my $derivedSourcesMainCSS = File::Spec->catfile($derivedSourcesDir, 'Main.css');
+ if (open(INPUT_MAIN, '<', $derivedSourcesMainCSS)) {
+ local $/;
+ my $cssContents = <INPUT_MAIN>;
+ close(INPUT_MAIN);
+ open(OUTPUT_MAIN, '>', $derivedSourcesMainCSS);
+ $cssContents =~ s/\.\.\/Images/Images/g;
+ print OUTPUT_MAIN $cssContents;
+ close(OUTPUT_MAIN);
+ }
+
+ # Export the license into Main.js.
+ my $targetMainJS = File::Spec->catfile($targetResourcePath, 'Main.js');
+ seedFile($targetMainJS, $LICENSE);
+
+ my $targetMainCSS = File::Spec->catfile($targetResourcePath, 'Main.css');
+ seedFile($targetMainCSS, $LICENSE);
+
+ # Export the license into CodeMirror.js and CodeMirror.css.
+ my $targetCodeMirrorJS = File::Spec->catfile($targetResourcePath, 'CodeMirror.js');
+ seedFile($targetCodeMirrorJS, $LICENSE);
+
+ my $targetCodeMirrorCSS = File::Spec->catfile($targetResourcePath, 'CodeMirror.css');
+ seedFile($targetCodeMirrorCSS, $LICENSE);
+
+ # 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: $!";
+
+ # 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: $!";
+
+ # Copy over Main.html and the Images directory.
+ copy($derivedSourcesMainHTML, File::Spec->catfile($targetResourcePath, 'Main.html'));
+
+ ditto(File::Spec->catdir($uiRoot, 'Images'), File::Spec->catdir($targetResourcePath, 'Images'));
+
+ # Copy the Legacy directory.
+ ditto(File::Spec->catfile($uiRoot, 'Protocol', 'Legacy'), File::Spec->catfile($protocolDir, 'Legacy'));
+} else {
+ # Keep the files separate for engineering builds.
+ ditto($uiRoot, $targetResourcePath);
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcessh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.sh (166961 => 166962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.sh 2014-04-08 21:22:35 UTC (rev 166961)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.sh 2014-04-08 21:29:09 UTC (rev 166962)
</span><span class="lines">@@ -1,86 +0,0 @@
</span><del>-#!/bin/sh
-
-LICENSE=$(cat <<EOF
-/*
- * Copyright (C) 2007-2014 Apple Inc. All rights reserved.
- * Copyright (C) 2009-2011 Google Inc. All rights reserved.
- * Copyright (C) 2009-2010 Joseph Pecoraro. All rights reserved.
- * Copyright (C) 2008 Matt Lilek. All rights reserved.
- * Copyright (C) 2008-2009 Anthony Ricaud <rik@webkit.org>
- * Copyright (C) 2009 280 North Inc. All Rights Reserved.
- * Copyright (C) 2010 Nikita Vasilyev. All rights reserved.
- * Copyright (C) 2011 Brian Grinstead All rights reserved.
- * Copyright (C) 2013 Matt Holden <jftholden@yahoo.com>
- * Copyright (C) 2013 Samsung Electronics. All rights reserved.
- * Copyright (C) 2013 Seokju Kwon (seokju.kwon@gmail.com)
- * Copyright (C) 2013 Adobe Systems Inc. All rights reserved.
- * Copyright (C) 2013 University of Washington. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-EOF
-)
-
-CODE_MIRROR_LICENSE=$(echo "/*" && sed 's/^/ * /' "${SRCROOT}/UserInterface/External/CodeMirror/LICENSE" && echo " */")
-
-# Copy over dynamically loaded files from other frameworks, even if we aren't combining resources.
-ditto "${JAVASCRIPTCORE_PRIVATE_HEADERS_DIR}/InspectorJSBackendCommands.js" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Protocol/InspectorJSBackendCommands.js"
-ditto "${WEBCORE_PRIVATE_HEADERS_DIR}/InspectorWebBackendCommands.js" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Protocol/InspectorWebBackendCommands.js"
-
-if [[ ${COMBINE_INSPECTOR_RESOURCES:=YES} == "YES" ]]; then
- # Combine the JavaScript and CSS files in Production builds into single files (Main.js and Main.css).
- "${SRCROOT}/Scripts/combine-resources.pl" --input-html "${SRCROOT}/UserInterface/Main.html" --derived-sources-dir "${DERIVED_SOURCES_DIR}" --output-dir "${DERIVED_SOURCES_DIR}" --output-script-name "Main.js" --output-style-name "Main.css"
-
- # Combine the CodeMirror JavaScript and CSS files in Production builds into single files (CodeMirror.js and CodeMirror.css).
- "${SRCROOT}/Scripts/combine-resources.pl" --input-dir "External/CodeMirror" --input-html "${DERIVED_SOURCES_DIR}/Main.html" --input-html-dir "${SRCROOT}/UserInterface" --derived-sources-dir "${DERIVED_SOURCES_DIR}" --output-dir "${DERIVED_SOURCES_DIR}" --output-script-name "CodeMirror.js" --output-style-name "CodeMirror.css"
-
- # Remove console.assert calls from the Main.js file.
- "${SRCROOT}/Scripts/remove-console-asserts.pl" --input-script "${DERIVED_SOURCES_DIR}/Main.js" --output-script "${DERIVED_SOURCES_DIR}/Main.js"
-
- # Fix Image URLs in the Main.css file by removing the "../".
- sed -i "" -e "s/\.\.\/Images/Images/g" "${DERIVED_SOURCES_DIR}/Main.css"
-
- # Export the license into Main.js.
- echo "${LICENSE}" > "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Main.js"
-
- # Export the license into CodeMirror.js and CodeMirror.css.
- echo "${CODE_MIRROR_LICENSE}" > "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CodeMirror.js"
- echo "${CODE_MIRROR_LICENSE}" > "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CodeMirror.css"
-
- # Minify the Main.js and Main.css files, with Main.js appending to the license that was exported above.
- python "${SRCROOT}/Scripts/jsmin.py" <"${DERIVED_SOURCES_DIR}/Main.js" >>"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Main.js"
- python "${SRCROOT}/Scripts/cssmin.py" <"${DERIVED_SOURCES_DIR}/Main.css" >"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Main.css"
-
- # Minify the CodeMirror.js and CodeMirror.css files, appending to the license that was exported above.
- python "${SRCROOT}/Scripts/jsmin.py" <"${DERIVED_SOURCES_DIR}/CodeMirror.js" >>"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CodeMirror.js"
- python "${SRCROOT}/Scripts/cssmin.py" <"${DERIVED_SOURCES_DIR}/CodeMirror.css" >>"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CodeMirror.css"
-
- # Copy over Main.html and the Images directory.
- ditto "${DERIVED_SOURCES_DIR}/Main.html" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Main.html"
- ditto "${SRCROOT}/UserInterface/Images" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Images"
-
- # Copy the Legacy directory.
- ditto "${SRCROOT}/UserInterface/Protocol/Legacy" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Protocol/Legacy"
-else
- # Keep the files separate for engineering builds.
- ditto "${SRCROOT}/UserInterface" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-fi
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptsremoveconsoleassertspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl (166961 => 166962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl 2014-04-08 21:22:35 UTC (rev 166961)
+++ trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl 2014-04-08 21:29:09 UTC (rev 166962)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-open IN, $inputScriptFilename or die;
</del><ins>+open IN, $inputScriptFilename or die "Couldn't open $inputScriptFilename: $!";
</ins><span class="cx"> our ($out, $tempFilename) = tempfile(UNLINK => 0) or die;
</span><span class="cx">
</span><span class="cx"> our $previousLine = "";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUImake"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (0 => 166962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (rev 0)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2014-04-08 21:29:09 UTC (rev 166962)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+make:
+ bash build-webinspectorui.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%"
+ if errorlevel 1 exit 1
+
+ xcopy /y /e "..\Localizations\en.lproj\*" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
+ if errorlevel 1 exit 1
+
+ if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
+
+clean:
+ if exist "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI" del /s /q "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (166961 => 166962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-04-08 21:22:35 UTC (rev 166961)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-04-08 21:29:09 UTC (rev 166962)
</span><span class="lines">@@ -48,67 +48,67 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><del>- <ConfigurationType>Application</ConfigurationType>
</del><ins>+ <ConfigurationType>Makefile</ConfigurationType>
</ins><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><del>- <ConfigurationType>Application</ConfigurationType>
</del><ins>+ <ConfigurationType>Makefile</ConfigurationType>
</ins><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><del>- <ConfigurationType>Application</ConfigurationType>
</del><ins>+ <ConfigurationType>Makefile</ConfigurationType>
</ins><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><del>- <ConfigurationType>Application</ConfigurationType>
</del><ins>+ <ConfigurationType>Makefile</ConfigurationType>
</ins><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><del>- <ConfigurationType>Application</ConfigurationType>
</del><ins>+ <ConfigurationType>Makefile</ConfigurationType>
</ins><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><del>- <ConfigurationType>Application</ConfigurationType>
</del><ins>+ <ConfigurationType>Makefile</ConfigurationType>
</ins><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><del>- <ConfigurationType>Application</ConfigurationType>
</del><ins>+ <ConfigurationType>Makefile</ConfigurationType>
</ins><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><del>- <ConfigurationType>Application</ConfigurationType>
</del><ins>+ <ConfigurationType>Makefile</ConfigurationType>
</ins><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><del>- <ConfigurationType>Application</ConfigurationType>
</del><ins>+ <ConfigurationType>Makefile</ConfigurationType>
</ins><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><del>- <ConfigurationType>Application</ConfigurationType>
</del><ins>+ <ConfigurationType>Makefile</ConfigurationType>
</ins><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="lines">@@ -167,7 +167,8 @@
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <PropertyGroup Label="UserMacros" />
</span><del>- <PropertyGroup />
</del><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" />
</ins><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</span><span class="cx"> <ClCompile>
</span><span class="cx"> <WarningLevel>Level3</WarningLevel>
</span><span class="lines">@@ -218,7 +219,7 @@
</span><span class="cx"> <None Include="..\Info.plist" />
</span><span class="cx"> <None Include="..\Localizations\en.lproj\localizedStrings.js" />
</span><span class="cx"> <None Include="..\Scripts\combine-resources.pl" />
</span><del>- <None Include="..\Scripts\copy-user-interface-resources.sh" />
</del><ins>+ <None Include="..\Scripts\copy-user-interface-resources.pl" />
</ins><span class="cx"> <None Include="..\Scripts\cssmin.py" />
</span><span class="cx"> <None Include="..\Scripts\jsmin.py" />
</span><span class="cx"> <None Include="..\Scripts\remove-console-asserts.pl" />
</span><span class="lines">@@ -777,9 +778,10 @@
</span><span class="cx"> <None Include="..\UserInterface\TreeOutline.js" />
</span><span class="cx"> <None Include="..\UserInterface\Utilities.js" />
</span><span class="cx"> <None Include="..\UserInterface\WebInspector.js" />
</span><del>- <None Include="WebInspectorUIPostBuild.cmd" />
</del><ins>+ <None Include="build-webinspectorui.sh" />
+ <None Include="WebInspectorUI.make" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters (166961 => 166962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2014-04-08 21:22:35 UTC (rev 166961)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2014-04-08 21:29:09 UTC (rev 166962)
</span><span class="lines">@@ -1701,7 +1701,7 @@
</span><span class="cx"> <None Include="..\Scripts\combine-resources.pl">
</span><span class="cx"> <Filter>Scripts</Filter>
</span><span class="cx"> </None>
</span><del>- <None Include="..\Scripts\copy-user-interface-resources.sh">
</del><ins>+ <None Include="..\Scripts\copy-user-interface-resources.pl">
</ins><span class="cx"> <Filter>Scripts</Filter>
</span><span class="cx"> </None>
</span><span class="cx"> <None Include="..\Scripts\cssmin.py">
</span><span class="lines">@@ -1719,6 +1719,7 @@
</span><span class="cx"> <None Include="..\Scripts\update-pretty-printer.rb">
</span><span class="cx"> <Filter>Scripts</Filter>
</span><span class="cx"> </None>
</span><del>- <None Include="WebInspectorUIPostBuild.cmd" />
</del><ins>+ <None Include="WebInspectorUI.make" />
+ <None Include="build-webinspectorui.sh" />
</ins><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIPostBuildcmd"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd (166961 => 166962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd 2014-04-08 21:22:35 UTC (rev 166961)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd 2014-04-08 21:29:09 UTC (rev 166962)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
-xcopy /y /e "%PROJECTDIR%..\UserInterface\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
-xcopy /y /d "%PROJECTDIR%..\Localizations\en.lproj\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI\Protocol"
-xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\JavaScriptCore\DerivedSources\InspectorJSBackendCommands.js" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI\Protocol"
-xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\DerivedSources\InspectorWebBackendCommands.js" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI\Protocol"
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIvcxprojbuildwebinspectoruish"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh (0 => 166962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh (rev 0)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh 2014-04-08 21:29:09 UTC (rev 166962)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+#!/usr/bin/bash
+
+# Copyright (C) 2014 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. Neither the name of Apple puter, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+XSRCROOT="`pwd`/.."
+XSRCROOT=`realpath "$XSRCROOT"`
+export XSRCROOT
+export SRCROOT=$XSRCROOT
+
+XDSTROOT="$1"
+export XDSTROOT
+
+export TARGET_BUILD_DIR="$XDSTROOT/bin${4}/WebKit.resources"
+export JAVASCRIPTCORE_PRIVATE_HEADERS_DIR="$XDSTROOT/obj${4}/JavaScriptCore/DerivedSources"
+export WEBCORE_PRIVATE_HEADERS_DIR="$XDSTROOT/obj${4}/WebCore/DerivedSources"
+export DERIVED_SOURCES_DIR="$XDSTROOT/obj${4}/WebInspectorUI/DerivedSources"
+
+export UNLOCALIZED_RESOURCES_FOLDER_PATH="WebInspectorUI"
+
+if [[ ${TARGET_BUILD_DIR} =~ "Release" ]] || [[ ${TARGET_BUILD_DIR} =~ "Production" ]]; then
+ export COMBINE_INSPECTOR_RESOURCES="YES";
+fi
+
+perl "${SRCROOT}/Scripts/copy-user-interface-resources.pl"
</ins><span class="cx">Property changes on: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.sh
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj (166961 => 166962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj 2014-04-08 21:22:35 UTC (rev 166961)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj 2014-04-08 21:29:09 UTC (rev 166962)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> 1C60FF1414E6E35D006CD77D /* en */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = en; path = Localizations/en.lproj/localizedStrings.js; sourceTree = "<group>"; };
</span><span class="cx"> 1C60FF1914E73C64006CD77D /* combine-resources.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = "combine-resources.pl"; sourceTree = "<group>"; };
</span><span class="cx"> 1C60FF1A14E73DCA006CD77D /* remove-console-asserts.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = "remove-console-asserts.pl"; sourceTree = "<group>"; };
</span><del>- 1C60FFE114E79B0F006CD77D /* copy-user-interface-resources.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "copy-user-interface-resources.sh"; sourceTree = "<group>"; };
</del><ins>+ 1C60FFE114E79B0F006CD77D /* copy-user-interface-resources.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = "copy-user-interface-resources.pl"; sourceTree = "<group>"; };
</ins><span class="cx"> 1C78EE131760E115002F6AA5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</span><span class="cx"> 1C78EE1617611340002F6AA5 /* WebInspectorUI.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = WebInspectorUI.c; sourceTree = "<group>"; };
</span><span class="cx"> 996231EB18D1811700C03FDA /* WebCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> 1C60FF1914E73C64006CD77D /* combine-resources.pl */,
</span><del>- 1C60FFE114E79B0F006CD77D /* copy-user-interface-resources.sh */,
</del><ins>+ 1C60FFE114E79B0F006CD77D /* copy-user-interface-resources.pl */,
</ins><span class="cx"> 1C435CAC14E7B287004E10EA /* cssmin.py */,
</span><span class="cx"> 1C435CAD14E7B287004E10EA /* jsmin.py */,
</span><span class="cx"> 1C60FF1A14E73DCA006CD77D /* remove-console-asserts.pl */,
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> name = "Copy User Interface Resources";
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "sh \"${SRCROOT}/Scripts/copy-user-interface-resources.sh\"";
</del><ins>+ shellScript = "/usr/bin/perl \"${SRCROOT}/Scripts/copy-user-interface-resources.pl\"";
</ins><span class="cx"> };
</span><span class="cx"> /* End PBXShellScriptBuildPhase section */
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>