[webkit-changes] cvs commit:
JavaScriptCore/JavaScriptCore.vcproj/dftables dftables.vcproj
David
hyatt at opensource.apple.com
Thu Dec 29 00:58:51 PST 2005
hyatt 05/12/29 00:58:50
Modified: JavaScriptCore.vcproj JavaScriptCore.sln JavaScriptCore.suo
JavaScriptCore.vcproj/JavaScriptCore JavaScriptCore.vcproj
Added: JavaScriptCore.vcproj/dftables dftables.vcproj
Log:
Improvements to the Visual Studio project files. Have dftables generating chartables.c and have set up separate intermediate/output/derivedsources dirs to match the Mac XCode structure.
Revision Changes Path
1.2 +9 -0 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln
Index: JavaScriptCore.sln
===================================================================
RCS file: /cvs/root/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaScriptCore.sln 26 Dec 2005 23:33:30 -0000 1.1
+++ JavaScriptCore.sln 29 Dec 2005 08:58:50 -0000 1.2
@@ -2,6 +2,11 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}"
+ ProjectSection(ProjectDependencies) = postProject
+ {BC2981C0-67A5-4A3C-879B-784BCBDE2541} = {BC2981C0-67A5-4A3C-879B-784BCBDE2541}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dftables", "dftables\dftables.vcproj", "{BC2981C0-67A5-4A3C-879B-784BCBDE2541}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,6 +18,10 @@
{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32
{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32
{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32
+ {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Debug|Win32.Build.0 = Debug|Win32
+ {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.ActiveCfg = Release|Win32
+ {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
1.2 +16 -18 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.suo
<<Binary file>>
1.2 +132 -8 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
Index: JavaScriptCore.vcproj
===================================================================
RCS file: /cvs/root/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaScriptCore.vcproj 26 Dec 2005 23:33:31 -0000 1.1
+++ JavaScriptCore.vcproj 29 Dec 2005 08:58:50 -0000 1.2
@@ -17,16 +17,20 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(OutputDir)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
ConfigurationType="2"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
+ Description="Constructing chartables.c"
+ CommandLine="mkdir "$(OutputDir)\JavaScriptCore.intermediate"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources"
"$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\dftables.exe" "$(OutputDir)JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\chartables.c""
/>
<Tool
Name="VCCustomBuildTool"
+ Description=""
+ CommandLine=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -40,11 +44,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../;"../../os-win32/";../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JAVASCRIPTCORE_EXPORTS"
+ AdditionalIncludeDirectories=""$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
+ PreprocessorDefinitions="HAVE_CONFIG_H"
MinimalRebuild="true"
+ ExceptionHandling="0"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
@@ -93,17 +99,21 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(OutputDir)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
+ Description="Constructing chartables.c"
+ CommandLine="mkdir "$(OutputDir)\JavaScriptCore.intermediate"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources"
"$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\dftables.exe" "$(OutputDir)JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\chartables.c""
/>
<Tool
Name="VCCustomBuildTool"
+ Description=""
+ CommandLine=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -116,9 +126,11 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../;"../../os-win32/";../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;JAVASCRIPTCORE_EXPORTS"
+ AdditionalIncludeDirectories=""$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
+ PreprocessorDefinitions="HAVE_CONFIG_H"
+ ExceptionHandling="0"
RuntimeLibrary="2"
+ RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
@@ -542,6 +554,118 @@
RelativePath="..\..\kxmlcore\RefPtr.h"
>
</File>
+ <File
+ RelativePath="..\..\kxmlcore\TCPageMap.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\kxmlcore\TCSpinLock.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\kxmlcore\TCSystemAlloc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\kxmlcore\TCSystemAlloc.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="PCRE"
+ >
+ <File
+ RelativePath="..\..\pcre\pcre-config.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_compile.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_config.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_exec.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_fullinfo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_get.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_globals.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_info.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_internal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_maketables.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_ord2utf8.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_printint.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_refcount.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_study.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_tables.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_try_flipped.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_ucp_findchar.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_version.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\pcre_xclass.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\ucp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\ucp_findchar.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\pcre\ucpinternal.h"
+ >
+ </File>
</Filter>
</Files>
<Globals>
1.1 JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj
Index: dftables.vcproj
===================================================================
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="dftables"
ProjectGUID="{BC2981C0-67A5-4A3C-879B-784BCBDE2541}"
RootNamespace="dftables"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
IntermediateDirectory="$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(OutputDir)\$(ConfigurationName)"
IntermediateDirectory="$(OutputDir)\dftables.intermediate\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath="..\..\pcre\dftables.c"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
More information about the webkit-changes
mailing list