Diff
Modified: branches/safari-537-branch/Source/_javascript_Core/ChangeLog (151865 => 151866)
--- branches/safari-537-branch/Source/_javascript_Core/ChangeLog 2013-06-21 23:23:17 UTC (rev 151865)
+++ branches/safari-537-branch/Source/_javascript_Core/ChangeLog 2013-06-21 23:27:12 UTC (rev 151866)
@@ -1,3 +1,14 @@
+2013-06-21 Lucas Forschler <[email protected]>
+
+ Merge r151787
+
+ 2013-06-20 Roger Fong <[email protected]>
+
+ Make Windows makefile copy build output to a different folder.
+ <rdar://problem/14219184>.
+
+ * _javascript_Core.vcxproj/_javascript_Core.make:
+
2013-06-18 Roger Fong <[email protected]>
Disable some feature flags.
Modified: branches/safari-537-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make (151865 => 151866)
--- branches/safari-537-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-06-21 23:23:17 UTC (rev 151865)
+++ branches/safari-537-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-06-21 23:27:12 UTC (rev 151866)
@@ -8,23 +8,23 @@
set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
- set ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
- set Path=%PATH%;%ProgramFilesAAS%
+ set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
+ set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-mkdir "%ConfigurationBuildDir%\include\private"
xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
devenv "_javascript_Core.submit.sln" /clean $(BUILDSTYLE)
devenv "_javascript_Core.submit.sln" /build $(BUILDSTYLE)
- -xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core.dll" "%ProgramFilesAAS%" /e/v/i/h/y
- -xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core_debug.dll" "%ProgramFilesAAS%" /e/v/i/h/y
- -xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core.pdb" "%ProgramFilesAAS%" /e/v/i/h/y
- -xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core_debug.pdb" "%ProgramFilesAAS%" /e/v/i/h/y
+ -xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core.dll" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
+ -xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core_debug.dll" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
+ -xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core.pdb" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
+ -xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core_debug.pdb" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\jsc.exe" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\jsc_debug.exe" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\jsc.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\jsc_debug.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core.resources\*" "%ProgramFilesAAS%\_javascript_Core.resources" /e/v/i/h/y
+ xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\_javascript_Core.resources" /e/v/i/h/y
-mkdir "$(DSTROOT)\AppleInternal\Sources32\_javascript_Core"
xcopy "%ConfigurationBuildDir%\obj32\_javascript_Core\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources32\_javascript_Core" /e/v/i/h/y
Modified: branches/safari-537-branch/Source/WTF/ChangeLog (151865 => 151866)
--- branches/safari-537-branch/Source/WTF/ChangeLog 2013-06-21 23:23:17 UTC (rev 151865)
+++ branches/safari-537-branch/Source/WTF/ChangeLog 2013-06-21 23:27:12 UTC (rev 151866)
@@ -1,3 +1,14 @@
+2013-06-21 Lucas Forschler <[email protected]>
+
+ Merge r151787
+
+ 2013-06-20 Roger Fong <[email protected]>
+
+ Make Windows makefile copy build output to a different folder.
+ <rdar://problem/14219184>.
+
+ * WTF.vcxproj/WTF.make:
+
2013-06-18 Roger Fong <[email protected]>
Replace tools32 folder with tools and update WebKit Windows solution accordingly.
Modified: branches/safari-537-branch/Source/WTF/WTF.vcxproj/WTF.make (151865 => 151866)
--- branches/safari-537-branch/Source/WTF/WTF.vcxproj/WTF.make 2013-06-21 23:23:17 UTC (rev 151865)
+++ branches/safari-537-branch/Source/WTF/WTF.vcxproj/WTF.make 2013-06-21 23:27:12 UTC (rev 151866)
@@ -8,11 +8,11 @@
set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
- set ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
- set Path=%PATH%;%ProgramFilesAAS%
+ set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
+ set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
devenv "WTF.submit.sln" /clean $(BUILDSTYLE)
devenv "WTF.submit.sln" /build $(BUILDSTYLE)
xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\bin32\*" "%ProgramFilesAAS%" /e/v/i/h/y
\ No newline at end of file
+ xcopy "%ConfigurationBuildDir%\bin32\*" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
\ No newline at end of file
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (151865 => 151866)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-06-21 23:23:17 UTC (rev 151865)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-06-21 23:27:12 UTC (rev 151866)
@@ -1,3 +1,14 @@
+2013-06-21 Lucas Forschler <[email protected]>
+
+ Merge r151787
+
+ 2013-06-20 Roger Fong <[email protected]>
+
+ Make Windows makefile copy build output to a different folder.
+ <rdar://problem/14219184>.
+
+ * WebCore.vcxproj/WebCore.make:
+
2013-06-20 Lucas Forschler <[email protected]>
Merge r151799
Modified: branches/safari-537-branch/Source/WebCore/WebCore.vcxproj/WebCore.make (151865 => 151866)
--- branches/safari-537-branch/Source/WebCore/WebCore.vcxproj/WebCore.make 2013-06-21 23:23:17 UTC (rev 151865)
+++ branches/safari-537-branch/Source/WebCore/WebCore.vcxproj/WebCore.make 2013-06-21 23:27:12 UTC (rev 151866)
@@ -8,15 +8,15 @@
set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
- set ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
- set Path=%PATH%;%ProgramFilesAAS%
+ set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
+ set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-mkdir 2>NUL "%ConfigurationBuildDir%\include\private"
xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
devenv "WebCore.submit.sln" /rebuild $(BUILDSTYLE)
xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "%ProgramFilesAAS%\WebKit.resources" /e/v/i/h/y
+ xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\WebKit.resources" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\obj32\WebCore\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
-mkdir "$(DSTROOT)\AppleInternal\Sources32\WebCore"
xcopy "%ConfigurationBuildDir%\obj32\WebCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources32\WebCore" /e/v/i/h/y
Modified: branches/safari-537-branch/Source/WebKit/ChangeLog (151865 => 151866)
--- branches/safari-537-branch/Source/WebKit/ChangeLog 2013-06-21 23:23:17 UTC (rev 151865)
+++ branches/safari-537-branch/Source/WebKit/ChangeLog 2013-06-21 23:27:12 UTC (rev 151866)
@@ -1,3 +1,14 @@
+2013-06-21 Lucas Forschler <[email protected]>
+
+ Merge r151787
+
+ 2013-06-20 Roger Fong <[email protected]>
+
+ Make Windows makefile copy build output to a different folder.
+ <rdar://problem/14219184>.
+
+ * WebKit.vcxproj/WebKit.make:
+
2013-06-18 Roger Fong <[email protected]>
Replace tools32 folder with tools and update WebKit Windows solution accordingly.
Modified: branches/safari-537-branch/Source/WebKit/WebKit.vcxproj/WebKit.make (151865 => 151866)
--- branches/safari-537-branch/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-06-21 23:23:17 UTC (rev 151865)
+++ branches/safari-537-branch/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-06-21 23:27:12 UTC (rev 151866)
@@ -8,13 +8,13 @@
set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
- set ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
- set Path=%PATH%;%ProgramFilesAAS%
+ set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
+ set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
devenv "WebKit.submit.sln" /rebuild $(BUILDSTYLE)
-xcopy "%ConfigurationBuildDir%\bin32\*.exe" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\bin32\*.pdb" "%ProgramFilesAAS%" /e/v/i/h/y
- -xcopy "%ConfigurationBuildDir%\bin32\*.dll" "%ProgramFilesAAS%" /e/v/i/h/y
+ xcopy "%ConfigurationBuildDir%\bin32\*.pdb" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
+ -xcopy "%ConfigurationBuildDir%\bin32\*.dll" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "%ProgramFilesAAS%\WebKit.resources" /e/v/i/h/y
+ xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\WebKit.resources" /e/v/i/h/y
