Make Windows makefile copy build output to a different folder.

<rdar://problem/14219184>.

* WTF.vcxproj/WTF.make:
* JavaScriptCore.vcxproj/JavaScriptCore.make:
* WebCore.vcxproj/WebCore.make:
* WebKit.vcxproj/WebKit.make:

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 19eeafe4c67c118131f07e2d95bda7ea58b52984..ed95256237f939337f25691e4504902f53aa3597 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-20  Roger Fong  <roger_fong@apple.com>
+
+        Make Windows makefile copy build output to a different folder.
+        <rdar://problem/14219184>.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.make:
+
 2013-06-20  Mark Hahnenberg  <mhahnenberg@apple.com>
 
         Improper deallocation of JSManagedValue causes crashes during autorelease pool draining

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make
index 1ab24e0e11b13a68b434575495354109cbe376f6..edf5be7b6fcf556ceb0ad59427d24f5354ed3b98 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make
@@ -8,23 +8,23 @@ install:
     set OFFICIAL_BUILD=1
        set WebKit_Libraries=$(SRCROOT)\AppleInternal
        set WebKit_OutputDir=$(OBJROOT)
-    set ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
-    set Path=%PATH%;%ProgramFilesAAS%
+    set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
+    set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
        set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
     -mkdir "%ConfigurationBuildDir%\include\private"
     xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
     devenv "JavaScriptCore.submit.sln" /clean $(BUILDSTYLE)
     devenv "JavaScriptCore.submit.sln" /build $(BUILDSTYLE)
-    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.dll" "%ProgramFilesAAS%" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore_debug.dll" "%ProgramFilesAAS%" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.pdb" "%ProgramFilesAAS%" /e/v/i/h/y
-    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore_debug.pdb" "%ProgramFilesAAS%" /e/v/i/h/y
+    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.dll" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
+    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore_debug.dll" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
+    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.pdb" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
+    -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore_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
     -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\JavaScriptCore.resources\*" "%ProgramFilesAAS%\JavaScriptCore.resources" /e/v/i/h/y
+    xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\JavaScriptCore.resources" /e/v/i/h/y
     -mkdir "$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore"
     xcopy "%ConfigurationBuildDir%\obj32\JavaScriptCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore" /e/v/i/h/y

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 1cadf675d6d3c1f3269808e3fb8c9b7775944887..4e3221b88f7abba83cc303af559f90610e3cb187 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-20  Roger Fong  <roger_fong@apple.com>
+
+        Make Windows makefile copy build output to a different folder.
+        <rdar://problem/14219184>.
+
+        * WTF.vcxproj/WTF.make:
+
 2013-06-19  Geoffrey Garen  <ggaren@apple.com>
 
         Remove the SegmentedVector inline segment to shrink CodeBlock by 6X

diff --git a/Source/WTF/WTF.vcxproj/WTF.make b/Source/WTF/WTF.vcxproj/WTF.make
index 8b149f74de2050b49dc13511b4a182726242b996..9a8d759ca74445c85aa530f5b47df12705b96ee9 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTF.make
+++ b/Source/WTF/WTF.vcxproj/WTF.make
@@ -8,11 +8,11 @@ install:
     set OFFICIAL_BUILD=1\r
        set WebKit_Libraries=$(SRCROOT)\AppleInternal\r
        set WebKit_OutputDir=$(OBJROOT)\r
-    set ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support\r
-    set Path=%PATH%;%ProgramFilesAAS%\r
+    set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support\r
+    set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%\r
        set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)\r
     devenv "WTF.submit.sln" /clean $(BUILDSTYLE)\r
     devenv "WTF.submit.sln" /build $(BUILDSTYLE)\r
     xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y\r
     xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y\r
-    xcopy "%ConfigurationBuildDir%\bin32\*" "%ProgramFilesAAS%" /e/v/i/h/y
\ No newline at end of file
+    xcopy "%ConfigurationBuildDir%\bin32\*" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
\ No newline at end of file

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 9185bb22ef7bdb1d17d07106740c63a7f20e8991..ac6762458acf8147830252a4cc4e85628b0f230b 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-20  Roger Fong  <roger_fong@apple.com>
+
+        Make Windows makefile copy build output to a different folder.
+        <rdar://problem/14219184>.
+
+        * WebCore.vcxproj/WebCore.make:
+
 2013-06-19  Jer Noble  <jer.noble@apple.com>
 
         Roll-on in-band captions are displayed bottom-to-top rather than top-to-bottom.

diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.make b/Source/WebCore/WebCore.vcxproj/WebCore.make
index c45d8743611c617194a0a1a05f2bb76f4c72eb16..3c44c971d02f133a49a0a597a9b1d81c5ed8489a 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCore.make
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.make
@@ -8,15 +8,15 @@ install:
     set OFFICIAL_BUILD=1
        set WebKit_Libraries=$(SRCROOT)\AppleInternal
        set WebKit_OutputDir=$(OBJROOT)
-    set ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
-    set Path=%PATH%;%ProgramFilesAAS%
+    set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
+    set Path=%PATH%;$(SRCROOT)\%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\*" "%ProgramFilesAAS%\WebKit.resources" /e/v/i/h/y
+       xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "$(DSTROOT)\%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

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 7798f3c1cdffa69b171a8f0b9acf2595b9025c53..142e52aa919590e628c2180bbb120b4c5e4dc5b1 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-20  Roger Fong  <roger_fong@apple.com>
+
+        Make Windows makefile copy build output to a different folder.
+        <rdar://problem/14219184>.
+
+        * WebKit.vcxproj/WebKit.make:
+
 2013-06-18  Roger Fong  <roger_fong@apple.com>
 
         Replace tools32 folder with tools and update WebKit Windows solution accordingly.

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit.make b/Source/WebKit/WebKit.vcxproj/WebKit.make
index e449d4cff72bd1ef5d00acc5e2ec8dda09057f15..2455e3ed1873f61fca0cfbd4cc10de57776447cd 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit.make
+++ b/Source/WebKit/WebKit.vcxproj/WebKit.make
@@ -8,13 +8,13 @@ install:
     set OFFICIAL_BUILD=1
        set WebKit_Libraries=$(SRCROOT)\AppleInternal
        set WebKit_OutputDir=$(OBJROOT)
-    set ProgramFilesAAS=$(SRCROOT)\Program Files (x86)\Common Files\Apple\Apple Application Support
-    set Path=%PATH%;%ProgramFilesAAS%
+    set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
+    set Path=%PATH%;$(SRCROOT)\%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" "%ProgramFilesAAS%" /e/v/i/h/y
-       -xcopy "%ConfigurationBuildDir%\bin32\*.dll" "%ProgramFilesAAS%" /e/v/i/h/y
+       xcopy "%ConfigurationBuildDir%\bin32\*.pdb" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
+       -xcopy "%ConfigurationBuildDir%\bin32\*.dll" "$(DSTROOT)\%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\*" "%ProgramFilesAAS%\WebKit.resources" /e/v/i/h/y
+       xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\WebKit.resources" /e/v/i/h/y