Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (147792 => 147793)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-05 20:29:44 UTC (rev 147792)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-05 20:38:35 UTC (rev 147793)
@@ -1,3 +1,10 @@
+2013-04-05 Roger Fong <[email protected]>
+
+ More VS2010 solution makefile fixes.
+ <rdar://problem/13588964>
+
+ * _javascript_Core.vcxproj/_javascript_Core.make:
+
2013-04-05 Allan Sandfeld Jensen <[email protected]>
LLint should be able to use x87 instead of SSE for floating pointer
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make (147792 => 147793)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-04-05 20:29:44 UTC (rev 147792)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-04-05 20:38:35 UTC (rev 147793)
@@ -1,14 +1,15 @@
-!IF "$(BUILDSTYLE)"=="DEBUG"
+!IF defined(BUILDSTYLE) && "$(BUILDSTYLE)"=="DEBUG"
BUILDSTYLE=DebugSuffix
!ELSE
BUILDSTYLE=Production
!ENDIF
install:
+ set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
- set WebKit_Source=$(SRCROOT)\..\..
+ set WebKit_Source=$(SRCROOT)
-mkdir "%ConfigurationBuildDir%\include\private"
xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
devenv "_javascript_Core.submit.sln" /clean $(BUILDSTYLE)
Modified: trunk/Source/WTF/ChangeLog (147792 => 147793)
--- trunk/Source/WTF/ChangeLog 2013-04-05 20:29:44 UTC (rev 147792)
+++ trunk/Source/WTF/ChangeLog 2013-04-05 20:38:35 UTC (rev 147793)
@@ -1,3 +1,10 @@
+2013-04-05 Roger Fong <[email protected]>
+
+ More VS2010 solution makefile fixes.
+ <rdar://problem/13588964>
+
+ * WTF.vcxproj/WTF.make:
+
2013-04-05 Anders Carlsson <[email protected]>
Remove more dead Chromium code from WTF
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.make (147792 => 147793)
--- trunk/Source/WTF/WTF.vcxproj/WTF.make 2013-04-05 20:29:44 UTC (rev 147792)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.make 2013-04-05 20:38:35 UTC (rev 147793)
@@ -1,13 +1,14 @@
-!IF "$(BUILDSTYLE)"=="DEBUG"
+!IF defined(BUILDSTYLE) && "$(BUILDSTYLE)"=="DEBUG"
BUILDSTYLE=DebugSuffix
!ELSE
BUILDSTYLE=Production
!ENDIF
install:
+ set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
- set WebKit_Source=$(SRCROOT)\..\..
+ set WebKit_Source=$(SRCROOT)
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
devenv "WTF.submit.sln" /clean $(BUILDSTYLE)
devenv "WTF.submit.sln" /build $(BUILDSTYLE)
Modified: trunk/Source/WebCore/ChangeLog (147792 => 147793)
--- trunk/Source/WebCore/ChangeLog 2013-04-05 20:29:44 UTC (rev 147792)
+++ trunk/Source/WebCore/ChangeLog 2013-04-05 20:38:35 UTC (rev 147793)
@@ -1,3 +1,10 @@
+2013-04-05 Roger Fong <[email protected]>
+
+ More VS2010 solution makefile fixes.
+ <rdar://problem/13588964>
+
+ * WebCore.vcxproj/WebCore.make:
+
2013-04-05 Ed Bartosh <[email protected]>
[EFL] --no-tiled-backing-store build fails because of not used #if USE(ACCELERATED_COMPOSITING)
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.make (147792 => 147793)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.make 2013-04-05 20:29:44 UTC (rev 147792)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.make 2013-04-05 20:38:35 UTC (rev 147793)
@@ -9,7 +9,7 @@
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
- set WebKit_Source=$(SRCROOT)\..\..
+ set WebKit_Source=$(SRCROOT)
-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)
Modified: trunk/Source/WebKit/ChangeLog (147792 => 147793)
--- trunk/Source/WebKit/ChangeLog 2013-04-05 20:29:44 UTC (rev 147792)
+++ trunk/Source/WebKit/ChangeLog 2013-04-05 20:38:35 UTC (rev 147793)
@@ -1,3 +1,10 @@
+2013-04-05 Roger Fong <[email protected]>
+
+ More VS2010 solution makefile fixes.
+ <rdar://problem/13588964>
+
+ * WebKit.vcxproj/WebKit.make:
+
2013-04-04 Benjamin Poulain <[email protected]>
Remove Webkit/chromium
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.make (147792 => 147793)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-04-05 20:29:44 UTC (rev 147792)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-04-05 20:38:35 UTC (rev 147793)
@@ -5,10 +5,11 @@
!ENDIF
install:
+ set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
- set WebKit_Source=$(SRCROOT)\..\..
+ set WebKit_Source=$(SRCROOT)
devenv "WebKit.submit.sln" /rebuild $(BUILDSTYLE)
-xcopy "%ConfigurationBuildDir%\bin\*.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\bin\*.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
Modified: trunk/WebKitLibraries/ChangeLog (147792 => 147793)
--- trunk/WebKitLibraries/ChangeLog 2013-04-05 20:29:44 UTC (rev 147792)
+++ trunk/WebKitLibraries/ChangeLog 2013-04-05 20:38:35 UTC (rev 147793)
@@ -1,3 +1,10 @@
+2013-04-05 Roger Fong <[email protected]>
+
+ More VS2010 solution makefile fixes.
+ <rdar://problem/13588964>
+
+ * win/tools/WinTools.make:
+
2013-04-03 Brent Fulgham <[email protected]>
[Windows, WinCairo] Unreviewed VS2010 Build Correction
Modified: trunk/WebKitLibraries/win/tools/WinTools.make (147792 => 147793)
--- trunk/WebKitLibraries/win/tools/WinTools.make 2013-04-05 20:29:44 UTC (rev 147792)
+++ trunk/WebKitLibraries/win/tools/WinTools.make 2013-04-05 20:38:35 UTC (rev 147793)
@@ -1,3 +1,4 @@
install:
xcopy "$(SRCROOT)\vsprops\*.vsprops" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
+ xcopy "$(SRCROOT)\vsprops\*.props" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
xcopy "$(SRCROOT)\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y