Unreviewed. More VS2010 solution makefile fixes.

<rdar://problem/13588964>

* WTF.vcxproj/WTF.make:
* JavaScriptCore.vcxproj/JavaScriptCore.make:
* WebCore.vcxproj/WebCore.make:
* WebKit.vcxproj/WebKit.make:
* win/tools/WinTools.make:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147793 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 75ffced..d276a2d 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-05  Roger Fong  <roger_fong@apple.com>
+
+        More VS2010 solution makefile fixes.
+        <rdar://problem/13588964>
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.make:
+
 2013-04-05  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         LLint should be able to use x87 instead of SSE for floating pointer

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make
index fe3c570..2354f8a 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make
@@ -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 "JavaScriptCore.submit.sln" /clean $(BUILDSTYLE)

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 3afc7d7..6408e2c 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-05  Roger Fong  <roger_fong@apple.com>
+
+        More VS2010 solution makefile fixes.
+        <rdar://problem/13588964>
+
+        * WTF.vcxproj/WTF.make:
+
 2013-04-05  Anders Carlsson  <andersca@apple.com>
 
         Remove more dead Chromium code from WTF

diff --git a/Source/WTF/WTF.vcxproj/WTF.make b/Source/WTF/WTF.vcxproj/WTF.make
index 98e5164..edd25e8 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTF.make
+++ b/Source/WTF/WTF.vcxproj/WTF.make
@@ -1,13 +1,14 @@
-!IF "$(BUILDSTYLE)"=="DEBUG"\r
+!IF defined(BUILDSTYLE) && "$(BUILDSTYLE)"=="DEBUG"\r
 BUILDSTYLE=DebugSuffix\r
 !ELSE\r
 BUILDSTYLE=Production\r
 !ENDIF\r
 \r
 install:\r
+    set OFFICIAL_BUILD=1\r
        set WebKit_Libraries=$(SRCROOT)\AppleInternal\r
        set WebKit_OutputDir=$(OBJROOT)\r
-    set WebKit_Source=$(SRCROOT)\..\..\r
+    set WebKit_Source=$(SRCROOT)\r
        set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)\r
     devenv "WTF.submit.sln" /clean $(BUILDSTYLE)\r
     devenv "WTF.submit.sln" /build $(BUILDSTYLE)\r

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index bccbaed..33cf7cd 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-05  Roger Fong  <roger_fong@apple.com>
+
+        More VS2010 solution makefile fixes.
+        <rdar://problem/13588964>
+
+        * WebCore.vcxproj/WebCore.make:
+
 2013-04-05  Ed Bartosh  <bartosh@gmail.com>
 
         [EFL] --no-tiled-backing-store build fails because of not used #if USE(ACCELERATED_COMPOSITING)

diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.make b/Source/WebCore/WebCore.vcxproj/WebCore.make
index 7608b31..41ade1f 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCore.make
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.make
@@ -9,7 +9,7 @@ install:
        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)

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index c7e95ce..53b5820 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-05  Roger Fong  <roger_fong@apple.com>
+
+        More VS2010 solution makefile fixes.
+        <rdar://problem/13588964>
+
+        * WebKit.vcxproj/WebKit.make:
+
 2013-04-04  Benjamin Poulain  <benjamin@webkit.org>
 
         Remove Webkit/chromium

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit.make b/Source/WebKit/WebKit.vcxproj/WebKit.make
index 4885100..5f0956f 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit.make
+++ b/Source/WebKit/WebKit.vcxproj/WebKit.make
@@ -5,10 +5,11 @@ 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)
        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

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 83b98d0..1a065d6 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-05  Roger Fong  <roger_fong@apple.com>
+
+        More VS2010 solution makefile fixes.
+        <rdar://problem/13588964>
+
+        * win/tools/WinTools.make:
+
 2013-04-03  Brent Fulgham  <bfulgham@webkit.org>
 
         [Windows, WinCairo] Unreviewed VS2010 Build Correction

diff --git a/WebKitLibraries/win/tools/WinTools.make b/WebKitLibraries/win/tools/WinTools.make
index c487e01..ac27580 100755 (executable)
--- a/WebKitLibraries/win/tools/WinTools.make
+++ b/WebKitLibraries/win/tools/WinTools.make
@@ -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