[ros-diffs] [cwittich] 20690: don't use VCToolsFile anymore because of different include dirs for subprojects

don't use VCToolsFile anymore because of different include dirs for
subprojects
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h
Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
  _____  

Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
--- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp	2006-01-08
00:29:02 UTC (rev 20689)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp	2006-01-08
00:48:28 UTC (rev 20690)
@@ -54,19 +54,19 @@

 void MSVCBackend::Process()
 {
 	string filename_sln ( ProjectNode.name );
-	string filename_rules = "gccasm.rules";
+	//string filename_rules = "gccasm.rules";
 	
 	if ( configuration.VSProjectVersion == "6.00" )
 		filename_sln += ".dsw";
 	else {
 		filename_sln += ".sln";
 
-		m_rulesFile = fopen ( filename_rules.c_str(), "wb" );
-		if ( m_rulesFile )
-		{
-			_generate_rules_file ( m_rulesFile );
-		}
-		fclose ( m_rulesFile );
+		//m_rulesFile = fopen ( filename_rules.c_str(), "wb" );
+		//if ( m_rulesFile )
+		//{
+		//	_generate_rules_file ( m_rulesFile );
+		//}
+		//fclose ( m_rulesFile );
 	}
 
 	printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str()
);
  _____  

Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h
--- trunk/reactos/tools/rbuild/backend/msvc/msvc.h	2006-01-08
00:29:02 UTC (rev 20689)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h	2006-01-08
00:48:28 UTC (rev 20690)
@@ -92,7 +92,7 @@

 		void _generate_sln_header ( FILE* OUT );
 		void _generate_sln_footer ( FILE* OUT );
 		void _generate_sln ( FILE* OUT );
-		void _generate_rules_file ( FILE* OUT );
+		//void _generate_rules_file ( FILE* OUT );
 		void _generate_sln_project (
 			FILE* OUT,
 			const Module& module,
  _____  

Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
--- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
2006-01-08 00:29:02 UTC (rev 20689)
+++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
2006-01-08 00:48:28 UTC (rev 20690)
@@ -493,7 +493,7 @@

 				fprintf ( OUT,
"\t\t\t\t</FileConfiguration>\r\n" );
 			}
 
-			if (configuration.VSProjectVersion < "8.00") {
+			//if (configuration.VSProjectVersion < "8.00") {
 				if ((source_file.find(".idl") !=
string::npos) || ((source_file.find(".asm") != string::npos ||
tolower(source_file.at(source_file.size() - 1)) == 's')))
 				{
 					fprintf ( OUT,
"\t\t\t\t<FileConfiguration\r\n" );
@@ -514,7 +514,7 @@
 					}
 					fprintf ( OUT,
"\t\t\t\t</FileConfiguration>\r\n" );
 				}
-			}
+			//}
 		}
 		fprintf ( OUT, "\t\t\t</File>\r\n" );
 	}
@@ -588,29 +588,29 @@
 }
 
 
-void
-MSVCBackend::_generate_rules_file ( FILE* OUT )
-{
-	fprintf ( OUT, "<?xml version=\"1.0\"
encoding=\"utf-8\"?>\r\n"
);
-	fprintf ( OUT, "<VisualStudioToolFile\r\n" );
-	fprintf ( OUT, "\tName=\"GCC Assembler\"\r\n" );
-	fprintf ( OUT, "\tVersion=\"%s\"\r\n",
_get_solution_verion().c_str() );
-	fprintf ( OUT, "\t>\r\n" );
-	fprintf ( OUT, "\t<Rules>\r\n" );
-	fprintf ( OUT, "\t\t<CustomBuildRule\r\n" );
-	fprintf ( OUT, "\t\t\tName=\"Assembler\"\r\n" );
-	fprintf ( OUT, "\t\t\tDisplayName=\"Assembler Files\"\r\n" );
-	fprintf ( OUT, "\t\t\tCommandLine=\"cl /E
&quot;$(InputPath)&quot; | as -o
&quot;$(OutDir)\\$(InputName).obj&quot;\"\r\n" );
-	fprintf ( OUT,
"\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"\r\n" );	
-	fprintf ( OUT, "\t\t\tFileExtensions=\"*.S\"\r\n" );
-	fprintf ( OUT, "\t\t\tExecutionDescription=\"asm\"\r\n" );
-	fprintf ( OUT, "\t\t\t>\r\n" );
-	fprintf ( OUT, "\t\t\t<Properties>\r\n" );
-	fprintf ( OUT, "\t\t\t</Properties>\r\n" );
-	fprintf ( OUT, "\t\t</CustomBuildRule>\r\n" );
-	fprintf ( OUT, "\t</Rules>\r\n" );
-	fprintf ( OUT, "</VisualStudioToolFile>\r\n" );
-}
+//void
+//MSVCBackend::_generate_rules_file ( FILE* OUT )
+//{
+//	fprintf ( OUT, "<?xml version=\"1.0\"
encoding=\"utf-8\"?>\r\n"
);
+//	fprintf ( OUT, "<VisualStudioToolFile\r\n" );
+//	fprintf ( OUT, "\tName=\"GCC Assembler\"\r\n" );
+//	fprintf ( OUT, "\tVersion=\"%s\"\r\n",
_get_solution_verion().c_str() );
+//	fprintf ( OUT, "\t>\r\n" );
+//	fprintf ( OUT, "\t<Rules>\r\n" );
+//	fprintf ( OUT, "\t\t<CustomBuildRule\r\n" );
+//	fprintf ( OUT, "\t\t\tName=\"Assembler\"\r\n" );
+//	fprintf ( OUT, "\t\t\tDisplayName=\"Assembler Files\"\r\n" );
+//	fprintf ( OUT, "\t\t\tCommandLine=\"cl /E
&quot;$(InputPath)&quot; | as -o
&quot;$(OutDir)\\$(InputName).obj&quot;\"\r\n" );
+//	fprintf ( OUT,
"\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"\r\n" );	
+//	fprintf ( OUT, "\t\t\tFileExtensions=\"*.S\"\r\n" );
+//	fprintf ( OUT, "\t\t\tExecutionDescription=\"asm\"\r\n" );
+//	fprintf ( OUT, "\t\t\t>\r\n" );
+//	fprintf ( OUT, "\t\t\t<Properties>\r\n" );
+//	fprintf ( OUT, "\t\t\t</Properties>\r\n" );
+//	fprintf ( OUT, "\t\t</CustomBuildRule>\r\n" );
+//	fprintf ( OUT, "\t</Rules>\r\n" );
+//	fprintf ( OUT, "</VisualStudioToolFile>\r\n" );
+//}
 
 void
 MSVCBackend::_generate_sln_header ( FILE* OUT )