[ros-diffs] [hpoussin] 28800: Few indentation fixes Generate again boot programs in output directory

[hpoussin at svn.reactos.org]

Author: hpoussin
Date: Mon Sep  3 08:12:48 2007
New Revision: 28800

URL: http://svn.reactos.org/svn/reactos?rev=28800&view=rev
Log:
Few indentation fixes
Generate again boot programs in output directory

Modified:
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
    trunk/reactos/tools/rbuild/module.cpp
    trunk/reactos/tools/rbuild/rbuild.h

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp?rev=28800&r1=28799&r2=28800&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Sep  3 08:12:48 2007
@@ -267,9 +267,9 @@
 		case EmbeddedTypeLib:
 			handler = new MingwEmbeddedTypeLibModuleHandler ( module );
 			break;
-                case ElfExecutable:
-                        handler = new MingwElfExecutableModuleHandler ( module );
-                        break;
+		case ElfExecutable:
+			handler = new MingwElfExecutableModuleHandler ( module );
+			break;
 		default:
 			throw UnknownModuleTypeException (
 				module.node.location,
@@ -2002,6 +2002,8 @@
 		globalCflags += " -pipe";
 	if ( !module.allowWarnings )
 		globalCflags += " -Werror";
+	if ( module.host == HostTrue )
+		globalCflags += " $(HOST_CFLAGS)";
 
 	// Always force disabling of sibling calls optimisation for GCC
 	// (TODO: Move to version-specific once this bug is fixed in GCC)
@@ -3149,8 +3151,8 @@
 	fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" );
 
 	fprintf ( fMakefile, "\t$(%s_PREPARE) $(OUTPUT)$(SEP)%s %s\n",
-		  module.buildtype.c_str (), 
-		  NormalizeFilename( payload->GetPath() ).c_str (),
+		module.buildtype.c_str (), 
+		NormalizeFilename( payload->GetPath() ).c_str (),
 		junk_cpy.c_str () );
 
 	fprintf ( fMakefile, "\t${objcopy} $(%s_FLATFORMAT) %s %s\n",
@@ -3726,8 +3728,8 @@
 	fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" );
 
 	fprintf ( fMakefile, "\t${ld} $(%s_LINKFORMAT) %s %s -g -o %s\n",
-		  module.buildtype.c_str(),
-		  objectsMacro.c_str(),
-                  libsMacro.c_str(),
-                  targetMacro.c_str () );
-}
+	          module.buildtype.c_str(),
+	          objectsMacro.c_str(),
+	          libsMacro.c_str(),
+	          targetMacro.c_str () );
+}

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h?rev=28800&r1=28799&r2=28800&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Mon Sep  3 08:12:48 2007
@@ -518,7 +518,7 @@
 class MingwElfExecutableModuleHandler : public MingwModuleHandler
 {
 public:
-        MingwElfExecutableModuleHandler ( const Module& module );
+	MingwElfExecutableModuleHandler ( const Module& module );
 	virtual HostType DefaultHost() { return HostFalse; }
 	virtual void Process ();
 };

Modified: trunk/reactos/tools/rbuild/module.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev=28800&r1=28799&r2=28800&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/module.cpp (original)
+++ trunk/reactos/tools/rbuild/module.cpp Mon Sep  3 08:12:48 2007
@@ -892,8 +892,8 @@
 		return IdlHeader;
 	if ( attribute.value == "embeddedtypelib" )
 		return EmbeddedTypeLib;
-        if ( attribute.value == "elfexecutable" )
-                return ElfExecutable;
+	if ( attribute.value == "elfexecutable" )
+		return ElfExecutable;
 	throw InvalidAttributeValueException ( location,
 	                                       attribute.name,
 	                                       attribute.value );
@@ -942,7 +942,7 @@
 		case RpcClient:
 			return ".o";
 		case Alias:
-                case ElfExecutable:
+		case ElfExecutable:
 		case IdlHeader:
 			return "";
 		case EmbeddedTypeLib:
@@ -995,7 +995,7 @@
 		case Alias:
 		case BootProgram:
 		case IdlHeader:
-                case ElfExecutable:
+		case ElfExecutable:
 		case EmbeddedTypeLib:
 			return "";
 	}
@@ -1024,8 +1024,8 @@
 		case KernelModeDLL:
 		case KernelModeDriver:
 			return "0x00010000";
-                case ElfExecutable:
-                        return "0xe00000";                        
+		case ElfExecutable:
+			return "0xe00000";
 		case BuildTool:
 		case StaticLibrary:
 		case ObjectLibrary:
@@ -1085,7 +1085,7 @@
 		case Alias:
 		case IdlHeader:
 		case EmbeddedTypeLib:
-                case ElfExecutable:
+		case ElfExecutable:
 			return false;
 	}
 	throw InvalidOperationException ( __FILE__,
@@ -1111,19 +1111,19 @@
 		case BuildTool:
 		case BootLoader:
 		case BootSector:
+		case BootProgram:
 		case Iso:
 		case LiveIso:
 		case IsoRegTest:
 		case LiveIsoRegTest:
 		case EmbeddedTypeLib:
-                case ElfExecutable:
+		case ElfExecutable:
 			return true;
 		case StaticLibrary:
 		case ObjectLibrary:
 		case RpcServer:
 		case RpcClient:
 		case Alias:
-		case BootProgram:
 		case IdlHeader:
 			return false;
 	}

Modified: trunk/reactos/tools/rbuild/rbuild.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=28800&r1=28799&r2=28800&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.h (original)
+++ trunk/reactos/tools/rbuild/rbuild.h Mon Sep  3 08:12:48 2007
@@ -275,7 +275,7 @@
 	IsoRegTest = 24,
 	LiveIsoRegTest = 25,
 	EmbeddedTypeLib = 26,
-        ElfExecutable = 27
+	ElfExecutable = 27
 };
 
 enum HostType