Diff
Modified: tags/Safari-600.1.2.10/Source/_javascript_Core/ChangeLog (172415 => 172416)
--- tags/Safari-600.1.2.10/Source/_javascript_Core/ChangeLog 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/_javascript_Core/ChangeLog 2014-08-11 22:30:46 UTC (rev 172416)
@@ -1,3 +1,18 @@
+2014-08-11 Lucas Forschler <[email protected]>
+
+ Merge r172397
+
+ 2014-08-11 Brent Fulgham <[email protected]>
+
+ [Win] Adjust build script for Windows production build.
+ https://bugs.webkit.org/show_bug.cgi?id=135806
+ <rdar://problem/17978299>
+
+ Reviewed by Timothy Hatcher.
+
+ * _javascript_Core.vcxproj/copy-files.cmd: Copy file for later use
+ in WebInspectorUI build.
+
2014-07-30 Matthew Hanson <[email protected]>
Merge r171798. <rdar://problem/17849033>
Modified: tags/Safari-600.1.2.10/Source/_javascript_Core/_javascript_Core.vcxproj/copy-files.cmd (172415 => 172416)
--- tags/Safari-600.1.2.10/Source/_javascript_Core/_javascript_Core.vcxproj/copy-files.cmd 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/_javascript_Core/_javascript_Core.vcxproj/copy-files.cmd 2014-08-11 22:30:46 UTC (rev 172416)
@@ -73,6 +73,7 @@
xcopy /y "%DerivedSourcesDirectory%\InspectorJSTypeBuilders.h" "%PrivateHeadersDirectory%" >NUL
xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
xcopy /y "%DerivedSourcesDirectory%\InspectorJSFrontendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
+xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendCommands.js" "%PrivateHeadersDirectory%" >NUL
echo Copying Web Replay scripts as if they were private headers...
for %%d in (
Modified: tags/Safari-600.1.2.10/Source/WebCore/ChangeLog (172415 => 172416)
--- tags/Safari-600.1.2.10/Source/WebCore/ChangeLog 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebCore/ChangeLog 2014-08-11 22:30:46 UTC (rev 172416)
@@ -1,3 +1,18 @@
+2014-08-11 Lucas Forschler <[email protected]>
+
+ Merge r172397
+
+ 2014-08-11 Brent Fulgham <[email protected]>
+
+ [Win] Adjust build script for Windows production build.
+ https://bugs.webkit.org/show_bug.cgi?id=135806
+ <rdar://problem/17978299>
+
+ Reviewed by Timothy Hatcher.
+
+ * WebCore.vcxproj/copyForwardingHeaders.cmd: Copy file needed
+ for WebInspectorUI build.
+
2014-08-07 Brent Fulgham <[email protected]>
[Win] Branch-only build workaround.
Modified: tags/Safari-600.1.2.10/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd (172415 => 172416)
--- tags/Safari-600.1.2.10/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd 2014-08-11 22:30:46 UTC (rev 172416)
@@ -104,4 +104,7 @@
xcopy /y /d "%ProjectDir%..\testing\js\WebCoreTestSupport.h" "%CONFIGURATIONBUILDDIR%\include\WebCoreTestSupport"
+set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\WebCore
+xcopy /y "%DerivedSourcesDirectory%\InspectorWebBackendCommands.js" "%PrivateHeadersDirectory%" >NUL
+
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: tags/Safari-600.1.2.10/Source/WebInspectorUI/ChangeLog (172415 => 172416)
--- tags/Safari-600.1.2.10/Source/WebInspectorUI/ChangeLog 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebInspectorUI/ChangeLog 2014-08-11 22:30:46 UTC (rev 172416)
@@ -1,3 +1,23 @@
+2014-08-11 Lucas Forschler <[email protected]>
+
+ Merge r172397
+
+ 2014-08-11 Brent Fulgham <[email protected]>
+
+ [Win] Adjust build script for Windows production build.
+ https://bugs.webkit.org/show_bug.cgi?id=135806
+ <rdar://problem/17978299>
+
+ Reviewed by Timothy Hatcher.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.make: Make sure target for
+ xcopy operation exists.
+ * WebInspectorUI.vcxproj/WebInspectorUI.proj: Don't create directories
+ we don't need, make sure the target location exists before we build.
+ * WebInspectorUI.vcxproj/build-webinspectorui.pl: Make sure that
+ production builds get the intermediary command files from the
+ right place.
+
2014-08-07 Lucas Forschler <[email protected]>
Merge r172262
Modified: tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (172415 => 172416)
--- tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2014-08-11 22:30:46 UTC (rev 172416)
@@ -1,4 +1,5 @@
make:
+ -mkdir "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
perl build-webinspectorui.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%"
if errorlevel 1 exit 1
Modified: tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj (172415 => 172416)
--- tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj 2014-08-11 22:30:46 UTC (rev 172416)
@@ -16,12 +16,6 @@
<WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
<WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
<AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
- <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
- <AppleInternalLib64>$(AppleInternal)\lib64</AppleInternalLib64>
- <AppleInternalBin32>$(AppleInternal)\bin32</AppleInternalBin32>
- <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>
- <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>
- <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>
<ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>
<ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
<ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
@@ -46,8 +40,9 @@
<Message Text="Build output -> $(OBJROOT)" />
<Message Text="Final output -> $(DSTROOT)" />
- <MakeDir Directories="$(AppleInternalLib32);$(AppleInternalLib64);$(AppleInternalBin32);$(AppleInternalBin64);$(AppleInternal32Symbols);$(AppleInternal64Symbols);$(AppleInternal)\include;$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
+ <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32);$(DSTROOT)\$(ProgramFilesAAS64)" />
<MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources" />
+ <MakeDir Directories="$(DSTROOT)\$(ProgramFilesAAS32)\WebKit.resources\WebInspectorUI;$(DSTROOT)\$(ProgramFilesAAS64)\WebKit.resources\WebInspectorUI" />
</Target>
<!-- Generate the WebInspectorUI Bundle -->
Modified: tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl (172415 => 172416)
--- tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl 2014-08-11 22:28:25 UTC (rev 172415)
+++ tags/Safari-600.1.2.10/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl 2014-08-11 22:30:46 UTC (rev 172416)
@@ -45,9 +45,19 @@
my $TARGET_BUILD_DIR = File::Spec->catdir($XDSTROOT, "bin$ARGV[3]", 'WebKit.resources');
$ENV{'TARGET_BUILD_DIR'} = $TARGET_BUILD_DIR;
-my $_javascript_CORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", '_javascript_Core', 'DerivedSources');
+my ($_javascript_CORE_PRIVATE_HEADERS_DIR, $WEBCORE_PRIVATE_HEADERS_DIR);
+if ($ENV{'OFFICIAL_BUILD'} eq '1') {
+ $ARGV[1] =~ s/^\"//;
+ $ARGV[1] =~ s/\"$//;
+ my $Internal = Cwd::realpath($ARGV[1]);;
+ $_javascript_CORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($Internal, 'include', 'private', '_javascript_Core');
+ $WEBCORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($Internal, 'include', 'private', 'WebCore');
+} else {
+ $_javascript_CORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", '_javascript_Core', 'DerivedSources');
+ $WEBCORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'WebCore', 'DerivedSources');
+}
+
$ENV{'_javascript_CORE_PRIVATE_HEADERS_DIR'} = $_javascript_CORE_PRIVATE_HEADERS_DIR;
-my $WEBCORE_PRIVATE_HEADERS_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'WebCore', 'DerivedSources');
$ENV{'WEBCORE_PRIVATE_HEADERS_DIR'} = $WEBCORE_PRIVATE_HEADERS_DIR;
my $DERIVED_SOURCES_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'WebInspectorUI', 'DerivedSources');
$ENV{'DERIVED_SOURCES_DIR'} = $DERIVED_SOURCES_DIR;
