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

[Robert Bocchino]

Changes in directory llvm/win32/AsmParser:

.cvsignore added (r1.1.4.2)
AsmParser.vcproj updated: 1.5 -> 1.5.4.1
---
Log message:

Merged mainline into Vector LLVM branch


---
Diffs of the changes:  (+17 -17)

 .cvsignore       |    4 ++++
 AsmParser.vcproj |   30 +++++++++++++-----------------
 2 files changed, 17 insertions(+), 17 deletions(-)


Index: llvm/win32/AsmParser/.cvsignore
diff -c /dev/null llvm/win32/AsmParser/.cvsignore:1.1.4.2
*** /dev/null	Wed Nov 16 12:33:59 2005
--- llvm/win32/AsmParser/.cvsignore	Wed Nov 16 12:33:49 2005
***************
*** 0 ****
--- 1,4 ----
+ Lexer.cpp
+ llvmAsmParser.cpp
+ llvmAsmParser.h
+ llvmAsmParser.output


Index: llvm/win32/AsmParser/AsmParser.vcproj
diff -u llvm/win32/AsmParser/AsmParser.vcproj:1.5 llvm/win32/AsmParser/AsmParser.vcproj:1.5.4.1
--- llvm/win32/AsmParser/AsmParser.vcproj:1.5	Wed Feb  2 00:33:11 2005
+++ llvm/win32/AsmParser/AsmParser.vcproj	Wed Nov 16 12:33:49 2005
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;.."
+				AdditionalIncludeDirectories="..\..\include;..;..\..\lib\AsmParser"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -65,7 +65,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\include;.."
+				AdditionalIncludeDirectories="..\..\include;..;..\..\lib\AsmParser"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
 				RuntimeLibrary="2"
 				ForceConformanceInForLoopScope="TRUE"
@@ -114,16 +114,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
@@ -133,20 +133,16 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Bisoning $(InputFileName)"
-						CommandLine="..\tools\bison -pllvmAsm -tvdo$(InputDir)$(InputName).cpp $(InputPath)
-move $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
-"
-						Outputs="$(InputDir)$(InputName).cpp;$(InputDir)$(InputName).h"/>
+						CommandLine="..\dobison.cmd llvmAsm debug $(InputName) $(InputPath)"
+						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Bisoning $(InputFileName)"
-						CommandLine="..\tools\bison -pllvmAsm -vdo$(InputDir)$(InputName).cpp $(InputPath)
-move $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
-"
-						Outputs="$(InputDir)$(InputName).cpp;$(InputDir)$(InputName).h"/>
+						CommandLine="..\dobison.cmd llvmAsm release $(InputName) $(InputPath)"
+						Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -168,13 +164,13 @@
 			Name="Generated Files"
 			Filter="">
 			<File
-				RelativePath="..\..\lib\AsmParser\Lexer.cpp">
+				RelativePath="Lexer.cpp">
 			</File>
 			<File
-				RelativePath="..\..\lib\AsmParser\llvmAsmParser.cpp">
+				RelativePath="llvmAsmParser.cpp">
 			</File>
 			<File
-				RelativePath="..\..\lib\AsmParser\llvmAsmParser.h">
+				RelativePath="llvmAsmParser.h">
 			</File>
 		</Filter>
 	</Files>