Changeset 154354 in webkit

Timestamp:

Aug 20, 2013 1:45:34 PM (11 years ago)

Author:

achristensen@apple.com

Message:

<​https://webkit.org/b/120076> More work towards a Win64 build

Reviewed by Brent Fulgham.

Source/JavaScriptCore:

• JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make:
• JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
• JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
• JavaScriptCore.vcxproj/copy-files.cmd:
• JavaScriptCore.vcxproj/jsc/jscCommon.props:
• JavaScriptCore.vcxproj/testRegExp/testRegExpCommon.props:

Use PlatformArchitecture macro instead of bin32, lib32, and obj32.

Source/WebKit:

• WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd:

Use PlatformArchitecture macro instead of bin32, lib32, and obj32.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscCommon.props (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpCommon.props (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-08-20  Alex Christensen  <achristensen@apple.com>
+
+        <https://webkit.org/b/120076> More work towards a Win64 build
+
+        Reviewed by Brent Fulgham.
+
+        * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make:
+        * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
+        * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
+        * JavaScriptCore.vcxproj/copy-files.cmd:
+        * JavaScriptCore.vcxproj/jsc/jscCommon.props:
+        * JavaScriptCore.vcxproj/testRegExp/testRegExpCommon.props:
+        Use PlatformArchitecture macro instead of bin32, lib32, and obj32.
+
 2013-08-20  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make

@@ -10 +10 @@
     -del "%ConfigurationBuildDir%\buildfailed"
     copy-files.cmd clean
-    -del /s /q "%ConfigurationBuildDir%\obj32\JavaScriptCore\DerivedSources"
+    -del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\JavaScriptCore\DerivedSources"

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make

@@ -6 +6 @@
 clean:
     -del "%ConfigurationBuildDir%\buildfailed"
-    -del /s /q "%ConfigurationBuildDir%\obj32\JavaScriptCore\DerivedSources\LLIntAssembly.h"
+    -del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\JavaScriptCore\DerivedSources\LLIntAssembly.h"

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make

@@ -7 +7 @@
 clean:
     -del "%ConfigurationBuildDir%\buildfailed"
-    -del /s /q "%ConfigurationBuildDir%\obj32\JavaScriptCore\DerivedSources\LLIntDesiredOffsets.h"
+    -del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\JavaScriptCore\DerivedSources\LLIntDesiredOffsets.h"

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd

@@ -3 +3 @@
 set PublicHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\JavaScriptCore
 set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\JavaScriptCore
-set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin32\JavaScriptCore.resources
+set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\JavaScriptCore.resources
 
 if "%1" EQU "clean" goto :clean

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscCommon.props

@@ -8 +8 @@
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\;..\..\tools\;..\..\runtime\;..\..\llint\;..\..\jit\;..\..\disassembler\;..\..\heap\;..\..\debugger\;..\..\assembler\;..\..\profiler\;..\..\interpreter\;..\..\bytecode\;..\..\dfg\;..\..\bytecompiler\;..\..\parser\;..\..\API\;$(ConfigurationBuildDir)\include\;$(ConfigurationBuildDir)\include\private\;$(ConfigurationBuildDir)\include\JavaScriptCore\;$(ConfigurationBuildDir)\obj32\JavaScriptCore\DerivedSources\;$(WebKit_Libraries)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\;..\..\tools\;..\..\runtime\;..\..\llint\;..\..\jit\;..\..\disassembler\;..\..\heap\;..\..\debugger\;..\..\assembler\;..\..\profiler\;..\..\interpreter\;..\..\bytecode\;..\..\dfg\;..\..\bytecompiler\;..\..\parser\;..\..\API\;$(ConfigurationBuildDir)\include\;$(ConfigurationBuildDir)\include\private\;$(ConfigurationBuildDir)\include\JavaScriptCore\;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\JavaScriptCore\DerivedSources\;$(WebKit_Libraries)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>ICUVersion.h</ForcedIncludeFiles>

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpCommon.props

@@ -7 +7 @@
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;__STD_C;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(ConfigurationBuildDir)\obj32\JavaScriptCore\DerivedSources;..\..\;..\..\os-win32;..\..\assembler;..\..\API;..\..\parser;..\..\heap;..\..\runtime;..\..\bytecode;..\..\interpreter;..\..\debugger;..\..\bytecompiler;..\..\profiler;..\..\jit;$(WebKit_Libraries)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\JavaScriptCore\DerivedSources;..\..\;..\..\os-win32;..\..\assembler;..\..\API;..\..\parser;..\..\heap;..\..\runtime;..\..\bytecode;..\..\interpreter;..\..\debugger;..\..\bytecompiler;..\..\profiler;..\..\jit;$(WebKit_Libraries)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2013-08-20  Alex Christensen  <achristensen@apple.com>
+
+        <https://webkit.org/b/120076> More work towards a Win64 build
+
+        Reviewed by Brent Fulgham.
+
+        * WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd:
+        Use PlatformArchitecture macro instead of bin32, lib32, and obj32.
+
 2013-08-20  Alex Christensen  <achristensen@apple.com>
 

trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd

@@ -6 +6 @@
 echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
 
-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\obj32\WebKit\%PROJECTNAME%"
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKit\%PROJECTNAME%"
 bash "%WEBKIT_LIBRARIES%\tools\scripts\auto-version.sh" "%INTDIR%"