Commit 6a26613f authored by roger_fong@apple.com's avatar roger_fong@apple.com

Make Apple Windows VS2010 build results into and get dependencies from __32 suffixed folders.

Make the DebugSuffix configuration use _debug dependencies.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@149220 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f4c8b001
2013-04-26 Roger Fong <roger_fong@apple.com>
Make Apple Windows VS2010 build results into and get dependencies from __32 suffixed folders.
Make the DebugSuffix configuration use _debug dependencies.
* JavaScriptCore.vcxproj/JavaScriptCore.make:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.vcxproj/JavaScriptCoreCF.props:
* JavaScriptCore.vcxproj/JavaScriptCoreCommon.props:
* JavaScriptCore.vcxproj/JavaScriptCoreDebug.props:
* JavaScriptCore.vcxproj/JavaScriptCoreDebugCFLite.props:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj.filters:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorBuildCmd.cmd:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorCommon.props:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorDebug.props:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPreBuild.cmd:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorProduction.props:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorRelease.props:
* JavaScriptCore.vcxproj/JavaScriptCoreGenerated.make:
* JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCoreGeneratedCommon.props:
* JavaScriptCore.vcxproj/JavaScriptCoreGeneratedDebug.props:
* JavaScriptCore.vcxproj/JavaScriptCoreGeneratedProduction.props:
* JavaScriptCore.vcxproj/JavaScriptCoreGeneratedRelease.props:
* JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd:
* JavaScriptCore.vcxproj/JavaScriptCorePreLink.cmd:
* JavaScriptCore.vcxproj/JavaScriptCoreProduction.props:
* JavaScriptCore.vcxproj/JavaScriptCoreRelease.props:
* JavaScriptCore.vcxproj/JavaScriptCoreReleaseCFLite.props:
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj:
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh:
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj:
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh:
* JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj:
* JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorCommon.props:
* JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorDebug.props:
* JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorProduction.props:
* JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorRelease.props:
* JavaScriptCore.vcxproj/build-generated-files.sh:
* JavaScriptCore.vcxproj/copy-files.cmd:
* JavaScriptCore.vcxproj/jsc/jsc.vcxproj:
* JavaScriptCore.vcxproj/jsc/jscCommon.props:
* JavaScriptCore.vcxproj/jsc/jscDebug.props:
* JavaScriptCore.vcxproj/jsc/jscPostBuild.cmd:
* JavaScriptCore.vcxproj/jsc/jscPreLink.cmd:
* JavaScriptCore.vcxproj/jsc/jscProduction.props:
* JavaScriptCore.vcxproj/jsc/jscRelease.props:
* JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj:
* JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj.filters:
* JavaScriptCore.vcxproj/testRegExp/testRegExpCommon.props:
* JavaScriptCore.vcxproj/testRegExp/testRegExpDebug.props:
* JavaScriptCore.vcxproj/testRegExp/testRegExpPostBuild.cmd:
* JavaScriptCore.vcxproj/testRegExp/testRegExpPreLink.cmd:
* JavaScriptCore.vcxproj/testRegExp/testRegExpProduction.props:
* JavaScriptCore.vcxproj/testRegExp/testRegExpRelease.props:
* JavaScriptCore.vcxproj/testapi/testapi.vcxproj:
* JavaScriptCore.vcxproj/testapi/testapiCommon.props:
* JavaScriptCore.vcxproj/testapi/testapiCommonCFLite.props:
* JavaScriptCore.vcxproj/testapi/testapiDebug.props:
* JavaScriptCore.vcxproj/testapi/testapiDebugCFLite.props:
* JavaScriptCore.vcxproj/testapi/testapiPreLink.cmd:
* JavaScriptCore.vcxproj/testapi/testapiProduction.props:
* JavaScriptCore.vcxproj/testapi/testapiRelease.props:
* JavaScriptCore.vcxproj/testapi/testapiReleaseCFLite.props:
2013-04-26 Roger Fong <roger_fong@apple.com>
Disable sub-pixel layout on mac.
......
......@@ -13,16 +13,16 @@ install:
xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
devenv "JavaScriptCore.submit.sln" /clean $(BUILDSTYLE)
devenv "JavaScriptCore.submit.sln" /build $(BUILDSTYLE)
-xcopy "%ConfigurationBuildDir%\bin\JavaScriptCore.dll" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin\JavaScriptCore_debug.dll" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin\JavaScriptCore.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin\JavaScriptCore_debug.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin\jsc.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin\jsc_debug.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin\jsc.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin\jsc_debug.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.dll" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore_debug.dll" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore_debug.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\jsc.exe" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\jsc_debug.exe" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\jsc.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\jsc_debug.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\lib\*" "$(DSTROOT)\AppleInternal\lib\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\bin\JavaScriptCore.resources\*" "$(DSTROOT)\AppleInternal\bin\JavaScriptCore.resources" /e/v/i/h/y
-mkdir "$(DSTROOT)\AppleInternal\Sources\JavaScriptCore"
xcopy "%ConfigurationBuildDir%\obj\JavaScriptCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources\JavaScriptCore" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.resources\*" "$(DSTROOT)\AppleInternal\bin32\JavaScriptCore.resources" /e/v/i/h/y
-mkdir "$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore"
xcopy "%ConfigurationBuildDir%\obj32\JavaScriptCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore" /e/v/i/h/y
......@@ -77,7 +77,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="JavaScriptCoreDebug.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
......@@ -381,23 +381,23 @@
<ClCompile Include="..\yarr\YarrSyntaxChecker.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\ArrayPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\BooleanPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\DatePrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\ErrorPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\HeaderDetection.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSONObject.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\Lexer.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\LLIntAssembly.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\NumberConstructor.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\NumberPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\ObjectConstructor.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\ObjectPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\RegExpConstructor.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\RegExpJitTables.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\RegExpPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\StringConstructor.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\ArrayPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\BooleanPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\DatePrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\ErrorPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\HeaderDetection.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSONObject.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\Lexer.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\LLIntAssembly.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\NumberConstructor.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\NumberPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\ObjectConstructor.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\ObjectPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\RegExpConstructor.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\RegExpJitTables.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\RegExpPrototype.lut.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\StringConstructor.lut.h" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\API\APICast.h" />
......@@ -774,9 +774,6 @@
<ClInclude Include="..\yarr\YarrSyntaxChecker.h" />
</ItemGroup>
<ItemGroup>
<None Include="copy-files.cmd">
<FileType>Document</FileType>
</None>
<None Include="JavaScriptCorePostBuild.cmd">
<FileType>Document</FileType>
</None>
......@@ -790,4 +787,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
\ No newline at end of file
......@@ -1851,86 +1851,85 @@
<Filter>yarr</Filter>
</ClInclude>
<ClInclude Include="..\config.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\ArrayPrototype.lut.h">
<Filter>Derived Sources</Filter>
<ClInclude Include="..\runtime\PrototypeMap.h">
<Filter>runtime</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\BooleanPrototype.lut.h">
<Filter>Derived Sources</Filter>
<ClInclude Include="..\API\JSValue.h">
<Filter>API</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\DatePrototype.lut.h">
<Filter>Derived Sources</Filter>
<ClInclude Include="..\runtime\JSCJSValue.h">
<Filter>runtime</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\ErrorPrototype.lut.h">
<Filter>Derived Sources</Filter>
<ClInclude Include="..\runtime\JSCJSValueInlines.h">
<Filter>runtime</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\HeaderDetection.h">
<Filter>Derived Sources</Filter>
<ClInclude Include="..\bytecode\DataFormat.h">
<Filter>bytecode</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h">
<Filter>Derived Sources</Filter>
<ClInclude Include="..\runtime\StructureRareData.h">
<Filter>runtime</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSONObject.lut.h">
<Filter>Derived Sources</Filter>
<ClInclude Include="..\runtime\StructureRareDataInlines.h">
<Filter>runtime</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\Lexer.lut.h">
<Filter>Derived Sources</Filter>
<ClInclude Include="..\API\JSAPIWrapperObject.h">
<Filter>API</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\LLIntAssembly.h">
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\BooleanPrototype.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\NumberConstructor.lut.h">
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\DatePrototype.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\NumberPrototype.lut.h">
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\ErrorPrototype.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\ObjectConstructor.lut.h">
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\HeaderDetection.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\RegExpConstructor.lut.h">
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\ObjectPrototype.lut.h">
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSONObject.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\RegExpPrototype.lut.h">
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\Lexer.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\StringConstructor.lut.h">
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\NumberConstructor.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\RegExpJitTables.h">
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\ObjectConstructor.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="..\runtime\PrototypeMap.h">
<Filter>runtime</Filter>
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\ObjectPrototype.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="..\API\JSValue.h">
<Filter>API</Filter>
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\RegExpConstructor.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="..\runtime\JSCJSValue.h">
<Filter>runtime</Filter>
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\NumberPrototype.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="..\runtime\JSCJSValueInlines.h">
<Filter>runtime</Filter>
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\LLIntAssembly.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="..\bytecode\DataFormat.h">
<Filter>bytecode</Filter>
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\RegExpJitTables.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="..\runtime\StructureRareData.h">
<Filter>runtime</Filter>
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\RegExpPrototype.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="..\runtime\StructureRareDataInlines.h">
<Filter>runtime</Filter>
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\StringConstructor.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
<ClInclude Include="..\API\JSAPIWrapperObject.h">
<Filter>API</Filter>
<ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\ArrayPrototype.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="JavaScriptCorePreLink.cmd" />
<None Include="JavaScriptCorePostBuild.cmd" />
<None Include="JavaScriptCorePreBuild.cmd" />
<None Include="copy-files.cmd" />
</ItemGroup>
</Project>
</Project>
\ No newline at end of file
......@@ -5,7 +5,7 @@
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>CoreFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>CoreFoundation$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
......
......@@ -5,13 +5,13 @@
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\;..\tools\;..\runtime\;..\llint\;..\jit\;..\disassembler\;..\heap\;..\debugger\;..\assembler\;..\profiler\;..\yarr\;..\interpreter\;..\bytecode\;..\dfg\;..\bytecompiler\;..\parser\;..\API\;$(ConfigurationBuildDir)\obj\JavaScriptCore\DerivedSources\;$(ConfigurationBuildDir)\include\;$(ConfigurationBuildDir)\include\JavaScriptCore\;$(ConfigurationBuildDir)\include\private\;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\;..\tools\;..\runtime\;..\llint\;..\jit\;..\disassembler\;..\heap\;..\debugger\;..\assembler\;..\profiler\;..\yarr\;..\interpreter\;..\bytecode\;..\dfg\;..\bytecompiler\;..\parser\;..\API\;$(ConfigurationBuildDir)\obj32\JavaScriptCore\DerivedSources\;$(ConfigurationBuildDir)\include\;$(ConfigurationBuildDir)\include\JavaScriptCore\;$(ConfigurationBuildDir)\include\private\;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;$(WebKit_Libraries)\include\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STATICALLY_LINKED_WITH_WTF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>ICUVersion.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
<AdditionalDependencies>winmm.lib;libicuin.lib;libicuuc.lib;WTF$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>$(ConfigurationBuildDir)\obj\JavaScriptCoreExportGenerator\JavaScriptCoreExports.def</ModuleDefinitionFile>
<AdditionalDependencies>winmm.lib;libicuin$(DebugSuffix).lib;libicuuc$(DebugSuffix).lib;WTF$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>$(ConfigurationBuildDir)\obj32\JavaScriptCoreExportGenerator\JavaScriptCoreExports.def</ModuleDefinitionFile>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\FeatureDefines.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />
<Import Project="JavaScriptCoreCommon.props" />
<Import Project="JavaScriptCoreCF.props" />
</ImportGroup>
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\FeatureDefinesCairo.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />
<Import Project="JavaScriptCoreCommon.props" />
<Import Project="JavaScriptCoreCFLite.props" />
</ImportGroup>
......
......@@ -76,7 +76,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="JavaScriptCoreExportGeneratorDebug.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
......@@ -125,6 +125,7 @@
</ClCompile>
<Link />
<Link />
<Link />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
<ClCompile>
......@@ -152,7 +153,7 @@
<None Include="make-export-file-generator" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(ConfigurationBuildDir)\obj\JavaScriptCoreExportGenerator\DerivedSources\JavaScriptCoreExportGenerator.cpp" />
<ClCompile Include="$(ConfigurationBuildDir)\obj32\JavaScriptCoreExportGenerator\DerivedSources\JavaScriptCoreExportGenerator.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
......
......@@ -7,7 +7,7 @@
<None Include="make-export-file-generator" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(ConfigurationBuildDir)\obj\JavaScriptCoreExportGenerator\DerivedSources\JavaScriptCoreExportGenerator.cpp" />
<ClCompile Include="$(ConfigurationBuildDir)\obj32\JavaScriptCoreExportGenerator\DerivedSources\JavaScriptCoreExportGenerator.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="JavaScriptCoreExports.def.in" />
......
......@@ -2,7 +2,7 @@
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj/JavaScriptCoreExportGenerator
set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj32/JavaScriptCoreExportGenerator
echo Generating export definitions
del /F /Q "%GeneratorDirectory%/DerivedSources/JavaScriptCorGenerator.cpp"
......
......@@ -6,11 +6,11 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)\..\..;$(ConfigurationBuildDir)\Include\private\JavaScriptCore;$(ConfigurationBuildDir)\Include\;$(ConfigurationBuildDir)\Include\private;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)\..\..;$(ConfigurationBuildDir)\Include\private\JavaScriptCore;$(ConfigurationBuildDir)\Include\;$(ConfigurationBuildDir)\Include\private;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\Include\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>WTF$(DebugSuffix).lib;libicuuc.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>WTF$(DebugSuffix).lib;libicuuc$(DebugSuffix).lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\FeatureDefines.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />
<Import Project="JavaScriptCoreExportGeneratorCommon.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
......
set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj\JavaScriptCoreExportGenerator
set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj32\JavaScriptCoreExportGenerator
mkdir 2>NUL "%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"
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin32"
if exist "%WebKit_Libraries%\bin32\libicuuc%DebugSuffix%.dll" xcopy /y /d "%WebKit_Libraries%\bin32\libicuuc%DebugSuffix%.dll" "%CONFIGURATIONBUILDDIR%\bin32"
if exist "%WebKit_Libraries%\bin32\icudt46%DebugSuffix%.dll" xcopy /y /d "%WebKit_Libraries%\bin32\icudt46%DebugSuffix%.dll" "%CONFIGURATIONBUILDDIR%\bin32"
echo Exporting link definition output (%GeneratorDirectory%\JavaScriptCoreExports.def)
if exist "%OUTDIR%\JavaScriptCoreExportGenerator%DEBUGSUFFIX%.exe" "%OUTDIR%\JavaScriptCoreExportGenerator%DEBUGSUFFIX%.exe" > "%GeneratorDirectory%\JavaScriptCoreExports.def"
......
......@@ -2,7 +2,7 @@
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
echo Preparing generator output directory...
set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj/JavaScriptCoreExportGenerator
set GeneratorDirectory=%CONFIGURATIONBUILDDIR%/obj32/JavaScriptCoreExportGenerator
mkdir "%GeneratorDirectory%" 2>NUL
mkdir "%GeneratorDirectory%\DerivedSources" 2>NUL
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\production.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\FeatureDefines.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />
<Import Project="JavaScriptCoreExportGeneratorCommon.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\FeatureDefines.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />
<Import Project="JavaScriptCoreExportGeneratorCommon.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
......
all:
touch "%ConfigurationBuildDir%\buildfailed"
bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)"
bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)"
copy-files.cmd
-del "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdbool.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdint.h"
......@@ -9,4 +9,4 @@ all:
clean:
-del "%ConfigurationBuildDir%\buildfailed"
copy-files.cmd clean
-del /s /q "%ConfigurationBuildDir%\obj\JavaScriptCore\DerivedSources"
-del /s /q "%ConfigurationBuildDir%\obj32\JavaScriptCore\DerivedSources"
......@@ -75,7 +75,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="JavaScriptCoreGeneratedDebug.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">