[llvm-commits] CVS: llvm/win32/x86/x86.vcproj

Jeff Cohen jeffc at jolt-lang.org
Sat Jan 1 10:17:51 PST 2005



Changes in directory llvm/win32/x86:

x86.vcproj updated: 1.7 -> 1.8
---
Log message:

Improve TableGen dependencies
Move TableGen generated files out of the src tree
Add descriptions to the custom build steps

---
Diffs of the changes:  (+72 -22)

Index: llvm/win32/x86/x86.vcproj
diff -u llvm/win32/x86/x86.vcproj:1.7 llvm/win32/x86/x86.vcproj:1.8
--- llvm/win32/x86/x86.vcproj:1.7	Sat Dec 18 20:29:00 2004
+++ llvm/win32/x86/x86.vcproj	Sat Jan  1 12:17:40 2005
@@ -4,6 +4,7 @@
 	Version="7.10"
 	Name="x86"
 	ProjectGUID="{144EEBF6-8C9B-4473-B715-2C821666AF6C}"
+	RootNamespace="x86"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -19,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\tablegen_includes;..\..\include;.."
+				AdditionalIncludeDirectories=".;..\..\include;.."
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -42,16 +43,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="mkdir ..\..\tablegen_includes
-..\tools\TableGen.exe -gen-register-enums -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenRegisterNames.inc
-..\tools\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenRegisterInfo.h.inc
-..\tools\TableGen.exe -gen-register-desc -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenRegisterInfo.inc
-..\tools\TableGen.exe -gen-instr-enums -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenInstrNames.inc
-..\tools\TableGen.exe -gen-instr-desc -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenInstrInfo.inc
-..\tools\TableGen.exe -gen-asm-writer -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenAsmWriter.inc
-..\tools\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenAsmWriter1.inc
-"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -73,7 +65,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\tablegen_includes;..\..\include;.."
+				AdditionalIncludeDirectories=".;..\..\include;.."
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
 				RuntimeLibrary="2"
 				ForceConformanceInForLoopScope="TRUE"
@@ -93,16 +85,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="mkdir ..\..\tablegen_includes
-..\tools\TableGen.exe -gen-register-enums -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenRegisterNames.inc
-..\tools\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenRegisterInfo.h.inc
-..\tools\TableGen.exe -gen-register-desc -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenRegisterInfo.inc
-..\tools\TableGen.exe -gen-instr-enums -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenInstrNames.inc
-..\tools\TableGen.exe -gen-instr-desc -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenInstrInfo.inc
-..\tools\TableGen.exe -gen-asm-writer -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenAsmWriter.inc
-..\tools\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target\X86 ..\..\lib\Target\X86\X86.td ..\..\lib\Target\X86\X86InstrInfo.td ..\..\lib\Target\X86\X86RegisterInfo.td ..\..\lib\Target\Target.td -o ..\..\tablegen_includes\X86GenAsmWriter1.inc
-"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -125,6 +108,39 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
+				RelativePath="..\..\lib\Target\X86\X86.td">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Performing TableGen Step"
+						CommandLine="..\TableGen\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target\X86 $(InputPath) -o X86GenRegisterNames.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target\X86 $(InputPath) -o X86GenRegisterInfo.h.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target\X86 $(InputPath) -o X86GenRegisterInfo.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target\X86 $(InputPath) -o X86GenInstrNames.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target\X86 $(InputPath) -o X86GenInstrInfo.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target\X86 $(InputPath) -o X86GenAsmWriter.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target\X86 $(InputPath) -o X86GenAsmWriter1.inc"
+						AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)..\Target.td;$(ProjectDir)..\TableGen\$(IntDir)\TableGen.exe"
+						Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Performing TableGen Step"
+						CommandLine="..\TableGen\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target\X86 $(InputPath) -o X86GenRegisterNames.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target\X86 $(InputPath) -o X86GenRegisterInfo.h.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target\X86 $(InputPath) -o X86GenRegisterInfo.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target\X86 $(InputPath) -o X86GenInstrNames.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target\X86 $(InputPath) -o X86GenInstrInfo.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target\X86 $(InputPath) -o X86GenAsmWriter.inc
+..\TableGen\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target\X86 $(InputPath) -o X86GenAsmWriter1.inc"
+						AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)..\Target.td;$(ProjectDir)..\TableGen\$(IntDir)\TableGen.exe"
+						Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc"/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\lib\Target\X86\X86AsmPrinter.cpp">
 			</File>
 			<File
@@ -160,6 +176,9 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 			<File
+				RelativePath="..\..\lib\Target\Target.td">
+			</File>
+			<File
 				RelativePath="..\..\lib\Target\X86\X86.h">
 			</File>
 			<File
@@ -169,15 +188,46 @@
 				RelativePath="..\..\lib\Target\X86\X86InstrInfo.h">
 			</File>
 			<File
+				RelativePath="..\..\lib\Target\X86\X86InstrInfo.td">
+			</File>
+			<File
 				RelativePath="..\..\lib\Target\X86\X86JITInfo.h">
 			</File>
 			<File
 				RelativePath="..\..\lib\Target\X86\X86RegisterInfo.h">
 			</File>
 			<File
+				RelativePath="..\..\lib\Target\X86\X86RegisterInfo.td">
+			</File>
+			<File
 				RelativePath="..\..\lib\Target\X86\X86TargetMachine.h">
 			</File>
 		</Filter>
+		<Filter
+			Name="Generated Tablegen Files"
+			Filter="">
+			<File
+				RelativePath=".\X86GenAsmWriter.inc">
+			</File>
+			<File
+				RelativePath=".\X86GenAsmWriter1.inc">
+			</File>
+			<File
+				RelativePath=".\X86GenInstrInfo.inc">
+			</File>
+			<File
+				RelativePath=".\X86GenInstrNames.inc">
+			</File>
+			<File
+				RelativePath=".\X86GenRegisterInfo.h.inc">
+			</File>
+			<File
+				RelativePath=".\X86GenRegisterInfo.inc">
+			</File>
+			<File
+				RelativePath=".\X86GenRegisterNames.inc">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>






More information about the llvm-commits mailing list