[ros-diffs] [royce] 13017: generate output rules for files under <if>

generate output rules for files under <if>
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h
  _____  

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
---
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-01-13 03:43:10 UTC (rev 13016)
+++
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-01-13 04:13:20 UTC (rev 13017)
@@ -328,7 +328,7 @@

 		{
 			fprintf (
 				fMakefile,
-				"ifeq ($(%s),\"%s\")\n",
+				"ifeq (\"$(%s)\",\"%s\")\n",
 				rIf.property.c_str(),
 				rIf.value.c_str() );
 			GenerateMacros (
@@ -445,14 +445,14 @@
 void
 MingwModuleHandler::GenerateObjectFileTargets ( const Module& module,
                                                 const vector<File*>&
files,
+                                                const vector<If*>& ifs,
                                                 const string& cc,
                                                 const string&
cflagsMacro,
                                                 const string&
nasmflagsMacro ) const
 {
-	if ( files.size () == 0 )
-		return;
+	size_t i;
 
-	for ( size_t i = 0; i < files.size (); i++ )
+	for ( i = 0; i < files.size (); i++ )
 	{
 		string sourceFilename = files[i]->name;
 		string objectFilename = GetObjectFilename (
sourceFilename );
@@ -468,8 +468,9 @@
 		                            cflagsMacro,
 		                            nasmflagsMacro ).c_str () );
 	}
-	
-	fprintf ( fMakefile, "\n" );
+
+	for ( i = 0; i < ifs.size(); i++ )
+		GenerateObjectFileTargets ( module, ifs[i]->files,
ifs[i]->ifs, cc, cflagsMacro, nasmflagsMacro );
 }
 
 void
@@ -478,9 +479,8 @@
                                                 const string&
cflagsMacro,
                                                 const string&
nasmflagsMacro ) const
 {
-	GenerateObjectFileTargets ( module, module.files, cc,
cflagsMacro, nasmflagsMacro );
-	for ( size_t i = 0; i < module.ifs.size(); i++ )
-		GenerateObjectFileTargets ( module,
module.ifs[i]->files, cc, cflagsMacro, nasmflagsMacro );
+	GenerateObjectFileTargets ( module, module.files, module.ifs,
cc, cflagsMacro, nasmflagsMacro );
+	fprintf ( fMakefile, "\n" );
 }
 
 void
@@ -695,6 +695,9 @@
 {
 	string target ( FixupTargetFilename ( module.GetPath () ) );
 	string archiveFilename = GetModuleArchiveFilename ( module );
+
+	GenerateMacrosAndTargetsHost ( module );
+
 	fprintf ( fMakefile, "%s: %s\n",
 	          target.c_str (),
 	          archiveFilename.c_str () );
@@ -702,7 +705,6 @@
 	          "\t${host_gcc} -o %s %s\n\n",
 	          target.c_str (),
 	          archiveFilename.c_str () );
-	GenerateMacrosAndTargetsHost ( module );
 }
 
 static MingwKernelModuleHandler kernelmodule_handler;
@@ -734,6 +736,9 @@
 	string temp_exp = ros_junk + module.name + ".temp.exp";
 	string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk
-Wl,--subsystem,native -Wl,--entry,_NtProcessStartup
-Wl,--image-base,0xC0000000 -Wl,--file-alignment,0x1000
-Wl,--section-alignment,0x1000 -nostartfiles -mdll",
 	                              module.GetBasePath ().c_str () );
+
+	GenerateMacrosAndTargetsTarget ( module );
+
 	fprintf ( fMakefile, "%s: %s %s\n",
 	          target.c_str (),
 	          archiveFilename.c_str (),
@@ -766,8 +771,6 @@
 	fprintf ( fMakefile,
 	          "\t${rm} %s\n\n",
 	          temp_exp.c_str () );
-	
-	GenerateMacrosAndTargetsTarget ( module );
 }
 
 
@@ -831,6 +834,8 @@
 
 	if (module.files.size () > 0)
 	{
+		GenerateMacrosAndTargetsTarget ( module );
+
 		fprintf ( fMakefile, "%s: %s %s\n",
 		          target.c_str (),
 		          archiveFilename.c_str (),
@@ -841,8 +846,6 @@
 		          target.c_str (),
 		          archiveFilename.c_str (),
 		          importLibraryDependencies.c_str () );
-		
-		GenerateMacrosAndTargetsTarget ( module );
 	}
 	else
 	{
@@ -892,6 +895,8 @@
 
 	if (module.files.size () > 0)
 	{
+		GenerateMacrosAndTargetsTarget ( module );
+
 		fprintf ( fMakefile, "%s: %s %s\n",
 		          target.c_str (),
 		          archiveFilename.c_str (),
@@ -902,8 +907,6 @@
 		          target.c_str (),
 		          archiveFilename.c_str (),
 		          importLibraryDependencies.c_str () );
-		
-		GenerateMacrosAndTargetsTarget ( module );
 	}
 	else
 	{
@@ -953,6 +956,8 @@
 
 	if (module.files.size () > 0)
 	{
+		GenerateMacrosAndTargetsTarget ( module );
+
 		fprintf ( fMakefile, "%s: %s %s\n",
 		          target.c_str (),
 		          archiveFilename.c_str (),
@@ -963,8 +968,6 @@
 		          target.c_str (),
 		          archiveFilename.c_str (),
 		          importLibraryDependencies.c_str () );
-		
-		GenerateMacrosAndTargetsTarget ( module );
 	}
 	else
 	{
  _____  

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h
---
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h	2005-01-13 03:43:10 UTC (rev 13016)
+++
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.h	2005-01-13 04:13:20 UTC (rev 13017)
@@ -80,6 +80,7 @@

 	                              const std::string& nasmflagsMacro
) const;
 	void GenerateObjectFileTargets ( const Module& module,
 	                                 const std::vector<File*>&
files,
+	                                 const std::vector<If*>& ifs,
 	                                 const std::string& cc,
 	                                 const std::string& cflagsMacro,
 	                                 const std::string&
nasmflagsMacro ) const;