[ros-diffs] [npwoods] 20457: Modified rbuild to generate a map file of the boot loader

Modified rbuild to generate a map file of the boot loader
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
  _____  

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
2005-12-30 10:29:07 UTC (rev 20456)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
2005-12-30 13:33:31 UTC (rev 20457)
@@ -1321,7 +1321,7 @@

 }
 
 void
-MingwModuleHandler::GenerateBuildMapCode ()
+MingwModuleHandler::GenerateBuildMapCode ( const char *mapTarget )
 {
 	fprintf ( fMakefile,
 	          "ifeq ($(ROS_BUILDMAP),full)\n" );
@@ -1334,7 +1334,8 @@
 	fprintf ( fMakefile,
 	          "\t$(ECHO_OBJDUMP)\n" );
 	fprintf ( fMakefile,
-	          "\t$(Q)${objdump} -d -S $@ > %s\n",
+	          "\t$(Q)${objdump} -d -S %s > %s\n",
+			  mapTarget ? mapTarget :  "$@",
 	          mapFilename.c_str () );
 
 	fprintf ( fMakefile,
@@ -1345,7 +1346,8 @@
 	fprintf ( fMakefile,
 	          "\t$(ECHO_NM)\n" );
 	fprintf ( fMakefile,
-	          "\t$(Q)${nm} --numeric-sort $@ > %s\n",
+	          "\t$(Q)${nm} --numeric-sort %s > %s\n",
+			  mapTarget ? mapTarget :  "$@",
 	          mapFilename.c_str () );
 
 	fprintf ( fMakefile,
@@ -2672,6 +2674,7 @@
 	fprintf ( fMakefile,
 	          "\t${objcopy} -O binary %s $@\n",
 	          junk_tmp.c_str () );
+	GenerateBuildMapCode ( junk_tmp.c_str() );
 	fprintf ( fMakefile,
 	          "\t-@${rm} %s 2>$(NUL)\n",
 	          junk_tmp.c_str () );
  _____  

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
2005-12-30 10:29:07 UTC (rev 20456)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
2005-12-30 13:33:31 UTC (rev 20457)
@@ -119,6 +119,7 @@

 	                             const std::string& libsMacro,
 	                             const std::string&
pefixupParameters );
 	void GeneratePhonyTarget() const;
+	void GenerateBuildMapCode ( const char *mapTarget = NULL );
 	void GenerateRules ();
 	void GenerateImportLibraryTargetIfNeeded ();
 	void GetDefinitionDependencies ( string_list& dependencies )
const;
@@ -199,7 +200,6 @@
 	bool IsWineModule () const;
 	std::string GetDefinitionFilename () const;
 	static std::string RemoveVariables ( std::string path);
-	void GenerateBuildMapCode ();
 	void GenerateBuildNonSymbolStrippedCode ();
 	void CleanupCompilationUnitVector (
std::vector<CompilationUnit*>& compilationUnits );
 	void GetRpcHeaderDependencies ( std::vector<std::string>&
dependencies ) const;