Title: [151970] branches/safari-537-branch/Source/_javascript_Core
- Revision
- 151970
- Author
- [email protected]
- Date
- 2013-06-25 11:18:13 -0700 (Tue, 25 Jun 2013)
Log Message
Merged r151923. <rdar://problem/14250711>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/_javascript_Core/ChangeLog (151969 => 151970)
--- branches/safari-537-branch/Source/_javascript_Core/ChangeLog 2013-06-25 18:17:11 UTC (rev 151969)
+++ branches/safari-537-branch/Source/_javascript_Core/ChangeLog 2013-06-25 18:18:13 UTC (rev 151970)
@@ -1,3 +1,13 @@
+2013-06-25 Lucas Forschler <[email protected]>
+
+ Merge r151923
+
+ 2013-06-24 Roger Fong <[email protected]>
+
+ Unreviewed. Makefile build fix for AppleWindows.
+
+ * _javascript_Core.vcxproj/_javascript_Core.make:
+
2013-06-21 Lucas Forschler <[email protected]>
Merge r151787
Modified: branches/safari-537-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make (151969 => 151970)
--- branches/safari-537-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-06-25 18:17:11 UTC (rev 151969)
+++ branches/safari-537-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-06-25 18:18:13 UTC (rev 151970)
@@ -15,10 +15,10 @@
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" "$(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\_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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
