Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.

* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd:
* JavaScriptCore.vcxproj/JavaScriptCorePreLink.cmd:
* JavaScriptCore.vcxproj/jsc/jscPostBuild.cmd:
* JavaScriptCore.vcxproj/jsc/jscPreLink.cmd:
* JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj.filters:
* JavaScriptCore.vcxproj/testRegExp/testRegExpPostBuild.cmd:
* JavaScriptCore.vcxproj/testRegExp/testRegExpPreLink.cmd:
* JavaScriptCore.vcxproj/testapi/testapiPreLink.cmd:
* WTF.vcxproj/build-generated-files.sh:
* win/tools/vsprops/common.props:

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 7708209a3da3cc71e93c05e1741e8d3f6a6f86b5..001e755e2569e1cf4d1b950dd11afd38d7b41931 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2013-04-24  Roger Fong  <roger_fong@apple.com>
+
+        Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.
+
+        * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd:
+        * JavaScriptCore.vcxproj/JavaScriptCorePreLink.cmd:
+        * JavaScriptCore.vcxproj/jsc/jscPostBuild.cmd:
+        * JavaScriptCore.vcxproj/jsc/jscPreLink.cmd:
+        * JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj.filters:
+        * JavaScriptCore.vcxproj/testRegExp/testRegExpPostBuild.cmd:
+        * JavaScriptCore.vcxproj/testRegExp/testRegExpPreLink.cmd:
+        * JavaScriptCore.vcxproj/testapi/testapiPreLink.cmd:
+
 2013-04-24  Geoffrey Garen  <ggaren@apple.com>
 
         32-bit build fix.

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd
index d246265a6c3312e688dfb90565f89b95e26e180e..73d523992f58000d30d858abbf71ce58477f58ae 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd
@@ -1,9 +1,9 @@
 set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj\JavaScriptCoreExportGenerator
 
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin32\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
 
 echo Exporting link definition output (%GeneratorDirectory%\JavaScriptCoreExports.def)
 if exist "%OUTDIR%\JavaScriptCoreExportGenerator%DEBUGSUFFIX%.exe" "%OUTDIR%\JavaScriptCoreExportGenerator%DEBUGSUFFIX%.exe" > "%GeneratorDirectory%\JavaScriptCoreExports.def"

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreLink.cmd b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreLink.cmd
index 08d38192d9d1b635f8d53e4e32980df87a241c70..54e5fa0d2612328ed5f30b795f23cdb715b276c2 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreLink.cmd
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePreLink.cmd
@@ -1,9 +1,9 @@
 mkdir 2>NUL "%IntDir%\lib"
 
-if exist "%WebKit_Libraries%\lib\icuuc.lib" copy /y "%WebKit_Libraries%\lib\icuuc.lib" "%IntDir%\lib\libicuuc.lib"
-if exist "%WebKit_Libraries%\lib\icuin.lib" copy /y "%WebKit_Libraries%\lib\icuin.lib" "%IntDir%\lib\libicuin.lib"
+if exist "%WebKit_Libraries%\lib32\icuuc.lib" copy /y "%WebKit_Libraries%\lib32\icuuc.lib" "%IntDir%\lib\libicuuc.lib"
+if exist "%WebKit_Libraries%\lib32\icuin.lib" copy /y "%WebKit_Libraries%\lib32\icuin.lib" "%IntDir%\lib\libicuin.lib"
 
-if exist "%WebKit_Libraries%\lib\libicuuc.lib" copy /y "%WebKit_Libraries%\lib\libicuuc.lib" "%IntDir%\lib"
-if exist "%WebKit_Libraries%\lib\libicuin.lib" copy /y "%WebKit_Libraries%\lib\libicuin.lib" "%IntDir%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuuc.lib" copy /y "%WebKit_Libraries%\lib32\libicuuc.lib" "%IntDir%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuin.lib" copy /y "%WebKit_Libraries%\lib32\libicuin.lib" "%IntDir%\lib"
 
 cmd /c

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPostBuild.cmd b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPostBuild.cmd
index 8401c98e7653e7956ce03db6fc36f74e16082170..b22c8762cccc82d58a37a87495602b8e3ad0c8b2 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPostBuild.cmd
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPostBuild.cmd
@@ -1,25 +1,25 @@
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
 
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libicuin.dll" xcopy /y /d "%WebKit_Libraries%\bin\libicuin.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuin40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuin40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuuc40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuuc40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuin42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuin42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuuc42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuuc42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\CoreFoundation.dll" xcopy /y /d "%WebKit_Libraries%\bin\CoreFoundation.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\CoreFoundation.resources" xcopy /y /d /e /i "%WebKit_Libraries%\bin\CoreFoundation.resources" "%CONFIGURATIONBUILDDIR%\bin\CoreFoundation.resources"
-if exist "%WebKit_Libraries%\bin\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\objc.dll" xcopy /y /d "%WebKit_Libraries%\bin\objc.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\ASL.dll" xcopy /y /d "%WebKit_Libraries%\bin\ASL.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libdispatch.dll" xcopy /y /d "%WebKit_Libraries%\bin\libdispatch.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libicuin.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuin.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuin40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuin40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuuc40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuuc40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuin42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuin42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuuc42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuuc42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\CoreFoundation.dll" xcopy /y /d "%WebKit_Libraries%\bin32\CoreFoundation.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\CoreFoundation.resources" xcopy /y /d /e /i "%WebKit_Libraries%\bin32\CoreFoundation.resources" "%CONFIGURATIONBUILDDIR%\bin\CoreFoundation.resources"
+if exist "%WebKit_Libraries%\bin32\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin32\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\objc.dll" xcopy /y /d "%WebKit_Libraries%\bin32\objc.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\ASL.dll" xcopy /y /d "%WebKit_Libraries%\bin32\ASL.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libdispatch.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libdispatch.dll" "%CONFIGURATIONBUILDDIR%\bin"
 
 cmd /c

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPreLink.cmd b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPreLink.cmd
index d40b1d4f802d5c5917d3e68db7a349cc73f77d1a..54e5fa0d2612328ed5f30b795f23cdb715b276c2 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPreLink.cmd
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscPreLink.cmd
@@ -1,9 +1,9 @@
-mkdir 2>NUL "%INTDIR%\lib"
+mkdir 2>NUL "%IntDir%\lib"
 
-if exist "%WebKit_Libraries%\lib\icuuc.lib" copy /y "%WebKit_Libraries%\lib\icuuc.lib" "%INTDIR%\lib\libicuuc.lib"
-if exist "%WebKit_Libraries%\lib\icuin.lib" copy /y "%WebKit_Libraries%\lib\icuin.lib" "%INTDIR%\lib\libicuin.lib"
+if exist "%WebKit_Libraries%\lib32\icuuc.lib" copy /y "%WebKit_Libraries%\lib32\icuuc.lib" "%IntDir%\lib\libicuuc.lib"
+if exist "%WebKit_Libraries%\lib32\icuin.lib" copy /y "%WebKit_Libraries%\lib32\icuin.lib" "%IntDir%\lib\libicuin.lib"
 
-if exist "%WebKit_Libraries%\lib\libicuuc.lib" copy /y "%WebKit_Libraries%\lib\libicuuc.lib" "%INTDIR%\lib"
-if exist "%WebKit_Libraries%\lib\libicuin.lib" copy /y "%WebKit_Libraries%\lib\libicuin.lib" "%INTDIR%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuuc.lib" copy /y "%WebKit_Libraries%\lib32\libicuuc.lib" "%IntDir%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuin.lib" copy /y "%WebKit_Libraries%\lib32\libicuin.lib" "%IntDir%\lib"
 
 cmd /c

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj.filters b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj.filters
index 99c178c21f41e72ad4c35d14f72d3fd22da742ce..38e751bf91f6e09bb2bb354aa00b6900ece32bab 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj.filters
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj.filters
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\AtomicString.cpp">\r
+    <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp" />\r
+    <ClCompile Include="..\..\testRegExp.cpp">\r
       <Filter>wtf/text</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringBuilder.cpp">\r
+    <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\StringBuilder.cpp">\r
       <Filter>wtf/text</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringImpl.cpp">\r
+    <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp">\r
       <Filter>wtf/text</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\testRegExp.cpp" />\r
-    <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\WTFString.cpp">\r
+    <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp">\r
       <Filter>wtf/text</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPostBuild.cmd b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPostBuild.cmd
index 8401c98e7653e7956ce03db6fc36f74e16082170..b22c8762cccc82d58a37a87495602b8e3ad0c8b2 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPostBuild.cmd
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPostBuild.cmd
@@ -1,25 +1,25 @@
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
 
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libicuin.dll" xcopy /y /d "%WebKit_Libraries%\bin\libicuin.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuin40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuin40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuuc40.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuuc40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuin42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuin42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\icuuc42.dll" xcopy /y /d "%WebKit_Libraries%\bin\icuuc42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\CoreFoundation.dll" xcopy /y /d "%WebKit_Libraries%\bin\CoreFoundation.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\CoreFoundation.resources" xcopy /y /d /e /i "%WebKit_Libraries%\bin\CoreFoundation.resources" "%CONFIGURATIONBUILDDIR%\bin\CoreFoundation.resources"
-if exist "%WebKit_Libraries%\bin\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\objc.dll" xcopy /y /d "%WebKit_Libraries%\bin\objc.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\ASL.dll" xcopy /y /d "%WebKit_Libraries%\bin\ASL.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WebKit_Libraries%\bin\libdispatch.dll" xcopy /y /d "%WebKit_Libraries%\bin\libdispatch.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt46.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt44.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt44.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libicuin.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuin.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libicuuc.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuuc.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuin40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuin40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuuc40.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuuc40.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icudt42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuin42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuin42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\icuuc42.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icuuc42.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\CoreFoundation.dll" xcopy /y /d "%WebKit_Libraries%\bin32\CoreFoundation.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\CoreFoundation.resources" xcopy /y /d /e /i "%WebKit_Libraries%\bin32\CoreFoundation.resources" "%CONFIGURATIONBUILDDIR%\bin\CoreFoundation.resources"
+if exist "%WebKit_Libraries%\bin32\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin32\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\objc.dll" xcopy /y /d "%WebKit_Libraries%\bin32\objc.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\ASL.dll" xcopy /y /d "%WebKit_Libraries%\bin32\ASL.dll" "%CONFIGURATIONBUILDDIR%\bin"
+if exist "%WebKit_Libraries%\bin32\libdispatch.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libdispatch.dll" "%CONFIGURATIONBUILDDIR%\bin"
 
 cmd /c

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPreLink.cmd b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPreLink.cmd
index d40b1d4f802d5c5917d3e68db7a349cc73f77d1a..54e5fa0d2612328ed5f30b795f23cdb715b276c2 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPreLink.cmd
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpPreLink.cmd
@@ -1,9 +1,9 @@
-mkdir 2>NUL "%INTDIR%\lib"
+mkdir 2>NUL "%IntDir%\lib"
 
-if exist "%WebKit_Libraries%\lib\icuuc.lib" copy /y "%WebKit_Libraries%\lib\icuuc.lib" "%INTDIR%\lib\libicuuc.lib"
-if exist "%WebKit_Libraries%\lib\icuin.lib" copy /y "%WebKit_Libraries%\lib\icuin.lib" "%INTDIR%\lib\libicuin.lib"
+if exist "%WebKit_Libraries%\lib32\icuuc.lib" copy /y "%WebKit_Libraries%\lib32\icuuc.lib" "%IntDir%\lib\libicuuc.lib"
+if exist "%WebKit_Libraries%\lib32\icuin.lib" copy /y "%WebKit_Libraries%\lib32\icuin.lib" "%IntDir%\lib\libicuin.lib"
 
-if exist "%WebKit_Libraries%\lib\libicuuc.lib" copy /y "%WebKit_Libraries%\lib\libicuuc.lib" "%INTDIR%\lib"
-if exist "%WebKit_Libraries%\lib\libicuin.lib" copy /y "%WebKit_Libraries%\lib\libicuin.lib" "%INTDIR%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuuc.lib" copy /y "%WebKit_Libraries%\lib32\libicuuc.lib" "%IntDir%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuin.lib" copy /y "%WebKit_Libraries%\lib32\libicuin.lib" "%IntDir%\lib"
 
 cmd /c

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiPreLink.cmd b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiPreLink.cmd
index 4d6add2ac5e7885aed20ed959b893a2dc7158403..54e5fa0d2612328ed5f30b795f23cdb715b276c2 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiPreLink.cmd
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiPreLink.cmd
@@ -1,9 +1,9 @@
-mkdir 2>NUL "%INTDIR%\lib"
+mkdir 2>NUL "%IntDir%\lib"
 
-if exist "%WEBKITLIBRARIESDIR%\lib\icuuc.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuuc.lib" "%INTDIR%\lib\libicuuc.lib"
-if exist "%WEBKITLIBRARIESDIR%\lib\icuin.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuin.lib" "%INTDIR%\lib\libicuin.lib"
+if exist "%WebKit_Libraries%\lib32\icuuc.lib" copy /y "%WebKit_Libraries%\lib32\icuuc.lib" "%IntDir%\lib\libicuuc.lib"
+if exist "%WebKit_Libraries%\lib32\icuin.lib" copy /y "%WebKit_Libraries%\lib32\icuin.lib" "%IntDir%\lib\libicuin.lib"
 
-if exist "%WEBKITLIBRARIESDIR%\lib\libicuuc.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuuc.lib" "%INTDIR%\lib"
-if exist "%WEBKITLIBRARIESDIR%\lib\libicuin.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuin.lib" "%INTDIR%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuuc.lib" copy /y "%WebKit_Libraries%\lib32\libicuuc.lib" "%IntDir%\lib"
+if exist "%WebKit_Libraries%\lib32\libicuin.lib" copy /y "%WebKit_Libraries%\lib32\libicuin.lib" "%IntDir%\lib"
 
 cmd /c

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 8d008d10922f45081ece482d9705754fd107dbe2..fc4d8b9aeaf6252017cfccb6817e9bf1ab96a49d 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-24  Roger Fong  <roger_fong@apple.com>
+
+        Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.
+
+        * WTF.vcxproj/build-generated-files.sh:
+
 2013-04-24  Benjamin Poulain  <benjamin@webkit.org>
 
         Use post-branch store for RefCountedBase::derefBase

diff --git a/Source/WTF/WTF.vcxproj/build-generated-files.sh b/Source/WTF/WTF.vcxproj/build-generated-files.sh
index 9abcb653321a7d572eb3f9880cf0d9ea68b0ff41..8abda6d7496ab230f33833d1d51a945fb0b33b1b 100644 (file)
--- a/Source/WTF/WTF.vcxproj/build-generated-files.sh
+++ b/Source/WTF/WTF.vcxproj/build-generated-files.sh
@@ -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/libicuuc.lib")
+UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib32/libicuuc.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

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 8902f3480f0995324f9813bdf4f8c59db516971e..899841530258a5168817cf1caa83cfd52d21059e 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-24  Roger Fong  <roger_fong@apple.com>
+
+        Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.
+
+        * win/tools/vsprops/common.props:
+
 2013-04-23  Antoine Quint  <graouts@apple.com>
 
         Initial advance of text runs should be taken into account

diff --git a/WebKitLibraries/win/tools/vsprops/common.props b/WebKitLibraries/win/tools/vsprops/common.props
index 5e35e41cfa178ec881957b0bee7856ab3be0ae25..025dd1de23b18b10c167a4604939f2c551426a2f 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/common.props
+++ b/WebKitLibraries/win/tools/vsprops/common.props
@@ -173,7 +173,7 @@ cmd /c
     </ResourceCompile>\r
     <BuildLog />\r
     <Link>\r
-      <AdditionalLibraryDirectories>$(IntDir)lib;$(ConfigurationBuildDir)\lib;$(WEBKIT_LIBRARIES)\lib</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>$(IntDir)lib;$(ConfigurationBuildDir)\lib;$(WEBKIT_LIBRARIES)\lib32;$(WEBKIT_LIBRARIES)\lib</AdditionalLibraryDirectories>\r
       <LinkErrorReporting>PromptImmediately</LinkErrorReporting>\r
       <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>\r
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>\r