Modify WTF and JavaScriptCore makefiles for x64 build.
authorroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Oct 2013 22:25:03 +0000 (22:25 +0000)
committerroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Oct 2013 22:25:03 +0000 (22:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=122467.
<rdar://problem/15169174>.

Reviewed by Brent Fulgham.

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

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make
Source/WTF/ChangeLog
Source/WTF/WTF.vcxproj/WTF.make

index 1dca07b..36a0cd8 100644 (file)
@@ -1,3 +1,13 @@
+2013-10-07  Roger Fong  <roger_fong@apple.com>
+
+        Modify JavascriptCore makefile for x64 build.
+        https://bugs.webkit.org/show_bug.cgi?id=122467.
+        <rdar://problem/15169174>.
+
+        Reviewed by Brent Fulgham.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.make:
+
 2013-10-07  Nadav Rotem  <nrotem@apple.com>
 
         FTL: Optimize IsString(@2<String>) -> JSConst(true) + Phantom()
index 311dfed..9fa90da 100644 (file)
@@ -8,13 +8,16 @@ install:
     set OFFICIAL_BUILD=1
        set WebKit_Libraries=$(SRCROOT)\AppleInternal
        set WebKit_OutputDir=$(OBJROOT)
+    set OriginalPath = %PATH%
+
+    set ArchitectureBuildStyle=$(BUILDSTYLE)|Win32
     set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
-    set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
+    set Path=%OriginalPath%;$(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)
+    devenv "JavaScriptCore.submit.sln" /clean "%ArchitectureBuildStyle%"
+    devenv "JavaScriptCore.submit.sln" /build "%ArchitectureBuildStyle%"
     -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
@@ -28,3 +31,25 @@ install:
     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
+
+    set ArchitectureBuildStyle=$(BUILDSTYLE)|x64
+    set ProgramFilesAAS=Program Files\Common Files\Apple\Apple Application Support
+    set Path=%OriginalPath%;$(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 "%ArchitectureBuildStyle%"
+    devenv "JavaScriptCore.submit.sln" /build "%ArchitectureBuildStyle%"
+    -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
+    -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore_debug.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
+    -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
+    -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore_debug.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
+    -xcopy "%ConfigurationBuildDir%\bin64\jsc.exe" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y
+    -xcopy "%ConfigurationBuildDir%\bin64\jsc_debug.exe" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y
+    -xcopy "%ConfigurationBuildDir%\bin64\jsc.pdb" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y
+    -xcopy "%ConfigurationBuildDir%\bin64\jsc_debug.pdb" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y
+    xcopy "%ConfigurationBuildDir%\lib64\*" "$(DSTROOT)\AppleInternal\lib64\" /e/v/i/h/y    
+    xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\JavaScriptCore.resources" /e/v/i/h/y
+    -mkdir "$(DSTROOT)\AppleInternal\Sources64\JavaScriptCore"
+    xcopy "%ConfigurationBuildDir%\obj64\JavaScriptCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources64\JavaScriptCore" /e/v/i/h/y
+    
\ No newline at end of file
index 5fb0093..52cbc77 100644 (file)
@@ -1,3 +1,13 @@
+2013-10-07  Roger Fong  <roger_fong@apple.com>
+
+        Modify WTF makefile for x64 build.
+        https://bugs.webkit.org/show_bug.cgi?id=122467.
+        <rdar://problem/15169174>.
+
+        Reviewed by Brent Fulgham.
+
+        * WTF.vcxproj/WTF.make:
+
 2013-10-07  Anders Carlsson  <andersca@apple.com>
 
         Remove passIn and passOut from HashTraits
index 9a8d759..66e9324 100644 (file)
@@ -1,18 +1,31 @@
-!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 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\*" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
\ No newline at end of file
+!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 OriginalPath = %PATH%
+    
+    set ArchitectureBuildStyle=$(BUILDSTYLE)|Win32
+    set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
+    set Path=%OriginalPath%;$(SRCROOT)\%ProgramFilesAAS%
+       set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
+    devenv "WTF.submit.sln" /clean "%ArchitectureBuildStyle%"
+    devenv "WTF.submit.sln" /build "%ArchitectureBuildStyle%"
+    echo "%ConfigurationBuildDir%\include\*"
+    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)\%ProgramFilesAAS%" /e/v/i/h/y
+
+    set ArchitectureBuildStyle=$(BUILDSTYLE)|x64
+    set ProgramFilesAAS=Program Files\Common Files\Apple\Apple Application Support
+    set Path=%OriginalPath%;$(SRCROOT)\%ProgramFilesAAS%
+       set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
+    devenv "WTF.submit.sln" /clean "%ArchitectureBuildStyle%"
+    devenv "WTF.submit.sln" /build "%ArchitectureBuildStyle%"
+    xcopy "%ConfigurationBuildDir%\lib64\*" "$(DSTROOT)\AppleInternal\lib64\" /e/v/i/h/y
+    xcopy "%ConfigurationBuildDir%\bin64\*" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
\ No newline at end of file