Updates to the VStudio project files:

1. Switch from VStudio 2k3 to VStudio 2k5

2. All pdb files now will be placed as $(OutputDir)/$(ProjectName).pdb.  This puts them alongside the 
binaries with the same base name as the binary.  If you need to copy the results of your llvm build 
into another project's tree, this will simplify that process.

3. Recent files added to the tree were added to the proejects within the VStudio project

4. Project build dependency order fixed so that the build can take place in one pass.  A generated
file was not being built at the correct time, causing a build error in about half the projects until
the build was run a second time.

Note you will need flex and bison installed an in your path in order to build properly.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@40557 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 213 insertions, 104 deletions

diff --git a/win32/TableGen/TableGen.vcproj b/win32/TableGen/TableGen.vcproj
index 407da44..4481a4a 100644
--- a/win32/TableGen/TableGen.vcproj
+++ b/win32/TableGen/TableGen.vcproj
@@ -1,121 +1,185 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="TableGen"
 	ProjectGUID="{339C2249-26B6-4172-B484-85653029AF57}"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\Debug"
 			IntermediateDirectory="Debug"
 			ConfigurationType="1"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
-				StringPooling="TRUE"
-				MinimalRebuild="TRUE"
+				StringPooling="true"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				BrowseInformation="1"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4355,4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\TableGen.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/TableGen.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\Release"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4355,4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\TableGen.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -124,168 +188,213 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath="..\..\utils\TableGen\AsmWriterEmitter.cpp">
+				RelativePath="..\..\utils\TableGen\AsmWriterEmitter.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\CallingConvEmitter.cpp">
+				RelativePath="..\..\utils\TableGen\CallingConvEmitter.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\CodeEmitterGen.cpp">
+				RelativePath="..\..\utils\TableGen\CodeEmitterGen.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\CodeGenTarget.cpp">
+				RelativePath="..\..\utils\TableGen\CodeGenTarget.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\DAGISelEmitter.cpp">
+				RelativePath="..\..\utils\TableGen\DAGISelEmitter.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\FileLexer.l">
+				RelativePath="..\..\utils\TableGen\FileLexer.l"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Flexing $(InputFileName)"
-						CommandLine="..\doflex.cmd debug $(InputName) $(InputPath)
-"
-						Outputs="$(InputName).cpp"/>
+						CommandLine="..\doflex.cmd debug $(InputName) $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(InputName).cpp"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Flexing $(InputFileName)"
-						CommandLine="..\doflex.cmd release $(InputName) $(InputPath)
-"
-						Outputs="$(InputName).cpp"/>
+						CommandLine="..\doflex.cmd release $(InputName) $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(InputName).cpp"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\FileParser.y">
+				RelativePath="..\..\utils\TableGen\FileParser.y"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Bisoning $(InputFileName)"
-						CommandLine="..\dobison.cmd File debug $(InputName) $(InputPath)
-"
-						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"/>
+						CommandLine="..\dobison.cmd File debug $(InputName) $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Bisoning $(InputFileName)"
-						CommandLine="..\dobison.cmd File release $(InputName) $(InputPath)
-"
-						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"/>
+						CommandLine="..\dobison.cmd File release $(InputName) $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\InstrInfoEmitter.cpp">
+				RelativePath="..\..\utils\TableGen\InstrInfoEmitter.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\IntrinsicEmitter.cpp">
+				RelativePath="..\..\utils\TableGen\IntrinsicEmitter.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\Record.cpp">
+				RelativePath="..\..\utils\TableGen\Record.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\RegisterInfoEmitter.cpp">
+				RelativePath="..\..\utils\TableGen\RegisterInfoEmitter.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\SubtargetEmitter.cpp">
+				RelativePath="..\..\utils\TableGen\SubtargetEmitter.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\TableGen.cpp">
+				RelativePath="..\..\utils\TableGen\TableGen.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\TableGenBackend.cpp">
+				RelativePath="..\..\utils\TableGen\TableGenBackend.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath="..\..\utils\TableGen\AsmWriterEmitter.h">
+				RelativePath="..\..\utils\TableGen\AsmWriterEmitter.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\CallingConvEmitter.h">
+				RelativePath="..\..\utils\TableGen\CallingConvEmitter.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\CodeEmitterGen.h">
+				RelativePath="..\..\utils\TableGen\CodeEmitterGen.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\CodeGenInstruction.h">
+				RelativePath="..\..\utils\TableGen\CodeGenInstruction.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\CodeGenIntrinsics.h">
+				RelativePath="..\..\utils\TableGen\CodeGenIntrinsics.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\CodeGenRegisters.h">
+				RelativePath="..\..\utils\TableGen\CodeGenRegisters.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\CodeGenTarget.h">
+				RelativePath="..\..\utils\TableGen\CodeGenTarget.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\DAGISelEmitter.h">
+				RelativePath="..\..\utils\TableGen\DAGISelEmitter.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\InstrInfoEmitter.h">
+				RelativePath="..\..\utils\TableGen\InstrInfoEmitter.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\IntrinsicEmitter.h">
+				RelativePath="..\..\utils\TableGen\IntrinsicEmitter.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\Record.h">
+				RelativePath="..\..\utils\TableGen\Record.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\RegisterInfoEmitter.h">
+				RelativePath="..\..\utils\TableGen\RegisterInfoEmitter.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\SubtargetEmitter.h">
+				RelativePath="..\..\utils\TableGen\SubtargetEmitter.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\TableGenBackend.h">
+				RelativePath="..\..\utils\TableGen\TableGenBackend.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Generated Files"
-			Filter="">
+			>
 			<File
-				RelativePath="FileLexer.cpp">
+				RelativePath="FileLexer.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="YY_SKIP_YYWRAP"/>
+						PreprocessorDefinitions="YY_SKIP_YYWRAP"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="YY_SKIP_YYWRAP"/>
+						PreprocessorDefinitions="YY_SKIP_YYWRAP"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="fileparser.cpp">
+				RelativePath="fileparser.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableSpecificWarnings="4065"/>
+						DisableSpecificWarnings="4065"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableSpecificWarnings="4065"/>
+						DisableSpecificWarnings="4065"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="fileparser.h">
+				RelativePath="fileparser.h"
+				>
 			</File>
 		</Filter>
 	</Files>