Unreviewed, rolling out r154416.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Aug 2013 04:40:14 +0000 (04:40 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Aug 2013 04:40:14 +0000 (04:40 +0000)
http://trac.webkit.org/changeset/154416
https://bugs.webkit.org/show_bug.cgi?id=120147

Broke Windows builds (Requested by rniwa on #webkit).

Source/JavaScriptCore:

* JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make:
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh:
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh:
* JavaScriptCore.vcxproj/build-generated-files.sh:

Source/WebCore:

* WebCore.vcxproj/WebCoreGenerated.make:
* WebCore.vcxproj/WebCoreGeneratedWinCairo.make:
* WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props:
* WebCore.vcxproj/build-generated-files.sh:
* WebCore.vcxproj/copyForwardingHeaders.cmd:
* WebCore.vcxproj/copyWebCoreResourceFiles.cmd:

Source/WebKit:

* WebKit.vcxproj/WebKit/WebKitPostBuild.cmd:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd:

Source/WTF:

* WTF.vcxproj/WTFGenerated.make:
* WTF.vcxproj/build-generated-files.sh:

WebKitLibraries:

* win/tools/vsprops/common.props:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154436 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 3d40122..b841a97 100644 (file)
@@ -1,3 +1,18 @@
+2013-08-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r154416.
+        http://trac.webkit.org/changeset/154416
+        https://bugs.webkit.org/show_bug.cgi?id=120147
+
+        Broke Windows builds (Requested by rniwa on #webkit).
+
+        * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make:
+        * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
+        * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh:
+        * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
+        * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh:
+        * JavaScriptCore.vcxproj/build-generated-files.sh:
+
 2013-08-21  Gavin Barraclough  <barraclough@apple.com>
 
         Clarify var/const/function declaration
index 1a9c970..eabd712 100644 (file)
@@ -1,6 +1,6 @@
 all:
     touch "%ConfigurationBuildDir%\buildfailed"
-    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%"
+    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" 
     copy-files.cmd
 
     -del "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdbool.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdint.h"
index 3715fff..2d361a0 100644 (file)
@@ -1,6 +1,6 @@
 all:
     touch "%ConfigurationBuildDir%\buildfailed"
-    bash build-LLIntAssembly.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
+    bash build-LLIntAssembly.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)"
     -del "%ConfigurationBuildDir%\buildfailed"
 
 clean:
index 7cc956f..e8a3b37 100644 (file)
@@ -16,7 +16,7 @@ XDSTROOT=`cygpath -m -s "$XDSTROOT"`
 XDSTROOT=`cygpath -u "$XDSTROOT"`
 export XDSTROOT
 
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${4}"
+export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32"
 
 cd "${BUILT_PRODUCTS_DIR}/JavaScriptCore/DerivedSources"
 
index c6b8b3b..0e32c27 100644 (file)
@@ -1,6 +1,6 @@
 all:
     touch "%ConfigurationBuildDir%\buildfailed"
-    bash build-LLIntDesiredOffsets.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%"
+    bash build-LLIntDesiredOffsets.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)"
 
     -del "%ConfigurationBuildDir%\buildfailed"
 
index 2c77150..c3186fd 100644 (file)
@@ -16,7 +16,7 @@ XDSTROOT=`cygpath -m -s "$XDSTROOT"`
 XDSTROOT=`cygpath -u "$XDSTROOT"`
 export XDSTROOT
 
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/JavaScriptCore/DerivedSources"
+export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32/JavaScriptCore/DerivedSources"
 
 ##############################################################################
 # Step 1: Generate LLIntDesiredOffsets.h
index 2d72e8c..e6b7ebb 100644 (file)
@@ -26,7 +26,7 @@ SDKROOT=`cygpath -m -s "$SDKROOT"`
 SDKROOT=`cygpath -u "$SDKROOT"`
 export SDKROOT
 
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${3}/JavaScriptCore"
+export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32/JavaScriptCore"
 
 mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/docs"
 cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
index 504be35..66c7a76 100644 (file)
@@ -1,3 +1,14 @@
+2013-08-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r154416.
+        http://trac.webkit.org/changeset/154416
+        https://bugs.webkit.org/show_bug.cgi?id=120147
+
+        Broke Windows builds (Requested by rniwa on #webkit).
+
+        * WTF.vcxproj/WTFGenerated.make:
+        * WTF.vcxproj/build-generated-files.sh:
+
 2013-08-21  Alex Christensen  <achristensen@apple.com>
 
         <https://webkit.org/b/120137> Separating Win32 and Win64 builds.
index 6e4fa15..81aaeca 100644 (file)
@@ -1,6 +1,6 @@
 all: WTFHeaderDetection.h
     touch "%ConfigurationBuildDir%\buildfailed"
-    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
+    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)"
 !IF "$(OFFICIAL_BUILD)"!="1"
     bash -c "python work-around-vs-dependency-tracking-bugs.py"
 !ENDIF
index a952b8d..9fd40e3 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}/lib${4}/libicuuc${3}.lib")
+UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib32/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 64dd682..aaff8fa 100644 (file)
@@ -1,3 +1,18 @@
+2013-08-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r154416.
+        http://trac.webkit.org/changeset/154416
+        https://bugs.webkit.org/show_bug.cgi?id=120147
+
+        Broke Windows builds (Requested by rniwa on #webkit).
+
+        * WebCore.vcxproj/WebCoreGenerated.make:
+        * WebCore.vcxproj/WebCoreGeneratedWinCairo.make:
+        * WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props:
+        * WebCore.vcxproj/build-generated-files.sh:
+        * WebCore.vcxproj/copyForwardingHeaders.cmd:
+        * WebCore.vcxproj/copyWebCoreResourceFiles.cmd:
+
 2013-08-21  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [EFL] Unreviewed build fix after r154430.
index 027b350..c492030 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 "%PlatformArchitecture%"\r
-       bash migrate-scripts.sh "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
+       bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows\r
+       bash migrate-scripts.sh "%ConfigurationBuildDir%\obj32\WebCore\scripts"\r
        cmd /C copyForwardingHeaders.cmd cg cf\r
        cmd /C copyWebCoreResourceFiles.cmd\r
        \r
 clean:\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%\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%\buildfailed" del "%ConfigurationBuildDir%\buildfailed"\r
index 21f53da..461a7cb 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 "%PlatformArchitecture%"\r
-       bash migrate-scripts.sh "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
+       bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo\r
+       bash migrate-scripts.sh "%ConfigurationBuildDir%\obj\WebCore\scripts"\r
        cmd /C copyForwardingHeaders.cmd cairo curl\r
        cmd /C copyWebCoreResourceFiles.cmd\r
        \r
 clean:\r
-       del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources"\r
-       del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
+       del /s /q "%ConfigurationBuildDir%\obj\WebCore\DerivedSources"\r
+       del /s /q "%ConfigurationBuildDir%\obj\WebCore\scripts"\r
        if exist "%ConfigurationBuildDir%\buildfailed" del "%ConfigurationBuildDir%\buildfailed"\r
index b4d691e..85e97e5 100644 (file)
@@ -6,15 +6,13 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
     <OutDir>$(ConfigurationBuildDir)\bin\</OutDir>\r
-    <IntDir>$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\</IntDir>\r
+    <IntDir>$(ConfigurationBuildDir)\obj\$(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
-set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 nmake /nologo -f $(ProjectName)WinCairo.make</NMakeBuildCommandLine>\r
     <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash\r
 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%\r
-set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 nmake /nologo -f $(ProjectName)WinCairo.make clean\r
 nmake /nologo -f $(ProjectName)WinCairo.make</NMakeReBuildCommandLine>\r
     <NMakeCleanCommandLine>%SystemDrive%\cygwin\bin\which.exe bash\r
@@ -23,7 +21,6 @@ if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
 set PATH=$(VSInstallDir)\VC\bin;%PATH%\r
 \r
 REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here\r
-set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)\r
 nmake /nologo -f $(ProjectName)WinCairo.make clean</NMakeCleanCommandLine>\r
     <TargetName>$(ProjectName)$(DebugSuffix)</TargetName>\r
@@ -219,4 +216,4 @@ cmd /c
       <EnvironmentVariable>true</EnvironmentVariable>\r
     </BuildMacro>\r
   </ItemGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
index a153920..2f233e1 100644 (file)
@@ -53,7 +53,7 @@ SDKROOT=`cygpath -m -s "$SDKROOT"`
 SDKROOT=`cygpath -u "$SDKROOT"`
 export SDKROOT
 
-export BUILT_PRODUCTS_DIR="$XDSTROOT/obj${4}/WebCore"
+export BUILT_PRODUCTS_DIR="$XDSTROOT/obj32/WebCore"
 
 mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
 cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
index 1383225..0ed1aed 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%\obj%PlatformArchitecture%\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
+xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj32\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 301d1eb..923b397 100644 (file)
@@ -1,6 +1,6 @@
-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"
+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"
index b2664d6..8f333c4 100644 (file)
@@ -1,3 +1,16 @@
+2013-08-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r154416.
+        http://trac.webkit.org/changeset/154416
+        https://bugs.webkit.org/show_bug.cgi?id=120147
+
+        Broke Windows builds (Requested by rniwa on #webkit).
+
+        * WebKit.vcxproj/WebKit/WebKitPostBuild.cmd:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd:
+
 2013-08-21  Alex Christensen  <achristensen@apple.com>
 
         <https://webkit.org/b/120137> Separating Win32 and Win64 builds.
index c460445..08cf9cf 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%\bin%PlatformArchitecture%\WebKit.resources"
-xcopy /y /d "%PROJECTDIR%..\..\WebKit.resources\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources"
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources"
+xcopy /y /d "%PROJECTDIR%..\..\WebKit.resources\*" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources"
 
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
index 9fc7296..e56bb81 100644 (file)
@@ -2,7 +2,7 @@
 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
 cmd /c
 
-set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj%PlatformArchitecture%/WebKitExportGenerator
+set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj32/WebKitExportGenerator
 
 echo Generating export definitions
 del /F /Q "%GeneratorDirectory%/DerivedSources/WebKitExportGenerator.cpp"
index 0e9c9a6..b27a14a 100644 (file)
@@ -1,4 +1,4 @@
-set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKitExportGenerator
+set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj32\WebKitExportGenerator
 echo Exporting link definition output (%GeneratorDirectory%\WebKitExports.def)
 if exist "%OUTDIR%\WebKitExportGenerator%DEBUGSUFFIX%.exe" "%OUTDIR%\WebKitExportGenerator%DEBUGSUFFIX%.exe" > "%GeneratorDirectory%\WebKitExports.def"
 
index 6c3a108..661e9dd 100644 (file)
@@ -2,7 +2,7 @@
 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
 
 echo Preparing generator output directory...
-set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj%PlatformArchitecture%/WebKitExportGenerator
+set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj32/WebKitExportGenerator
 mkdir "%GeneratorDirectory%" 2>NUL
 mkdir "%GeneratorDirectory%\DerivedSources" 2>NUL
 
index 40031a1..15c282d 100644 (file)
@@ -1,3 +1,13 @@
+2013-08-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r154416.
+        http://trac.webkit.org/changeset/154416
+        https://bugs.webkit.org/show_bug.cgi?id=120147
+
+        Broke Windows builds (Requested by rniwa on #webkit).
+
+        * win/tools/vsprops/common.props:
+
 2013-08-21  Alex Christensen  <achristensen@apple.com>
 
         <https://webkit.org/b/120137> Separating Win32 and Win64 builds.
index b5e9ab8..2423d52 100644 (file)
@@ -7,16 +7,14 @@
   </PropertyGroup>\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
-    <OutDir>$(ConfigurationBuildDir)\bin$(PlatformArchitecture)\</OutDir>\r
-    <IntDir>$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\</IntDir>\r
+    <OutDir>$(ConfigurationBuildDir)\bin32\</OutDir>\r
+    <IntDir>$(ConfigurationBuildDir)\obj32\$(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
-set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 nmake /nologo -f $(ProjectName).make</NMakeBuildCommandLine>\r
     <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash\r
 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%\r
-set PLATFORMARCHITECTURE=$(PlatformArchitecture)\r
 nmake /nologo -f $(ProjectName).make clean\r
 nmake /nologo -f $(ProjectName).make</NMakeReBuildCommandLine>\r
     <NMakeCleanCommandLine>%SystemDrive%\cygwin\bin\which.exe bash\r
@@ -26,7 +24,6 @@ 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
@@ -75,7 +72,6 @@ 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
@@ -111,7 +107,6 @@ 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
@@ -147,7 +142,6 @@ 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
@@ -178,7 +172,7 @@ cmd /c
     </ResourceCompile>\r
     <BuildLog />\r
     <Link>\r
-      <AdditionalLibraryDirectories>$(IntDir)lib$(PlatformArchitecture);$(ConfigurationBuildDir)\lib$(PlatformArchitecture);$(WEBKIT_LIBRARIES)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>$(IntDir)lib32;$(ConfigurationBuildDir)\lib32;$(WEBKIT_LIBRARIES)\lib32</AdditionalLibraryDirectories>\r
       <LinkErrorReporting>PromptImmediately</LinkErrorReporting>\r
       <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>\r
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>\r
@@ -201,7 +195,7 @@ cmd /c
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <CLRThreadAttribute>DefaultThreadingAttribute</CLRThreadAttribute>\r
-      <ImportLibrary>$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\$(TargetName).lib</ImportLibrary>\r
+      <ImportLibrary>$(ConfigurationBuildDir)\lib32\$(TargetName).lib</ImportLibrary>\r
     </Link>\r
     <Bscmake />\r
     <Xdcmake />\r