Re-separating Win32 and Win64 builds.
authoralex.christensen@flexsim.com <alex.christensen@flexsim.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Aug 2013 20:16:25 +0000 (20:16 +0000)
committeralex.christensen@flexsim.com <alex.christensen@flexsim.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Aug 2013 20:16:25 +0000 (20:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=120178

Reviewed by Brent Fulgham.

Source/JavaScriptCore:

* JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make:
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
Pass PlatformArchitecture as a command line parameter to bash scripts.
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh:
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh:
* JavaScriptCore.vcxproj/build-generated-files.sh:
Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).

Source/WebCore:

* WebCore.vcxproj/WebCoreGenerated.make:
* WebCore.vcxproj/WebCoreGeneratedWinCairo.make:
Pass PlatformArchitecture as a command line parameter to bash scripts
and use PlatformArchitecture to determine which directory to delete
while cleaning (obj32 or obj64).
* WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props:
Export PlatformArchitecture to be used by make and cmd scripts.
* WebCore.vcxproj/build-generated-files.sh:
Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).
* WebCore.vcxproj/copyForwardingHeaders.cmd:
* WebCore.vcxproj/copyWebCoreResourceFiles.cmd:
Use PlatformArchitecture to determine which directory to copy to (obj32 or obj64).

Source/WebKit:

* WebKit.vcxproj/WebKit/WebKitPostBuild.cmd:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd:
Use PlatformArchitecture to determine correct object directory (obj32 or obj64).

Source/WTF:

* WTF.vcxproj/WTFGenerated.make:
Pass PlatformArchitecture as a command line parameter to bash scripts.
* WTF.vcxproj/build-generated-files.sh:
Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).

WebKitLibraries:

* win/tools/vsprops/common.props:
Export PlatformArchitecture to be used by make and cmd scripts.
Use PlatformArchitecture to determine correct build directory
(lib32/bin32/obj32 or lib64/bin64/obj64).

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

24 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make
Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make
Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh
Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make
Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh
Source/JavaScriptCore/JavaScriptCore.vcxproj/build-generated-files.sh
Source/WTF/ChangeLog
Source/WTF/WTF.vcxproj/WTFGenerated.make
Source/WTF/WTF.vcxproj/build-generated-files.sh
Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make
Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make
Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props
Source/WebCore/WebCore.vcxproj/build-generated-files.sh
Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd
Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/common.props

index 2c8e1bc..1724050 100644 (file)
@@ -1,3 +1,19 @@
+2013-08-23  Alex Christensen  <achristensen@apple.com>
+
+        Re-separating Win32 and Win64 builds.
+        https://bugs.webkit.org/show_bug.cgi?id=120178
+
+        Reviewed by Brent Fulgham.
+
+        * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make:
+        * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
+        * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
+        Pass PlatformArchitecture as a command line parameter to bash scripts.
+        * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh:
+        * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh:
+        * JavaScriptCore.vcxproj/build-generated-files.sh:
+        Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).
+
 2013-08-22  Filip Pizlo  <fpizlo@apple.com>
 
         build-jsc --ftl-jit should work
index eabd712..1a9c970 100644 (file)
@@ -1,6 +1,6 @@
 all:
     touch "%ConfigurationBuildDir%\buildfailed"
-    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" 
+    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%"
     copy-files.cmd
 
     -del "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdbool.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdint.h"
index 2d361a0..3715fff 100644 (file)
@@ -1,6 +1,6 @@
 all:
     touch "%ConfigurationBuildDir%\buildfailed"
-    bash build-LLIntAssembly.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)"
+    bash build-LLIntAssembly.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
     -del "%ConfigurationBuildDir%\buildfailed"
 
 clean:
index e8a3b37..7cc956f 100644 (file)
@@ -16,7 +16,7 @@ XDSTROOT=`cygpath -m -s "$XDSTROOT"`
 XDSTROOT=`cygpath -u "$XDSTROOT"`
 export XDSTROOT
 
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32"
+export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${4}"
 
 cd "${BUILT_PRODUCTS_DIR}/JavaScriptCore/DerivedSources"
 
index 0e32c27..c6b8b3b 100644 (file)
@@ -1,6 +1,6 @@
 all:
     touch "%ConfigurationBuildDir%\buildfailed"
-    bash build-LLIntDesiredOffsets.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)"
+    bash build-LLIntDesiredOffsets.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%"
 
     -del "%ConfigurationBuildDir%\buildfailed"
 
index c3186fd..2c77150 100644 (file)
@@ -16,7 +16,7 @@ XDSTROOT=`cygpath -m -s "$XDSTROOT"`
 XDSTROOT=`cygpath -u "$XDSTROOT"`
 export XDSTROOT
 
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32/JavaScriptCore/DerivedSources"
+export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/JavaScriptCore/DerivedSources"
 
 ##############################################################################
 # Step 1: Generate LLIntDesiredOffsets.h
index e6b7ebb..2d72e8c 100644 (file)
@@ -26,7 +26,7 @@ SDKROOT=`cygpath -m -s "$SDKROOT"`
 SDKROOT=`cygpath -u "$SDKROOT"`
 export SDKROOT
 
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32/JavaScriptCore"
+export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/JavaScriptCore"
 
 mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/docs"
 cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
index 1dd6285..f26ecb6 100644 (file)
@@ -1,3 +1,15 @@
+2013-08-23  Alex Christensen  <achristensen@apple.com>
+
+        Re-separating Win32 and Win64 builds.
+        https://bugs.webkit.org/show_bug.cgi?id=120178
+
+        Reviewed by Brent Fulgham.
+
+        * WTF.vcxproj/WTFGenerated.make:
+        Pass PlatformArchitecture as a command line parameter to bash scripts.
+        * WTF.vcxproj/build-generated-files.sh:
+        Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).
+
 2013-08-22  Filip Pizlo  <fpizlo@apple.com>
 
         build-jsc --ftl-jit should work
index 81aaeca..6e4fa15 100644 (file)
@@ -1,6 +1,6 @@
 all: WTFHeaderDetection.h
     touch "%ConfigurationBuildDir%\buildfailed"
-    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)"
+    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
 !IF "$(OFFICIAL_BUILD)"!="1"
     bash -c "python work-around-vs-dependency-tracking-bugs.py"
 !ENDIF
index 9fd40e3..81366c5 100644 (file)
@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 
 # Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4
-UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib32/libicuuc${3}.lib")
+UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib{4}/libicuuc${3}.lib")
 ICUVERSION_H_PATH=$(cygpath -u "${CONFIGURATIONBUILDDIR}/include/private/ICUVersion.h")
 if test \( ! -f "${ICUVERSION_H_PATH}" \) -o \( -f "${UNVERSIONED_ICU_LIB_PATH}" -a \( "${UNVERSIONED_ICU_LIB_PATH}" -nt "${ICUVERSION_H_PATH}" \) \)
 then
index bdaaed4..0f2f4db 100644 (file)
@@ -1,3 +1,24 @@
+2013-08-23  Alex Christensen  <achristensen@apple.com>
+
+        Re-separating Win32 and Win64 builds.
+        https://bugs.webkit.org/show_bug.cgi?id=120178
+
+        Reviewed by Brent Fulgham.
+
+        * WebCore.vcxproj/WebCoreGenerated.make:
+        * WebCore.vcxproj/WebCoreGeneratedWinCairo.make:
+        Pass PlatformArchitecture as a command line parameter to bash scripts
+        and use PlatformArchitecture to determine which directory to delete
+        while cleaning (obj32 or obj64).
+        * WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props:
+        Export PlatformArchitecture to be used by make and cmd scripts.
+        * WebCore.vcxproj/build-generated-files.sh:
+        Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).
+        * WebCore.vcxproj/copyForwardingHeaders.cmd:
+        * WebCore.vcxproj/copyWebCoreResourceFiles.cmd:
+        Use PlatformArchitecture to determine which directory to copy to (obj32 or obj64).
+
+
 2013-08-23  Andreas Kling  <akling@apple.com>
 
         RenderView::compositor() should return a reference.
index c492030..a2e56be 100644 (file)
@@ -3,12 +3,12 @@ make:
        if errorlevel 1 exit 1\r
        echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"\r
 \r
-       bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows\r
-       bash migrate-scripts.sh "%ConfigurationBuildDir%\obj32\WebCore\scripts"\r
+       bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows %PlatformArchitecture%\r
+       bash migrate-scripts.sh "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
        cmd /C copyForwardingHeaders.cmd cg cf\r
        cmd /C copyWebCoreResourceFiles.cmd\r
        \r
 clean:\r
-       if exist "%ConfigurationBuildDir%\obj32\WebCore\DerivedSources" del /s /q "%ConfigurationBuildDir%\obj32\WebCore\DerivedSources"\r
-       if exist "%ConfigurationBuildDir%\obj32\WebCore\scripts" del /s /q "%ConfigurationBuildDir%\obj32\WebCore\scripts"\r
+       if exist "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources" del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources"\r
+       if exist "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts" del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
        if exist "%ConfigurationBuildDir%\buildfailed" del "%ConfigurationBuildDir%\buildfailed"\r
index 461a7cb..21f53da 100644 (file)
@@ -3,12 +3,12 @@ make:
        if errorlevel 1 exit 1\r
        echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"\r
 \r
-       bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo\r
-       bash migrate-scripts.sh "%ConfigurationBuildDir%\obj\WebCore\scripts"\r
+       bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo "%PlatformArchitecture%"\r
+       bash migrate-scripts.sh "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
        cmd /C copyForwardingHeaders.cmd cairo curl\r
        cmd /C copyWebCoreResourceFiles.cmd\r
        \r
 clean:\r
-       del /s /q "%ConfigurationBuildDir%\obj\WebCore\DerivedSources"\r
-       del /s /q "%ConfigurationBuildDir%\obj\WebCore\scripts"\r
+       del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources"\r
+       del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
        if exist "%ConfigurationBuildDir%\buildfailed" del "%ConfigurationBuildDir%\buildfailed"\r
index 85e97e5..f31938d 100644 (file)
@@ -6,7 +6,7 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
     <OutDir>$(ConfigurationBuildDir)\bin\</OutDir>\r
-    <IntDir>$(ConfigurationBuildDir)\obj\$(ProjectName)\</IntDir>\r
+    <IntDir>$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
     <NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash\r
 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%\r
@@ -22,6 +22,7 @@ set PATH=$(VSInstallDir)\VC\bin;%PATH%
 \r
 REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here\r
 set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)\r
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 nmake /nologo -f $(ProjectName)WinCairo.make clean</NMakeCleanCommandLine>\r
     <TargetName>$(ProjectName)$(DebugSuffix)</TargetName>\r
   </PropertyGroup>\r
@@ -71,6 +72,7 @@ set INPUTPATH=$(InputPath)
 set INTDIR=$(IntDir)\r
 set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)\r
 set OUTDIR=$(OutDir)\r
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 set PLATFORMNAME=$(PlatformName)\r
 set PROJECTDIR=$(ProjectDir)\r
 set PROJECTFILENAME=$(ProjectFileName)\r
@@ -107,6 +109,7 @@ set INPUTPATH=$(InputPath)
 set INTDIR=$(IntDir)\r
 set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)\r
 set OUTDIR=$(OutDir)\r
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 set PLATFORMNAME=$(PlatformName)\r
 set PROJECTDIR=$(ProjectDir)\r
 set PROJECTFILENAME=$(ProjectFileName)\r
@@ -143,6 +146,7 @@ set INPUTPATH=$(InputPath)
 set INTDIR=$(IntDir)\r
 set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)\r
 set OUTDIR=$(OutDir)\r
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 set PLATFORMNAME=$(PlatformName)\r
 set PROJECTDIR=$(ProjectDir)\r
 set PROJECTFILENAME=$(ProjectFileName)\r
@@ -215,5 +219,9 @@ cmd /c
       <Value>$(CONFIGURATIONBUILDDIR)</Value>\r
       <EnvironmentVariable>true</EnvironmentVariable>\r
     </BuildMacro>\r
+    <BuildMacro Include="PLATFORMARCHITECTURE">\r
+      <Value>$(PLATFORMARCHITECTURE)</Value>\r
+      <EnvironmentVariable>true</EnvironmentVariable>\r
+    </BuildMacro>\r
   </ItemGroup>\r
 </Project>\r
index 2f233e1..a153920 100644 (file)
@@ -53,7 +53,7 @@ SDKROOT=`cygpath -m -s "$SDKROOT"`
 SDKROOT=`cygpath -u "$SDKROOT"`
 export SDKROOT
 
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32/WebCore"
+export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${4}/WebCore"
 
 mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
 cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
index 0ed1aed..1383225 100644 (file)
@@ -13,7 +13,7 @@ mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\yarr"
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCoreTestSupport"
 
 xcopy /y /d "%ProjectDir%..\config.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
-xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj32\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
+xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\Modules\filesystem\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\Modules\geolocation\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\Modules\mediasource\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
index 923b397..301d1eb 100644 (file)
@@ -1,6 +1,6 @@
-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\inspector"
-xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\inspector\front-end\*" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\inspector"
-xcopy /y /d /s /exclude:xcopy.excludes "%CONFIGURATIONBUILDDIR%\obj32\WebCore\DerivedSources\InspectorBackendCommands.js" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\inspector"
-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\en.lproj"
-xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\localizedStrings.js" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\en.lproj"
-xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\Localizable.strings" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\en.lproj"
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\inspector"
+xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\inspector\front-end\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\inspector"
+xcopy /y /d /s /exclude:xcopy.excludes "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\DerivedSources\InspectorBackendCommands.js" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\inspector"
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj"
+xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\localizedStrings.js" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj"
+xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\Localizable.strings" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj"
index 8f333c4..fa109b2 100644 (file)
@@ -1,3 +1,16 @@
+2013-08-23  Alex Christensen  <achristensen@apple.com>
+
+        Re-separating Win32 and Win64 builds.
+        https://bugs.webkit.org/show_bug.cgi?id=120178
+
+        Reviewed by Brent Fulgham.
+
+        * WebKit.vcxproj/WebKit/WebKitPostBuild.cmd:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd:
+        Use PlatformArchitecture to determine correct object directory (obj32 or obj64).
+
 2013-08-21  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r154416.
index 08cf9cf..c460445 100644 (file)
@@ -11,7 +11,7 @@ xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npruntime.h" "%CONFIGURATIO
 xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npruntime_internal.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
 xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\nptypes.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
 
-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources"
-xcopy /y /d "%PROJECTDIR%..\..\WebKit.resources\*" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources"
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources"
+xcopy /y /d "%PROJECTDIR%..\..\WebKit.resources\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources"
 
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
index e56bb81..9fc7296 100644 (file)
@@ -2,7 +2,7 @@
 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
 cmd /c
 
-set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj32/WebKitExportGenerator
+set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj%PlatformArchitecture%/WebKitExportGenerator
 
 echo Generating export definitions
 del /F /Q "%GeneratorDirectory%/DerivedSources/WebKitExportGenerator.cpp"
index b27a14a..0e9c9a6 100644 (file)
@@ -1,4 +1,4 @@
-set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj32\WebKitExportGenerator
+set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKitExportGenerator
 echo Exporting link definition output (%GeneratorDirectory%\WebKitExports.def)
 if exist "%OUTDIR%\WebKitExportGenerator%DEBUGSUFFIX%.exe" "%OUTDIR%\WebKitExportGenerator%DEBUGSUFFIX%.exe" > "%GeneratorDirectory%\WebKitExports.def"
 
index 661e9dd..6c3a108 100644 (file)
@@ -2,7 +2,7 @@
 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
 
 echo Preparing generator output directory...
-set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj32/WebKitExportGenerator
+set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj%PlatformArchitecture%/WebKitExportGenerator
 mkdir "%GeneratorDirectory%" 2>NUL
 mkdir "%GeneratorDirectory%\DerivedSources" 2>NUL
 
index c80a766..2409dee 100644 (file)
@@ -1,3 +1,15 @@
+2013-08-23  Alex Christensen  <achristensen@apple.com>
+
+        Re-separating Win32 and Win64 builds.
+        https://bugs.webkit.org/show_bug.cgi?id=120178
+
+        Reviewed by Brent Fulgham.
+
+        * win/tools/vsprops/common.props:
+        Export PlatformArchitecture to be used by make and cmd scripts.
+        Use PlatformArchitecture to determine correct build directory
+        (lib32/bin32/obj32 or lib64/bin64/obj64).
+
 2013-08-22  Filip Pizlo  <fpizlo@apple.com>
 
         Update LLVM binary drops and scripts to the latest version from SVN
index 2423d52..bb16ec3 100644 (file)
@@ -7,8 +7,8 @@
   </PropertyGroup>\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
-    <OutDir>$(ConfigurationBuildDir)\bin32\</OutDir>\r
-    <IntDir>$(ConfigurationBuildDir)\obj32\$(ProjectName)\</IntDir>\r
+    <OutDir>$(ConfigurationBuildDir)\bin$(PlatformArchitecture)\</OutDir>\r
+    <IntDir>$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
     <NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash\r
 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%\r
@@ -24,6 +24,7 @@ set PATH=$(VSInstallDir)\VC\bin;%PATH%
 \r
 REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here\r
 set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)\r
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>\r
     <TargetName>$(ProjectName)$(DebugSuffix)</TargetName>\r
   </PropertyGroup>\r
@@ -72,6 +73,7 @@ set INPUTFILENAME=$(InputFileName)
 set INPUTPATH=$(InputPath)\r
 set INTDIR=$(IntDir)\r
 set OUTDIR=$(OutDir)\r
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 set PLATFORMNAME=$(PlatformName)\r
 set PROJECTDIR=$(ProjectDir)\r
 set PROJECTFILENAME=$(ProjectFileName)\r
@@ -107,6 +109,7 @@ set INPUTFILENAME=$(InputFileName)
 set INPUTPATH=$(InputPath)\r
 set INTDIR=$(IntDir)\r
 set OUTDIR=$(OutDir)\r
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 set PLATFORMNAME=$(PlatformName)\r
 set PROJECTDIR=$(ProjectDir)\r
 set PROJECTFILENAME=$(ProjectFileName)\r
@@ -142,6 +145,7 @@ set INPUTFILENAME=$(InputFileName)
 set INPUTPATH=$(InputPath)\r
 set INTDIR=$(IntDir)\r
 set OUTDIR=$(OutDir)\r
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 set PLATFORMNAME=$(PlatformName)\r
 set PROJECTDIR=$(ProjectDir)\r
 set PROJECTFILENAME=$(ProjectFileName)\r
@@ -172,7 +176,7 @@ cmd /c
     </ResourceCompile>\r
     <BuildLog />\r
     <Link>\r
-      <AdditionalLibraryDirectories>$(IntDir)lib32;$(ConfigurationBuildDir)\lib32;$(WEBKIT_LIBRARIES)\lib32</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>$(IntDir)lib$(PlatformArchitecture);$(ConfigurationBuildDir)\lib$(PlatformArchitecture);$(WEBKIT_LIBRARIES)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>\r
       <LinkErrorReporting>PromptImmediately</LinkErrorReporting>\r
       <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>\r
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>\r
@@ -195,7 +199,7 @@ cmd /c
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <CLRThreadAttribute>DefaultThreadingAttribute</CLRThreadAttribute>\r
-      <ImportLibrary>$(ConfigurationBuildDir)\lib32\$(TargetName).lib</ImportLibrary>\r
+      <ImportLibrary>$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\$(TargetName).lib</ImportLibrary>\r
     </Link>\r
     <Bscmake />\r
     <Xdcmake />\r
@@ -218,5 +222,9 @@ cmd /c
       <Value>$(DEBUGSUFFIX)</Value>\r
       <EnvironmentVariable>true</EnvironmentVariable>\r
     </BuildMacro>\r
+    <BuildMacro Include="PLATFORMARCHITECTURE">\r
+      <Value>$(PLATFORMARCHITECTURE)</Value>\r
+      <EnvironmentVariable>true</EnvironmentVariable>\r
+    </BuildMacro>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file