Unreviewed. More VS2010 solution makefile fixes.
authorroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Apr 2013 20:38:35 +0000 (20:38 +0000)
committerroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Apr 2013 20:38:35 +0000 (20:38 +0000)
<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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make
Source/WTF/ChangeLog
Source/WTF/WTF.vcxproj/WTF.make
Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/WebCore.make
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKit.make
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/WinTools.make

index 75ffced66be7a6b6672a34ef0a05bc22c2b3d546..d276a2df49ae6ab87ed4c632dc2bad1c9badf8fd 100644 (file)
@@ -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
index fe3c57001af1b751cb92d9d664c50e1109667cf7..2354f8ac1966672687622a63034179fbe6af17e5 100644 (file)
@@ -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)
index 3afc7d7ad23462fad52218b9b835b21b59eec9a4..6408e2cde11f8fffe961b93eb6c0a447f27b0df7 100644 (file)
@@ -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
index 98e5164de73d968c650e263ac8868e9ec8c7f503..edd25e8b62789f63bef6510ee43ed7167bf11a04 100644 (file)
@@ -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
index bccbaed4672407e6f919823960522e77ac5b6b20..33cf7cda52a00acaa2353adcdea1068f0e3ff2de 100644 (file)
@@ -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)
index 7608b31855b5710a8234545715a7ffe7137ce50b..41ade1f99ad3101cb9897f98dadfeb1de900450b 100644 (file)
@@ -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)
index c7e95ce3eec108c38093ff470c3bf8d1b8c0bc62..53b5820fb15530b81f1c08ce83cbd8ab75dc53e1 100644 (file)
@@ -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
index 48851001fedc627634e1ebeabeb9f9bf449ddcff..5f0956f7b7b92fc8890b0331cf123a09b6ff2d0d 100644 (file)
@@ -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
index 83b98d0d16bf6845b66deb66956f72bb077bde45..1a065d6183b4d7807b0639efcd2555bee1338439 100644 (file)
@@ -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
index c487e015f7daee12c8671052aa3b8131be618c96..ac27580c8aab2deb7e81be9d5b42dce2d5005d93 100755 (executable)
@@ -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