Commit 5e188220 authored by roger_fong@apple.com's avatar roger_fong@apple.com

Modify WTF and JavaScriptCore makefiles for x64 build.

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: http://svn.webkit.org/repository/webkit/trunk@157060 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2faae0ed
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> 2013-10-07 Nadav Rotem <nrotem@apple.com>
FTL: Optimize IsString(@2<String>) -> JSConst(true) + Phantom() FTL: Optimize IsString(@2<String>) -> JSConst(true) + Phantom()
...@@ -8,13 +8,16 @@ install: ...@@ -8,13 +8,16 @@ install:
set OFFICIAL_BUILD=1 set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT) set WebKit_OutputDir=$(OBJROOT)
set OriginalPath = %PATH%
set ArchitectureBuildStyle=$(BUILDSTYLE)|Win32
set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support 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) set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-mkdir "%ConfigurationBuildDir%\include\private" -mkdir "%ConfigurationBuildDir%\include\private"
xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
devenv "JavaScriptCore.submit.sln" /clean $(BUILDSTYLE) devenv "JavaScriptCore.submit.sln" /clean "%ArchitectureBuildStyle%"
devenv "JavaScriptCore.submit.sln" /build $(BUILDSTYLE) devenv "JavaScriptCore.submit.sln" /build "%ArchitectureBuildStyle%"
-xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.dll" "$(DSTROOT)\%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_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.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
...@@ -28,3 +31,25 @@ install: ...@@ -28,3 +31,25 @@ install:
xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.resources\*" "$(DSTROOT)\%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" -mkdir "$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore"
xcopy "%ConfigurationBuildDir%\obj32\JavaScriptCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore" /e/v/i/h/y 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
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> 2013-10-07 Anders Carlsson <andersca@apple.com>
Remove passIn and passOut from HashTraits Remove passIn and passOut from HashTraits
......
!IF defined(BUILDSTYLE) && "$(BUILDSTYLE)"=="DEBUG" !IF defined(BUILDSTYLE) && "$(BUILDSTYLE)"=="DEBUG"
BUILDSTYLE=DebugSuffix BUILDSTYLE=DebugSuffix
!ELSE !ELSE
BUILDSTYLE=Production BUILDSTYLE=Production
!ENDIF !ENDIF
install: install:
set OFFICIAL_BUILD=1 set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT) set WebKit_OutputDir=$(OBJROOT)
set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support set OriginalPath = %PATH%
set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE) set ArchitectureBuildStyle=$(BUILDSTYLE)|Win32
devenv "WTF.submit.sln" /clean $(BUILDSTYLE) set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
devenv "WTF.submit.sln" /build $(BUILDSTYLE) set Path=%OriginalPath%;$(SRCROOT)\%ProgramFilesAAS%
xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y devenv "WTF.submit.sln" /clean "%ArchitectureBuildStyle%"
xcopy "%ConfigurationBuildDir%\bin32\*" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y devenv "WTF.submit.sln" /build "%ArchitectureBuildStyle%"
\ No newline at end of file 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment