Title: [151660] trunk/Source
- Revision
- 151660
- Author
- roger_f...@apple.com
- Date
- 2013-06-17 17:23:38 -0700 (Mon, 17 Jun 2013)
Log Message
Modify Windows makefiles to copy some bin output into Program Files.
https://bugs.webkit.org/show_bug.cgi?id=117714.
<rdar://problem/14179054>
Reviewed by Brent Fulgham.
* WTF.vcxproj/WTF.make:
* _javascript_Core.vcxproj/_javascript_Core.make:
* WebCore.vcxproj/WebCore.make:
* WebKit.vcxproj/WebKit.make:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (151659 => 151660)
--- trunk/Source/_javascript_Core/ChangeLog 2013-06-18 00:09:40 UTC (rev 151659)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-06-18 00:23:38 UTC (rev 151660)
@@ -1,3 +1,13 @@
+2013-06-17 Roger Fong <roger_f...@apple.com>
+
+ Modify Windows makefiles to copy some bin output into Program Files.
+ https://bugs.webkit.org/show_bug.cgi?id=117714.
+ <rdar://problem/14179054>
+
+ Reviewed by Brent Fulgham.
+
+ * _javascript_Core.vcxproj/_javascript_Core.make:
+
2013-06-14 Ryosuke Niwa <rn...@webkit.org>
Function names on Object.prototype should be common identifiers
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make (151659 => 151660)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-06-18 00:09:40 UTC (rev 151659)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-06-18 00:23:38 UTC (rev 151660)
@@ -8,22 +8,23 @@
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 ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
+ set Path=%PATH%;%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" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
- -xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core_debug.dll" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
- -xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
- -xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core_debug.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
+ -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\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\*" "$(DSTROOT)\AppleInternal\bin32\_javascript_Core.resources" /e/v/i/h/y
+ xcopy "%ConfigurationBuildDir%\bin32\_javascript_Core.resources\*" "%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: trunk/Source/WTF/ChangeLog (151659 => 151660)
--- trunk/Source/WTF/ChangeLog 2013-06-18 00:09:40 UTC (rev 151659)
+++ trunk/Source/WTF/ChangeLog 2013-06-18 00:23:38 UTC (rev 151660)
@@ -1,3 +1,13 @@
+2013-06-17 Roger Fong <roger_f...@apple.com>
+
+ Modify Windows makefiles to copy some bin output into Program Files.
+ https://bugs.webkit.org/show_bug.cgi?id=117714.
+ <rdar://problem/14179054>
+
+ Reviewed by Brent Fulgham.
+
+ * WTF.vcxproj/WTF.make:
+
2013-06-17 Grzegorz Czajkowski <g.czajkow...@samsung.com>
Unreviewed, rolling out r151632.
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.make (151659 => 151660)
--- trunk/Source/WTF/WTF.vcxproj/WTF.make 2013-06-18 00:09:40 UTC (rev 151659)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.make 2013-06-18 00:23:38 UTC (rev 151660)
@@ -8,10 +8,11 @@
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 ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
+ set Path=%PATH%;%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\*" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
\ No newline at end of file
+ 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
Modified: trunk/Source/WebCore/ChangeLog (151659 => 151660)
--- trunk/Source/WebCore/ChangeLog 2013-06-18 00:09:40 UTC (rev 151659)
+++ trunk/Source/WebCore/ChangeLog 2013-06-18 00:23:38 UTC (rev 151660)
@@ -1,3 +1,13 @@
+2013-06-17 Roger Fong <roger_f...@apple.com>
+
+ Modify Windows makefiles to copy some bin output into Program Files.
+ https://bugs.webkit.org/show_bug.cgi?id=117714.
+ <rdar://problem/14179054>
+
+ Reviewed by Brent Fulgham.
+
+ * WebCore.vcxproj/WebCore.make:
+
2013-06-17 Max Vujovic <mvujo...@adobe.com>
Crash in loadPendingShaders
@@ -17143,7 +17153,7 @@
Test: fast/text/word-space-with-kerning-4.html
* rendering/RenderBlockLineLayout.cpp:
- (WebCore::setLogicalWidthForTextRun): Look for '\t'.
+ (WebCore::setLogicalWidthForTextRun): Look for ' '.
2013-05-10 Anders Carlsson <ander...@apple.com>
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.make (151659 => 151660)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.make 2013-06-18 00:09:40 UTC (rev 151659)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.make 2013-06-18 00:23:38 UTC (rev 151660)
@@ -8,16 +8,15 @@
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 ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
+ set Path=%PATH%;%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\*" "$(DSTROOT)\AppleInternal\bin32\WebKit.resources" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\obj32\WebCore\scripts\*" "$(DSTROOT)\AppleInternal\tools32\scripts" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\bin32\*.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\bin32\*.dll" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
+ xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "%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: trunk/Source/WebKit/ChangeLog (151659 => 151660)
--- trunk/Source/WebKit/ChangeLog 2013-06-18 00:09:40 UTC (rev 151659)
+++ trunk/Source/WebKit/ChangeLog 2013-06-18 00:23:38 UTC (rev 151660)
@@ -1,3 +1,13 @@
+2013-06-17 Roger Fong <roger_f...@apple.com>
+
+ Modify Windows makefiles to copy some bin output into Program Files.
+ https://bugs.webkit.org/show_bug.cgi?id=117714.
+ <rdar://problem/14179054>
+
+ Reviewed by Brent Fulgham.
+
+ * WebKit.vcxproj/WebKit.make:
+
2013-06-17 Michael Brüning <michael.brun...@digia.com>
[Qt] Remove Qt specific QTKIT flagged code.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.make (151659 => 151660)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-06-18 00:09:40 UTC (rev 151659)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-06-18 00:23:38 UTC (rev 151660)
@@ -8,12 +8,13 @@
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 ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
+ set Path=%PATH%;%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" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
- -xcopy "%ConfigurationBuildDir%\bin32\*.dll" "$(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%\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\*" "$(DSTROOT)\AppleInternal\bin32\WebKit.resources" /e/v/i/h/y
+ xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "%ProgramFilesAAS%\WebKit.resources" /e/v/i/h/y
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
