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

[Jeff Cohen]

Changes in directory llvm/win32/Configure:

Configure.vcproj updated: 1.3 -> 1.4
---
Log message:

Visual Studio project Configure should place the configured header files
in the win32 subtree instead of the src subtree.

---
Diffs of the changes:  (+12 -10)

Index: llvm/win32/Configure/Configure.vcproj
diff -u llvm/win32/Configure/Configure.vcproj:1.3 llvm/win32/Configure/Configure.vcproj:1.4
--- llvm/win32/Configure/Configure.vcproj:1.3	Sat Dec  4 13:14:38 2004
+++ llvm/win32/Configure/Configure.vcproj	Tue Dec 21 00:49:13 2004
@@ -4,6 +4,7 @@
 	Version="7.10"
 	Name="Configure"
 	ProjectGUID="{19514E48-456C-4B9D-8637-F2285476461E}"
+	RootNamespace="Configure"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -72,8 +73,9 @@
 					Name="Configure|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="..\tools\sed <$(InputPath) >$(InputDir)config.h "s/#undef PACKAGE_NAME/#define PACKAGE_NAME \"LLVM (win32 vc7.1)\"/;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 \".lib\"/;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 \"_libs\"/;s/#undef LTDL_SHLIBPATH_VAR/#define LTDL_SHLIBPATH_VAR \"PATH\"/;s/#undef LTDL_SHLIB_EXT/#define LTDL_SHLIB_EXT \".dll\"/;s/#undef LTDL_SYSSEARCHPATH/#define LTDL_SYSSEARCHPATH \"\"/;""
-						Outputs="$(InputDir)config.h"/>
+						CommandLine="..\tools\sed <$(InputPath) >$(ProjectDir)..\llvm\Config\config.h "s/#undef PACKAGE_NAME/#define PACKAGE_NAME \"LLVM (win32 vc7.1)\"/;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 \".lib\"/;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 \"_libs\"/;s/#undef LTDL_SHLIBPATH_VAR/#define LTDL_SHLIBPATH_VAR \"PATH\"/;s/#undef LTDL_SHLIB_EXT/#define LTDL_SHLIB_EXT \".dll\"/;s/#undef LTDL_SYSSEARCHPATH/#define LTDL_SYSSEARCHPATH \"\&qu!
 ot;/;"
+"
+						Outputs="$(ProjectDir)..\llvm\Config\config.h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -82,9 +84,9 @@
 					Name="Configure|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="..\tools\sed <$(InputPath) >$(InputDir)DataTypes.h "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/"
+						CommandLine="..\tools\sed <$(InputPath) >$(ProjectDir)..\llvm\Support\DataTypes.h "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/"
 "
-						Outputs="$(InputDir)DataTypes.h"/>
+						Outputs="$(ProjectDir)..\llvm\Support\DataTypes.h"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -93,9 +95,9 @@
 					Name="Configure|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="..\tools\sed <$(InputPath) >$(InputDir)hash_map "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/"
+						CommandLine="..\tools\sed <$(InputPath) >$(ProjectDir)..\llvm\ADT\hash_map "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/"
 "
-						Outputs="$(InputDir)hash_map"/>
+						Outputs="$(ProjectDir)..\llvm\ADT\hash_map"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -104,9 +106,9 @@
 					Name="Configure|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="..\tools\sed <$(InputPath) >$(InputDir)hash_set "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/"
+						CommandLine="..\tools\sed <$(InputPath) >$(ProjectDir)..\llvm\ADT\hash_set "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/"
 "
-						Outputs="$(InputDir)hash_set"/>
+						Outputs="$(ProjectDir)..\llvm\ADT\hash_set"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -115,9 +117,9 @@
 					Name="Configure|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="..\tools\sed <$(InputPath) >$(InputDir)iterator "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/"
+						CommandLine="..\tools\sed <$(InputPath) >$(ProjectDir)..\llvm\ADT\iterator "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/"
 "
-						Outputs="..\..\include\llvm\ADT\iterator"/>
+						Outputs="$(ProjectDir)..\llvm\ADT\iterator"/>
 				</FileConfiguration>
 			</File>
 		</Filter>