From 5e1882200796e9efddd65098471189dc52ce20cf Mon Sep 17 00:00:00 2001 From: "roger_fong@apple.com" Date: Mon, 7 Oct 2013 22:25:03 +0000 Subject: [PATCH] Modify WTF and JavaScriptCore makefiles for x64 build. https://bugs.webkit.org/show_bug.cgi?id=122467. . 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 --- Source/JavaScriptCore/ChangeLog | 10 ++++ .../JavaScriptCore.make | 31 ++++++++++-- Source/WTF/ChangeLog | 10 ++++ Source/WTF/WTF.vcxproj/WTF.make | 49 ++++++++++++------- 4 files changed, 79 insertions(+), 21 deletions(-) diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 1dca07b1f53..36a0cd8f8dc 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,13 @@ +2013-10-07 Roger Fong + + Modify JavascriptCore makefile for x64 build. + https://bugs.webkit.org/show_bug.cgi?id=122467. + . + + Reviewed by Brent Fulgham. + + * JavaScriptCore.vcxproj/JavaScriptCore.make: + 2013-10-07 Nadav Rotem FTL: Optimize IsString(@2) -> JSConst(true) + Phantom() diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make index 311dfed53ae..9fa90dad4c7 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make +++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make @@ -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 diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog index 5fb00932784..52cbc77b158 100644 --- a/Source/WTF/ChangeLog +++ b/Source/WTF/ChangeLog @@ -1,3 +1,13 @@ +2013-10-07 Roger Fong + + Modify WTF makefile for x64 build. + https://bugs.webkit.org/show_bug.cgi?id=122467. + . + + Reviewed by Brent Fulgham. + + * WTF.vcxproj/WTF.make: + 2013-10-07 Anders Carlsson Remove passIn and passOut from HashTraits diff --git a/Source/WTF/WTF.vcxproj/WTF.make b/Source/WTF/WTF.vcxproj/WTF.make index 9a8d759ca74..66e9324e9ae 100644 --- a/Source/WTF/WTF.vcxproj/WTF.make +++ b/Source/WTF/WTF.vcxproj/WTF.make @@ -1,18 +1,31 @@ -!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 ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support - set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS% - set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE) - devenv "WTF.submit.sln" /clean $(BUILDSTYLE) - devenv "WTF.submit.sln" /build $(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\*" "$(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 -- GitLab