projects / oota-llvm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9d9c19c)
Improve TableGen dependencies
authorJeff Cohen <jeffc@jolt-lang.org>
Sat, 1 Jan 2005 18:17:40 +0000 (18:17 +0000)
committerJeff Cohen <jeffc@jolt-lang.org>
Sat, 1 Jan 2005 18:17:40 +0000 (18:17 +0000)
Move TableGen generated files out of the src tree
Add descriptions to the custom build steps

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

win32/Configure/Configure.vcproj patch | blob | history
win32/TableGen/TableGen.vcproj patch | blob | history
win32/x86/x86.vcproj patch | blob | history

diff --git a/win32/Configure/Configure.vcproj b/win32/Configure/Configure.vcproj
index 08192c298f4ef994ad7b4b5c7e87c18c6a658fad..c0178cbe03a0d7a7ff0c11b21edb56c598bd7a12 100644 (file)
--- a/win32/Configure/Configure.vcproj
+++ b/win32/Configure/Configure.vcproj
@@ -73,6 +73,7 @@
                                        Name="Configure|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
+                                               Description="Generating $(SolutionDir)llvm\Config\config.h"
                                                CommandLine="..\tools\sed &lt;$(InputPath) &gt;$(ProjectDir)..\llvm\Config\config.h &quot;s/#undef PACKAGE_NAME/#define PACKAGE_NAME \&quot;LLVM (win32 vc7.1)\&quot;/;s/#undef PACKAGE_VERSION/#define PACKAGE_VERSION 1.4/;s/#undef HAVE_WINDOWS_H/#define HAVE_WINDOWS_H 1/;s/#undef HAVE_LIMITS_H/#define HAVE_LIMITS_H 1/;s/#undef HAVE_SYS_STAT_H/#define HAVE_SYS_STAT_H 1/;s/#undef HAVE_STDLIB_H/#define HAVE_STDLIB_H 1/;s/#undef HAVE_STDIO_H/#define HAVE_STDIO_H 1/;s/#undef HAVE_STRING_H/#define HAVE_STRING_H 1/;s/#undef SHLIBEXT/#define SHLIBEXT \&quot;.lib\&quot;/;s/#undef error_t/#define error_t int/;s/#undef HAVE_ERRNO_H/#define HAVE_ERRNO_H 1/;s/#undef LTDL_DLOPEN_DEPLIBS/#define LTDL_DLOPEN_DEPLIBS 1/;s/#undef LTDL_OBJDIR/#define LTDL_OBJDIR \&quot;_libs\&quot;/;s/#undef LTDL_SHLIBPATH_VAR/#define LTDL_SHLIBPATH_VAR \&quot;PATH\&quot;/;s/#undef LTDL_SHLIB_EXT/#define LTDL_SHLIB_EXT \&quot;.dll\&quot;/;s/#undef LTDL_SYSSEARCHPATH/#define LTDL_SYSSEARCHPATH \&quot;\&quot;/;s/#undef LLVM_ON_WIN32/#define LLVM_ON_WIN32 1/;&quot;
 "
                                                Outputs="$(ProjectDir)..\llvm\Config\config.h"/>
@@ -84,6 +85,7 @@
                                        Name="Configure|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
+                                               Description="Generating $(SolutionDir)llvm\Support\DataTypes.h"
                                                CommandLine="..\tools\sed &lt;$(InputPath) &gt;$(ProjectDir)..\llvm\Support\DataTypes.h &quot;s/#undef HAVE_SYS_TYPES_H/#define HAVE_SYS_TYPES_H 1/;s/#undef HAVE_INTTYPES_H/#define HAVE_INTTYPES_H 1/;s/#undef HAVE_STDINT_H/#define HAVE_STD_INT_H 1/&quot;
 "
                                                Outputs="$(ProjectDir)..\llvm\Support\DataTypes.h"/>
@@ -95,6 +97,7 @@
                                        Name="Configure|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
+                                               Description="Generating $(SolutionDir)llvm\ADT\hash_map"
                                                CommandLine="..\tools\sed &lt;$(InputPath) &gt;$(ProjectDir)..\llvm\ADT\hash_map &quot;s/#undef HAVE_GLOBAL_HASH_MAP/#define HAVE_GLOBAL_HASH_MAP 1/;/using HASH_NAMESPACE\:\:hash;.*$/{D};/#include.*HashExtras.*$/{D};s/define HASH_NAMESPACE std/define HASH_NAMESPACE stdext/&quot;
 "
                                                Outputs="$(ProjectDir)..\llvm\ADT\hash_map"/>
@@ -106,6 +109,7 @@
                                        Name="Configure|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
+                                               Description="Generating $(SolutionDir)llvm\ADT\hash_set"
                                                CommandLine="..\tools\sed &lt;$(InputPath) &gt;$(ProjectDir)..\llvm\ADT\hash_set &quot;s/#undef HAVE_GLOBAL_HASH_SET/#define HAVE_GLOBAL_HASH_SET 1/;/using HASH_NAMESPACE\:\:hash;.*$/{D};/#include.*HashExtras.*$/{D};s/define HASH_NAMESPACE std/define HASH_NAMESPACE stdext/&quot;
 "
                                                Outputs="$(ProjectDir)..\llvm\ADT\hash_set"/>
@@ -117,6 +121,7 @@
                                        Name="Configure|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
+                                               Description="Generating $(SolutionDir)llvm\ADT\iterator"
                                                CommandLine="..\tools\sed &lt;$(InputPath) &gt;$(ProjectDir)..\llvm\ADT\iterator &quot;s/#undef HAVE_BI_ITERATOR/#define HAVE_BI_ITERATOR 0/;s/#undef HAVE_STD_ITERATOR/#define HAVE_STD_ITERATOR 1/;s/#undef HAVE_FWD_ITERATOR/#define HAVE_FWD_ITERATOR 0/&quot;
 "
                                                Outputs="$(ProjectDir)..\llvm\ADT\iterator"/>
diff --git a/win32/TableGen/TableGen.vcproj b/win32/TableGen/TableGen.vcproj
index dae397dbf4ee4e5f00030d9dafe46d15c37aaaf8..395d1b0f02edf3a28ff3f32bf91b875617422bb9 100644 (file)
--- a/win32/TableGen/TableGen.vcproj
+++ b/win32/TableGen/TableGen.vcproj
@@ -46,8 +46,7 @@
                        <Tool
                                Name="VCMIDLTool"/>
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="copy $(OutDir)\TableGen.exe ..\tools"/>
+                               Name="VCPostBuildEventTool"/>
                        <Tool
                                Name="VCPreBuildEventTool"/>
                        <Tool
@@ -98,8 +97,7 @@
                        <Tool
                                Name="VCMIDLTool"/>
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="copy $(OutDir)\TableGen.exe ..\tools"/>
+                               Name="VCPostBuildEventTool"/>
                        <Tool
                                Name="VCPreBuildEventTool"/>
                        <Tool
@@ -140,6 +138,7 @@
                                        Name="Debug|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
+                                               Description="Performing flex"
                                                CommandLine="..\tools\flex -t &gt;$(InputDir)$(InputName).cpp $(InputPath)
 "
                                                Outputs="$(InputDir)$(InputName).cpp"/>
@@ -148,6 +147,7 @@
                                        Name="Release|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
+                                               Description="Performing flex"
                                                CommandLine="..\tools\flex -t &gt;$(InputDir)$(InputName).cpp $(InputPath)
 "
                                                Outputs="$(InputDir)$(InputName).cpp"/>
@@ -159,8 +159,9 @@
                                        Name="Debug|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
+                                               Description="Performing bison"
                                                CommandLine="..\tools\bison -pFile -tdo$(InputDir)$(InputName).cpp $(InputPath)
-copy $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
+move $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
 "
                                                Outputs="$(InputDir)$(InputName).cpp;$(InputDir)$(InputName).h"/>
                                </FileConfiguration>
@@ -168,8 +169,9 @@ copy $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
                                        Name="Release|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
+                                               Description="Performing bison"
                                                CommandLine="..\tools\bison -pFile -tdo$(InputDir)$(InputName).cpp $(InputPath)
-copy $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
+move $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
 "
                                                Outputs="$(InputDir)$(InputName).cpp;$(InputDir)$(InputName).h"/>
                                </FileConfiguration>
diff --git a/win32/x86/x86.vcproj b/win32/x86/x86.vcproj
index 41f807621fa050e5078f0132cb354c1d4caa61c4..65a2974dbe86ceb6b68002621b244a34c236d965 100644 (file)
--- a/win32/x86/x86.vcproj
+++ b/win32/x86/x86.vcproj
@@ -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
@@ -124,6 +107,39 @@
                        Name="Source Files"
                        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>
@@ -159,6 +175,9 @@
                        Name="Header Files"
                        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>
@@ -168,16 +187,47 @@
                        <File
                                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>
C/C++ LLVM-based compilers that forbids OOTA behaviors