Title: [149479] tags/Safari-537.39.4/Source
- Revision
- 149479
- Author
- [email protected]
- Date
- 2013-05-01 19:01:43 -0700 (Wed, 01 May 2013)
Log Message
Merge fix for <rdar://problem/13784241>
Modified Paths
Diff
Modified: tags/Safari-537.39.4/Source/_javascript_Core/ChangeLog (149478 => 149479)
--- tags/Safari-537.39.4/Source/_javascript_Core/ChangeLog 2013-05-02 02:01:06 UTC (rev 149478)
+++ tags/Safari-537.39.4/Source/_javascript_Core/ChangeLog 2013-05-02 02:01:43 UTC (rev 149479)
@@ -1,3 +1,11 @@
+2013-05-01 Roger Fong <[email protected]>
+
+ Set Path in makefile for AppleWin.
+
+ * _javascript_Core.vcxproj/_javascript_Core.make:
+ * _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd:
+ Now that path is set, some copy commands are unnecessary.
+
2013-04-25 Julien Brianceau <[email protected]>
REGRESSION(r137994): Random crashes occur with SH4 JSC.
Modified: tags/Safari-537.39.4/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make (149478 => 149479)
--- tags/Safari-537.39.4/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-05-02 02:01:06 UTC (rev 149478)
+++ tags/Safari-537.39.4/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-05-02 02:01:43 UTC (rev 149479)
@@ -8,6 +8,7 @@
set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
+ set Path=%PATH%;$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-mkdir "%ConfigurationBuildDir%\include\private"
xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
Modified: tags/Safari-537.39.4/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd (149478 => 149479)
--- tags/Safari-537.39.4/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd 2013-05-02 02:01:06 UTC (rev 149478)
+++ tags/Safari-537.39.4/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd 2013-05-02 02:01:43 UTC (rev 149479)
@@ -2,8 +2,6 @@
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin"
if exist "%WebKit_Libraries%\bin32\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin32\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin32\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin32\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
echo Exporting link definition output (%GeneratorDirectory%\_javascript_CoreExports.def)
if exist "%OUTDIR%\_javascript_CoreExportGenerator%DEBUGSUFFIX%.exe" "%OUTDIR%\_javascript_CoreExportGenerator%DEBUGSUFFIX%.exe" > "%GeneratorDirectory%\_javascript_CoreExports.def"
Modified: tags/Safari-537.39.4/Source/WTF/ChangeLog (149478 => 149479)
--- tags/Safari-537.39.4/Source/WTF/ChangeLog 2013-05-02 02:01:06 UTC (rev 149478)
+++ tags/Safari-537.39.4/Source/WTF/ChangeLog 2013-05-02 02:01:43 UTC (rev 149479)
@@ -1,3 +1,9 @@
+2013-05-01 Roger Fong <[email protected]>
+
+ Set Path in makefile for AppleWin.
+
+ * WTF.vcxproj/WTF.make:
+
2013-04-25 [email protected] <[email protected]>
[Windows] Compile fix.
Modified: tags/Safari-537.39.4/Source/WTF/WTF.vcxproj/WTF.make (149478 => 149479)
--- tags/Safari-537.39.4/Source/WTF/WTF.vcxproj/WTF.make 2013-05-02 02:01:06 UTC (rev 149478)
+++ tags/Safari-537.39.4/Source/WTF/WTF.vcxproj/WTF.make 2013-05-02 02:01:43 UTC (rev 149479)
@@ -8,6 +8,7 @@
set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
+ set Path=%PATH%;$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
devenv "WTF.submit.sln" /clean $(BUILDSTYLE)
devenv "WTF.submit.sln" /build $(BUILDSTYLE)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
