[llvm-commits] [vector_llvm] CVS: llvm/win32/TableGen/.cvsignore TableGen.vcproj

[Robert Bocchino]

Changes in directory llvm/win32/TableGen:

.cvsignore added (r1.1.4.2)
TableGen.vcproj updated: 1.14 -> 1.14.2.1
---
Log message:

Merged mainline into Vector LLVM branch


---
Diffs of the changes:  (+23 -25)

 .cvsignore      |    4 ++++
 TableGen.vcproj |   44 +++++++++++++++++++-------------------------
 2 files changed, 23 insertions(+), 25 deletions(-)


Index: llvm/win32/TableGen/.cvsignore
diff -c /dev/null llvm/win32/TableGen/.cvsignore:1.1.4.2
*** /dev/null	Wed Nov 16 12:34:03 2005
--- llvm/win32/TableGen/.cvsignore	Wed Nov 16 12:33:53 2005
***************
*** 0 ****
--- 1,4 ----
+ FileLexer.cpp
+ FileParser.cpp
+ FileParser.h
+ FileParser.output


Index: llvm/win32/TableGen/TableGen.vcproj
diff -u llvm/win32/TableGen/TableGen.vcproj:1.14 llvm/win32/TableGen/TableGen.vcproj:1.14.2.1
--- llvm/win32/TableGen/TableGen.vcproj:1.14	Fri Sep  9 21:00:02 2005
+++ llvm/win32/TableGen/TableGen.vcproj	Wed Nov 16 12:33:53 2005
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;.."
+				AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\include;.."
+				AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
 				RuntimeLibrary="2"
 				ForceConformanceInForLoopScope="TRUE"
@@ -142,18 +142,16 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Flexing $(InputFileName)"
-						CommandLine="..\tools\flex -t >$(InputDir)$(InputName).cpp $(InputPath)
-"
-						Outputs="$(InputDir)$(InputName).cpp"/>
+						CommandLine="..\doflex.cmd debug $(InputName) $(InputPath)"
+						Outputs="$(InputName).cpp"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Flexing $(InputFileName)"
-						CommandLine="..\tools\flex -t >$(InputDir)$(InputName).cpp $(InputPath)
-"
-						Outputs="$(InputDir)$(InputName).cpp"/>
+						CommandLine="..\doflex.cmd release $(InputName) $(InputPath)"
+						Outputs="$(InputName).cpp"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -163,35 +161,31 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Bisoning $(InputFileName)"
-						CommandLine="..\tools\bison -pFile -tvdo$(InputDir)$(InputName).cpp $(InputPath)
-move $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
-"
-						Outputs="$(InputDir)$(InputName).cpp;$(InputDir)$(InputName).h"/>
+						CommandLine="..\dobison.cmd File debug $(InputName) $(InputPath)"
+						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Bisoning $(InputFileName)"
-						CommandLine="..\tools\bison -pFile -vdo$(InputDir)$(InputName).cpp $(InputPath)
-move $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
-"
-						Outputs="$(InputDir)$(InputName).cpp;$(InputDir)$(InputName).h"/>
+						CommandLine="..\dobison.cmd File release $(InputName) $(InputPath)"
+						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\utils\TableGen\InstrInfoEmitter.cpp">
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\InstrSelectorEmitter.cpp">
-			</File>
-			<File
 				RelativePath="..\..\utils\TableGen\Record.cpp">
 			</File>
 			<File
 				RelativePath="..\..\utils\TableGen\RegisterInfoEmitter.cpp">
 			</File>
 			<File
+				RelativePath="..\..\utils\TableGen\SubtargetEmitter.cpp">
+			</File>
+			<File
 				RelativePath="..\..\utils\TableGen\TableGen.cpp">
 			</File>
 			<File
@@ -224,15 +218,15 @@
 				RelativePath="..\..\utils\TableGen\InstrInfoEmitter.h">
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\InstrSelectorEmitter.h">
-			</File>
-			<File
 				RelativePath="..\..\utils\TableGen\Record.h">
 			</File>
 			<File
 				RelativePath="..\..\utils\TableGen\RegisterInfoEmitter.h">
 			</File>
 			<File
+				RelativePath="..\..\utils\TableGen\SubtargetEmitter.h">
+			</File>
+			<File
 				RelativePath="..\..\utils\TableGen\TableGenBackend.h">
 			</File>
 		</Filter>
@@ -240,7 +234,7 @@
 			Name="Generated Files"
 			Filter="">
 			<File
-				RelativePath="..\..\utils\TableGen\FileLexer.cpp">
+				RelativePath="FileLexer.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -255,7 +249,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\fileparser.cpp">
+				RelativePath="fileparser.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -270,7 +264,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\fileparser.h">
+				RelativePath="fileparser.h">
 			</File>
 		</Filter>
 	</Files>