Diff
Modified: branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog (160473 => 160474)
--- branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog 2013-12-12 03:08:17 UTC (rev 160474)
@@ -1,5 +1,25 @@
2013-12-11 Matthew Hanson <[email protected]>
+ Merge r154513
+
+ 2013-08-23 Alex Christensen <[email protected]>
+
+ Re-separating Win32 and Win64 builds.
+ https://bugs.webkit.org/show_bug.cgi?id=120178
+
+ Reviewed by Brent Fulgham.
+
+ * _javascript_Core.vcxproj/_javascript_CoreGenerated.make:
+ * _javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
+ * _javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
+ Pass PlatformArchitecture as a command line parameter to bash scripts.
+ * _javascript_Core.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh:
+ * _javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh:
+ * _javascript_Core.vcxproj/build-generated-files.sh:
+ Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).
+
+2013-12-11 Matthew Hanson <[email protected]>
+
Merge 156934.
2013-10-04 Brent Fulgham <[email protected]>
Modified: branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreGenerated.make (160473 => 160474)
--- branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreGenerated.make 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreGenerated.make 2013-12-12 03:08:17 UTC (rev 160474)
@@ -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\_javascript_Core\stdbool.h" "%ConfigurationBuildDir%\include\private\_javascript_Core\stdint.h"
Modified: branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make (160473 => 160474)
--- branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make 2013-12-12 03:08:17 UTC (rev 160474)
@@ -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:
Modified: branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh (160473 => 160474)
--- branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh 2013-12-12 03:08:17 UTC (rev 160474)
@@ -16,7 +16,7 @@
XDSTROOT=`cygpath -u "$XDSTROOT"`
export XDSTROOT
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32"
+export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${4}"
cd "${BUILT_PRODUCTS_DIR}/_javascript_Core/DerivedSources"
Modified: branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make (160473 => 160474)
--- branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make 2013-12-12 03:08:17 UTC (rev 160474)
@@ -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"
Modified: branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh (160473 => 160474)
--- branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh 2013-12-12 03:08:17 UTC (rev 160474)
@@ -16,7 +16,7 @@
XDSTROOT=`cygpath -u "$XDSTROOT"`
export XDSTROOT
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32/_javascript_Core/DerivedSources"
+export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/_javascript_Core/DerivedSources"
##############################################################################
# Step 1: Generate LLIntDesiredOffsets.h
Modified: branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh (160473 => 160474)
--- branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh 2013-12-12 03:08:17 UTC (rev 160474)
@@ -26,7 +26,7 @@
SDKROOT=`cygpath -u "$SDKROOT"`
export SDKROOT
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32/_javascript_Core"
+export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/_javascript_Core"
mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/docs"
cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
Modified: branches/safari-537.74-branch/Source/WTF/ChangeLog (160473 => 160474)
--- branches/safari-537.74-branch/Source/WTF/ChangeLog 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WTF/ChangeLog 2013-12-12 03:08:17 UTC (rev 160474)
@@ -1,3 +1,19 @@
+2013-12-11 Matthew Hanson <[email protected]>
+
+ Merge r154513
+
+ 2013-08-23 Alex Christensen <[email protected]>
+
+ 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-12-10 Matthew Hanson <[email protected]>
Merge 154333
Modified: branches/safari-537.74-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make (160473 => 160474)
--- branches/safari-537.74-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make 2013-12-12 03:08:17 UTC (rev 160474)
@@ -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
Modified: branches/safari-537.74-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh (160473 => 160474)
--- branches/safari-537.74-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh 2013-12-12 03:08:17 UTC (rev 160474)
@@ -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
Modified: branches/safari-537.74-branch/Source/WebCore/ChangeLog (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-12 03:08:17 UTC (rev 160474)
@@ -1,5 +1,29 @@
2013-12-11 Matthew Hanson <[email protected]>
+ Merge r154513
+
+ 2013-08-23 Alex Christensen <[email protected]>
+
+ 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-12-11 Matthew Hanson <[email protected]>
+
Rollout r160469. Not rolling out from trunk because r160469 was
applied on the branch from a patch file.
Modified: branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make 2013-12-12 03:08:17 UTC (rev 160474)
@@ -3,12 +3,12 @@
if errorlevel 1 exit 1
echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"
- bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows
- bash migrate-scripts.sh "%ConfigurationBuildDir%\obj32\WebCore\scripts"
+ bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows %PlatformArchitecture%
+ bash migrate-scripts.sh "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"
cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyWebCoreResourceFiles.cmd
clean:
- if exist "%ConfigurationBuildDir%\obj32\WebCore\DerivedSources" del /s /q "%ConfigurationBuildDir%\obj32\WebCore\DerivedSources"
- if exist "%ConfigurationBuildDir%\obj32\WebCore\scripts" del /s /q "%ConfigurationBuildDir%\obj32\WebCore\scripts"
+ if exist "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources" del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources"
+ if exist "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts" del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"
if exist "%ConfigurationBuildDir%\buildfailed" del "%ConfigurationBuildDir%\buildfailed"
Modified: branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make 2013-12-12 03:08:17 UTC (rev 160474)
@@ -3,12 +3,12 @@
if errorlevel 1 exit 1
echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"
- bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo
- bash migrate-scripts.sh "%ConfigurationBuildDir%\obj\WebCore\scripts"
+ bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo "%PlatformArchitecture%"
+ bash migrate-scripts.sh "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"
cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyWebCoreResourceFiles.cmd
clean:
- del /s /q "%ConfigurationBuildDir%\obj\WebCore\DerivedSources"
- del /s /q "%ConfigurationBuildDir%\obj\WebCore\scripts"
+ del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources"
+ del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"
if exist "%ConfigurationBuildDir%\buildfailed" del "%ConfigurationBuildDir%\buildfailed"
Modified: branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props 2013-12-12 03:08:17 UTC (rev 160474)
@@ -6,7 +6,7 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir>$(ConfigurationBuildDir)\bin\</OutDir>
- <IntDir>$(ConfigurationBuildDir)\obj\$(ProjectName)\</IntDir>
+ <IntDir>$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
@@ -22,6 +22,7 @@
REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here
set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)
nmake /nologo -f $(ProjectName)WinCairo.make clean</NMakeCleanCommandLine>
<TargetName>$(ProjectName)$(DebugSuffix)</TargetName>
</PropertyGroup>
@@ -71,6 +72,7 @@
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
@@ -107,6 +109,7 @@
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
@@ -143,6 +146,7 @@
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
@@ -215,5 +219,9 @@
<Value>$(CONFIGURATIONBUILDDIR)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
+ <BuildMacro Include="PLATFORMARCHITECTURE">
+ <Value>$(PLATFORMARCHITECTURE)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
</ItemGroup>
</Project>
Modified: branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/build-generated-files.sh (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/build-generated-files.sh 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/build-generated-files.sh 2013-12-12 03:08:17 UTC (rev 160474)
@@ -53,7 +53,7 @@
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"
Modified: branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd 2013-12-12 03:08:17 UTC (rev 160474)
@@ -13,7 +13,7 @@
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"
Modified: branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd 2013-12-12 03:08:17 UTC (rev 160474)
@@ -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"
Modified: branches/safari-537.74-branch/Source/WebKit/ChangeLog (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebKit/ChangeLog 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebKit/ChangeLog 2013-12-12 03:08:17 UTC (rev 160474)
@@ -1,3 +1,20 @@
+2013-12-11 Matthew Hanson <[email protected]>
+
+ Merge r154513
+
+ 2013-08-23 Alex Christensen <[email protected]>
+
+ 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-12-11 Lucas Forschler <[email protected]>
Merge r160118
Modified: branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2013-12-12 03:08:17 UTC (rev 160474)
@@ -11,8 +11,8 @@
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 "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd 2013-12-12 03:08:17 UTC (rev 160474)
@@ -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"
Modified: branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd 2013-12-12 03:08:17 UTC (rev 160474)
@@ -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"
Modified: branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd (160473 => 160474)
--- branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd 2013-12-12 03:08:17 UTC (rev 160474)
@@ -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
Modified: branches/safari-537.74-branch/WebKitLibraries/ChangeLog (160473 => 160474)
--- branches/safari-537.74-branch/WebKitLibraries/ChangeLog 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/WebKitLibraries/ChangeLog 2013-12-12 03:08:17 UTC (rev 160474)
@@ -1,3 +1,19 @@
+2013-12-11 Matthew Hanson <[email protected]>
+
+ Merge r154513
+
+ 2013-08-23 Alex Christensen <[email protected]>
+
+ 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-09-17 Lucas Forschler <[email protected]>
Merge r154390
Modified: branches/safari-537.74-branch/WebKitLibraries/win/tools/vsprops/common.props (160473 => 160474)
--- branches/safari-537.74-branch/WebKitLibraries/win/tools/vsprops/common.props 2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/WebKitLibraries/win/tools/vsprops/common.props 2013-12-12 03:08:17 UTC (rev 160474)
@@ -7,8 +7,8 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir>$(ConfigurationBuildDir)\bin32\</OutDir>
- <IntDir>$(ConfigurationBuildDir)\obj32\$(ProjectName)\</IntDir>
+ <OutDir>$(ConfigurationBuildDir)\bin$(PlatformArchitecture)\</OutDir>
+ <IntDir>$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
@@ -24,6 +24,7 @@
REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here
set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)
nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
<TargetName>$(ProjectName)$(DebugSuffix)</TargetName>
</PropertyGroup>
@@ -72,6 +73,7 @@
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set OUTDIR=$(OutDir)
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
@@ -107,6 +109,7 @@
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set OUTDIR=$(OutDir)
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
@@ -142,6 +145,7 @@
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set OUTDIR=$(OutDir)
+set PLATFORMARCHITECTURE=$(PlatformArchitecture)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
@@ -172,7 +176,7 @@
</ResourceCompile>
<BuildLog />
<Link>
- <AdditionalLibraryDirectories>$(IntDir)lib32;$(ConfigurationBuildDir)\lib32;$(WEBKIT_LIBRARIES)\lib32</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(IntDir)lib$(PlatformArchitecture);$(ConfigurationBuildDir)\lib$(PlatformArchitecture);$(WEBKIT_LIBRARIES)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
<LinkErrorReporting>PromptImmediately</LinkErrorReporting>
<CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -199,7 +203,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<CLRThreadAttribute>DefaultThreadingAttribute</CLRThreadAttribute>
- <ImportLibrary>$(ConfigurationBuildDir)\lib32\$(TargetName).lib</ImportLibrary>
+ <ImportLibrary>$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\$(TargetName).lib</ImportLibrary>
</Link>
<Bscmake />
<Xdcmake />
@@ -222,5 +226,9 @@
<Value>$(DEBUGSUFFIX)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
+ <BuildMacro Include="PLATFORMARCHITECTURE">
+ <Value>$(PLATFORMARCHITECTURE)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
</ItemGroup>
</Project>
\ No newline at end of file
