fix some dependencies

get rid of unnecessary phony targets
eliminate unnecessary makefile.auto dependencies
silence gcc when detecting pch

svn path=/branches/xmlbuildsystem/; revision=13993

diff --git a/reactos/Makefile b/reactos/Makefile
index 34d1a3e..e0d3f8b 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -125,10 +125,10 @@ PREAUTO := \
        $(BUGCODES_H) \
        $(BUGCODES_RC) \
        $(ERRCODES_H) \
-       $(ERRCODES_RC)
+       $(ERRCODES_RC) \
+       $(NCI_SERVICE_FILES)
 
-makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(WRC_TARGET) \
-               $(RSYM_TARGET) $(CDMAKE_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
+makefile.auto: $(RMKDIR_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
        $(ECHO_RBUILD)
        $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw
 

diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index daff5b8..ad97d4f 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -230,21 +230,15 @@ MingwBackend::GetBuildToolDependencies () const
 void\r
 MingwBackend::GenerateInitTarget () const\r
 {\r
+       string tools = "$(ROS_INTERMEDIATE)." SSEP "tools";\r
        fprintf ( fMakefile,\r
-                 "init:");\r
-       fprintf ( fMakefile,\r
-                 " $(ROS_INTERMEDIATE)." SSEP "tools" );\r
-       fprintf ( fMakefile,\r
-                 " %s",\r
+                 "INIT = %s %s\n",\r
+                 tools.c_str (),\r
                  GetBuildToolDependencies ().c_str () );\r
-       fprintf ( fMakefile,\r
-                 " %s",\r
-                 "include" SSEP "reactos" SSEP "buildno.h" );\r
-       fprintf ( fMakefile,\r
-                 "\n\t\n\n" );\r
 \r
        fprintf ( fMakefile,\r
-                 "$(ROS_INTERMEDIATE)." SSEP "tools:\n" );\r
+                 "%s:\n",\r
+                 tools.c_str () );\r
        fprintf ( fMakefile,\r
                  "ifneq ($(ROS_INTERMEDIATE),)\n" );\r
        fprintf ( fMakefile,\r
@@ -332,8 +326,17 @@ FixupTargetFilename ( const string& targetFilename )
 void\r
 MingwBackend::DetectPCHSupport()\r
 {\r
+#ifdef WIN32\r
+       string sNUL = "NUL";\r
+#else\r
+       string sNUL = "/dev/null";\r
+#endif\r
        string path = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pch_detection.h";\r
-       system ( ssprintf("gcc -c %s", path.c_str()).c_str() );\r
+       string cmd = ssprintf(\r
+               "gcc -c %s 2>%s",\r
+               path.c_str (),\r
+               sNUL.c_str () );\r
+       system ( cmd.c_str() );\r
        path += ".gch";\r
 \r
        FILE* f = fopen ( path.c_str(), "rb" );\r

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index aaab726..3759646 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -65,6 +65,24 @@ PrefixFilename (
        return out;\r
 }\r
 \r
+string v2s ( const vector<string>& v, int wrap_at )\r
+{\r
+       if ( !v.size() )\r
+               return "";\r
+       string s;\r
+       int wrap_count = 0;\r
+       for ( size_t i = 0; i < v.size(); i++ )\r
+       {\r
+               if ( !v[i].size() )\r
+                       continue;\r
+               if ( wrap_at > 0 && wrap_count++ == wrap_at )\r
+                       s += " \\\n\t\t";\r
+               else if ( s.size() )\r
+                       s += " ";\r
+               s += v[i];\r
+       }\r
+       return s;\r
+}\r
 \r
 MingwModuleHandler::MingwModuleHandler ( ModuleType moduletype )\r
 {\r
@@ -947,15 +965,20 @@ MingwModuleHandler::GenerateCommands (
 void\r
 MingwModuleHandler::GenerateLinkerCommand (\r
        const Module& module,\r
+       const string& target,\r
+       const string& dependencies,\r
        const string& linker,\r
        const string& linkerParameters,\r
        const string& objectsMacro,\r
        const string& libsMacro,\r
        string_list& clean_files ) const\r
 {\r
+       fprintf ( fMakefile,\r
+               "%s: %s ${RSYM_TARGET}\n",\r
+               target.c_str (),\r
+               dependencies.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_LD)\n" );\r
        string targetName ( module.GetTargetName () );\r
-       string target ( FixupTargetFilename ( module.GetPath () ) );\r
        if ( module.importLibrary != NULL )\r
        {\r
                static string ros_junk ( "$(ROS_TEMPORARY)" );\r
@@ -1177,9 +1200,9 @@ MingwModuleHandler::GenerateMacrosAndTargets (
        const string* nasmflags,\r
        string_list& clean_files ) const\r
 {\r
-       string cc = ( module.host ? "${host_gcc}" : "${gcc}" );\r
-       string cppc = ( module.host ? "${host_gpp}" : "${gpp}" );\r
-       string ar = ( module.host ? "${host_ar}" : "${ar}" );\r
+       string cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" );\r
+       string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" );\r
+       string ar = ( module.host == HostTrue ? "${host_ar}" : "${ar}" );\r
 \r
        string cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ());\r
        string nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ());\r
@@ -1299,8 +1322,7 @@ MingwModuleHandler::GenerateInvocations ( const Module& module ) const
 string\r
 MingwModuleHandler::GetPreconditionDependenciesName ( const Module& module ) const\r
 {\r
-       return ssprintf ( "%s_precondition",\r
-                         module.name.c_str () );\r
+       return module.name + "_precondition";\r
 }\r
 \r
 string\r
@@ -1312,7 +1334,7 @@ MingwModuleHandler::GetDefaultDependencies ( const Module& module ) const
                || module.name == "hostzlib" )\r
                return "$(ROS_INTERMEDIATE)." SSEP "tools $(ROS_INTERMEDIATE)." SSEP "lib" SSEP "zlib";\r
        else\r
-               return "init";\r
+               return "$(INIT)";\r
 }\r
 \r
 void\r
@@ -1338,10 +1360,7 @@ MingwModuleHandler::GeneratePreconditionDependencies ( const Module& module ) co
        }\r
        \r
        fprintf ( fMakefile,\r
-                 ".PHONY: %s\n\n",\r
-                 preconditionDependenciesName.c_str () );\r
-       fprintf ( fMakefile,\r
-                 "%s: %s\n\n",\r
+                 "%s = %s\n\n",\r
                  preconditionDependenciesName.c_str (),\r
                  dependencies.c_str () );\r
        const char* p = sourceFilenames.c_str();\r
@@ -1360,7 +1379,7 @@ MingwModuleHandler::GeneratePreconditionDependencies ( const Module& module ) co
                                p2 = end;\r
                }\r
                fprintf ( fMakefile,\r
-                         "%.*s: %s\n",\r
+                         "%.*s: ${%s}\n",\r
                          p2-p,\r
                          p,\r
                          preconditionDependenciesName.c_str ());\r
@@ -1523,7 +1542,7 @@ MingwKernelModuleHandler::GenerateKernelModuleTarget ( const Module& module, str
 \r
        GenerateImportLibraryTargetIfNeeded ( module, clean_files );\r
 \r
-       fprintf ( fMakefile, "%s: %s %s\n",\r
+       fprintf ( fMakefile, "%s: %s %s ${RSYM_TARGET}\n",\r
                  target.c_str (),\r
                  objectsMacro.c_str (),\r
                  linkDepsMacro.c_str () );\r
@@ -1645,15 +1664,15 @@ MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget (
        {\r
                GenerateMacrosAndTargets ( module, NULL, NULL, clean_files );\r
 \r
-               fprintf ( fMakefile, "%s: %s %s\n",\r
-                         target.c_str (),\r
-                         objectsMacro.c_str (),\r
-                         linkDepsMacro.c_str () );\r
+               string dependencies =\r
+                       objectsMacro + " " + linkDepsMacro;\r
 \r
                string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",\r
                                                     module.entrypoint.c_str (),\r
                                                     module.baseaddress.c_str () );\r
                GenerateLinkerCommand ( module,\r
+                                       target,\r
+                                       dependencies,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
                                        objectsMacro,\r
@@ -1708,15 +1727,15 @@ MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget (
                                           NULL,\r
                                           clean_files );\r
 \r
-               fprintf ( fMakefile, "%s: %s %s\n",\r
-                         target.c_str (),\r
-                         objectsMacro.c_str (),\r
-                         linkDepsMacro.c_str () );\r
+               string dependencies =\r
+                       objectsMacro + " " + linkDepsMacro;\r
 \r
                string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",\r
                                                     module.entrypoint.c_str (),\r
                                                     module.baseaddress.c_str () );\r
                GenerateLinkerCommand ( module,\r
+                                       target,\r
+                                       dependencies,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
                                        objectsMacro,\r
@@ -1764,15 +1783,15 @@ MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ( const Module& modul
        {\r
                GenerateMacrosAndTargets ( module, NULL, NULL, clean_files );\r
 \r
-               fprintf ( fMakefile, "%s: %s %s\n",\r
-                         target.c_str (),\r
-                         objectsMacro.c_str (),\r
-                         linkDepsMacro.c_str () );\r
+               string dependencies =\r
+                       objectsMacro + " " + linkDepsMacro;\r
 \r
                string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll",\r
                                                     module.entrypoint.c_str (),\r
                                                     module.baseaddress.c_str () );\r
                GenerateLinkerCommand ( module,\r
+                                       target,\r
+                                       dependencies,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
                                        objectsMacro,\r
@@ -1824,15 +1843,15 @@ MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ( const Module& modul
                                           NULL,\r
                                           clean_files );\r
 \r
-               fprintf ( fMakefile, "%s: %s %s\n",\r
-                         target.c_str (),\r
-                         objectsMacro.c_str (),\r
-                         linkDepsMacro.c_str () );\r
+               string dependencies =\r
+                       objectsMacro + " " + linkDepsMacro;\r
 \r
                string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib",\r
                                                     module.entrypoint.c_str (),\r
                                                     module.baseaddress.c_str () );\r
                GenerateLinkerCommand ( module,\r
+                                       target,\r
+                                       dependencies,\r
                                        "${gcc}",\r
                                        linkerParameters,\r
                                        objectsMacro,\r
@@ -1904,10 +1923,8 @@ MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ( const Module& module,
        {\r
                GenerateMacrosAndTargets ( module, NULL, NULL, clean_files );\r
 \r
-               fprintf ( fMakefile, "%s: %s %s\n",\r
-                         target.c_str (),\r
-                         objectsMacro.c_str (),\r
-                         linkDepsMacro.c_str () );\r
+               string dependencies =\r
+                       objectsMacro + " " + linkDepsMacro;\r
 \r
                string linker;\r
                if ( module.cplusplus )\r
@@ -1919,6 +1936,8 @@ MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ( const Module& module,
                                                     module.entrypoint.c_str (),\r
                                                     module.baseaddress.c_str () );\r
                GenerateLinkerCommand ( module,\r
+                                       target,\r
+                                       dependencies,\r
                                        linker,\r
                                        linkerParameters,\r
                                        objectsMacro,\r
@@ -1966,10 +1985,8 @@ MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ( const Module& module,
        {\r
                GenerateMacrosAndTargets ( module, NULL, NULL, clean_files );\r
 \r
-               fprintf ( fMakefile, "%s: %s %s\n",\r
-                         target.c_str (),\r
-                         objectsMacro.c_str (),\r
-                         linkDepsMacro.c_str () );\r
+               string dependencies =\r
+                       objectsMacro + " " + linkDepsMacro;\r
 \r
                string linker;\r
                if ( module.cplusplus )\r
@@ -1981,6 +1998,8 @@ MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ( const Module& module,
                                                     module.entrypoint.c_str (),\r
                                                     module.baseaddress.c_str () );\r
                GenerateLinkerCommand ( module,\r
+                                       target,\r
+                                       dependencies,\r
                                        linker,\r
                                        linkerParameters,\r
                                        objectsMacro,\r
@@ -2026,12 +2045,10 @@ MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ( const Module& module,
 \r
        if ( module.non_if_data.files.size () > 0 )\r
        {\r
-       GenerateMacrosAndTargets ( module, NULL, NULL, clean_files );\r
+               GenerateMacrosAndTargets ( module, NULL, NULL, clean_files );\r
 \r
-               fprintf ( fMakefile, "%s: %s %s\n",\r
-                         target.c_str (),\r
-                         objectsMacro.c_str (),\r
-                         linkDepsMacro.c_str () );\r
+               string dependencies =\r
+                       objectsMacro + " " + linkDepsMacro;\r
 \r
                string linker;\r
                if ( module.cplusplus )\r
@@ -2043,6 +2060,8 @@ MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ( const Module& module,
                                                     module.entrypoint.c_str (),\r
                                                     module.baseaddress.c_str () );\r
                GenerateLinkerCommand ( module,\r
+                                       target,\r
+                                       dependencies,\r
                                        linker,\r
                                        linkerParameters,\r
                                        objectsMacro,\r
@@ -2165,8 +2184,8 @@ MingwIsoModuleHandler::Process ( const Module& module, string_list& clean_files
 }\r
 \r
 void\r
-MingwIsoModuleHandler::OutputBootstrapfileCopyCommands ( const string bootcdDirectory,\r
-                                                            const Module& module ) const\r
+MingwIsoModuleHandler::OutputBootstrapfileCopyCommands ( const string& bootcdDirectory,\r
+                                                         const Module& module ) const\r
 {\r
        for ( size_t i = 0; i < module.project.modules.size (); i++ )\r
        {\r
@@ -2184,8 +2203,8 @@ MingwIsoModuleHandler::OutputBootstrapfileCopyCommands ( const string bootcdDire
 }\r
 \r
 void\r
-MingwIsoModuleHandler::OutputCdfileCopyCommands ( const string bootcdDirectory,\r
-                                                     const Module& module ) const\r
+MingwIsoModuleHandler::OutputCdfileCopyCommands ( const string& bootcdDirectory,\r
+                                                  const Module& module ) const\r
 {\r
        for ( size_t i = 0; i < module.project.cdfiles.size (); i++ )\r
        {\r
@@ -2200,8 +2219,8 @@ MingwIsoModuleHandler::OutputCdfileCopyCommands ( const string bootcdDirectory,
 }\r
 \r
 string\r
-MingwIsoModuleHandler::GetBootstrapCdDirectories ( const string bootcdDirectory,\r
-                                                      const Module& module ) const\r
+MingwIsoModuleHandler::GetBootstrapCdDirectories ( const string& bootcdDirectory,\r
+                                                   const Module& module ) const\r
 {\r
        string directories;\r
        for ( size_t i = 0; i < module.project.modules.size (); i++ )\r
@@ -2219,8 +2238,8 @@ MingwIsoModuleHandler::GetBootstrapCdDirectories ( const string bootcdDirectory,
 }\r
 \r
 string\r
-MingwIsoModuleHandler::GetNonModuleCdDirectories ( const string bootcdDirectory,\r
-                                                      const Module& module ) const\r
+MingwIsoModuleHandler::GetNonModuleCdDirectories ( const string& bootcdDirectory,\r
+                                                   const Module& module ) const\r
 {\r
        string directories;\r
        for ( size_t i = 0; i < module.project.cdfiles.size (); i++ )\r
@@ -2235,8 +2254,8 @@ MingwIsoModuleHandler::GetNonModuleCdDirectories ( const string bootcdDirectory,
 }\r
 \r
 string\r
-MingwIsoModuleHandler::GetCdDirectories ( const string bootcdDirectory,\r
-                                             const Module& module ) const\r
+MingwIsoModuleHandler::GetCdDirectories ( const string& bootcdDirectory,\r
+                                          const Module& module ) const\r
 {\r
        string directories = GetBootstrapCdDirectories ( bootcdDirectory,\r
                                                         module );\r
@@ -2245,48 +2264,38 @@ MingwIsoModuleHandler::GetCdDirectories ( const string bootcdDirectory,
        return directories;\r
 }\r
 \r
-string\r
-MingwIsoModuleHandler::GetBootstrapCdFiles ( const string bootcdDirectory,\r
-                                                const Module& module ) const\r
+void\r
+MingwIsoModuleHandler::GetBootstrapCdFiles (\r
+       vector<string>& out,\r
+       const Module& module ) const\r
 {\r
-       string cdfiles;\r
        for ( size_t i = 0; i < module.project.modules.size (); i++ )\r
        {\r
                const Module& m = *module.project.modules[i];\r
                if ( m.bootstrap != NULL )\r
-               {\r
-                       if ( cdfiles.size () > 0 )\r
-                               cdfiles += " ";\r
-                       cdfiles += FixupTargetFilename ( m.GetPath () );\r
-               }\r
+                       out.push_back ( FixupTargetFilename ( m.GetPath () ) );\r
        }\r
-       return cdfiles;\r
 }\r
 \r
-string\r
-MingwIsoModuleHandler::GetNonModuleCdFiles ( const string bootcdDirectory,\r
-                                                const Module& module ) const\r
+void\r
+MingwIsoModuleHandler::GetNonModuleCdFiles (\r
+       vector<string>& out,\r
+       const Module& module ) const\r
 {\r
-       string cdfiles;\r
        for ( size_t i = 0; i < module.project.cdfiles.size (); i++ )\r
        {\r
                const CDFile& cdfile = *module.project.cdfiles[i];\r
-               if ( cdfiles.size () > 0 )\r
-                       cdfiles += " ";\r
-               cdfiles += NormalizeFilename ( cdfile.GetPath () );\r
+               out.push_back ( NormalizeFilename ( cdfile.GetPath () ) );\r
        }\r
-       return cdfiles;\r
 }\r
 \r
-string\r
-MingwIsoModuleHandler::GetCdFiles ( const string bootcdDirectory,\r
-                                       const Module& module ) const\r
+void\r
+MingwIsoModuleHandler::GetCdFiles (\r
+       vector<string>& out,\r
+       const Module& module ) const\r
 {\r
-       string cdfiles = GetBootstrapCdFiles ( bootcdDirectory,\r
-                                              module );\r
-       cdfiles += " " + GetNonModuleCdFiles ( bootcdDirectory,\r
-                                              module );\r
-       return cdfiles;\r
+       GetBootstrapCdFiles ( out, module );\r
+       GetNonModuleCdFiles ( out, module );\r
 }\r
 \r
 void\r
@@ -2301,13 +2310,14 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ( const Module& module, string_li
        string reactosDff = NormalizeFilename ( "bootdata/packages/reactos.dff" );\r
        string cdDirectories = bootcdReactos + " " + GetCdDirectories ( bootcdDirectory,\r
                                                                        module );\r
-       string cdFiles = GetCdFiles ( bootcdDirectory,\r
-                                     module );\r
+       vector<string> vCdFiles;\r
+       GetCdFiles ( vCdFiles, module );\r
+       string cdFiles = v2s ( vCdFiles, 5 );\r
 \r
        fprintf ( fMakefile, ".PHONY: %s\n\n",\r
-                     module.name.c_str ());\r
+                 module.name.c_str ());\r
        fprintf ( fMakefile,\r
-                 "%s: all %s %s %s\n",\r
+                 "%s: all %s %s %s ${CABMAN_TARGET} ${CDMAKE_TARGET}\n",\r
                  module.name.c_str (),\r
                  isoboot.c_str (),\r
                  cdDirectories.c_str (),\r

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h
index 86819a2..469b966 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.h
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h
@@ -60,6 +60,8 @@ protected:
        std::string GetLibsMacro ( const Module& module ) const;\r
        std::string GetLinkerMacro ( const Module& module ) const;\r
        void GenerateLinkerCommand ( const Module& module,\r
+                                    const std::string& target,\r
+                                    const std::string& dependencies,\r
                                     const std::string& linker,\r
                                     const std::string& linkerParameters,\r
                                     const std::string& objectsMacro,\r
@@ -314,21 +316,21 @@ public:
        virtual void Process ( const Module& module, string_list& clean_files );\r
 private:\r
        void GenerateIsoModuleTarget ( const Module& module, string_list& clean_files );\r
-       std::string GetBootstrapCdDirectories ( const std::string bootcdDirectory,\r
+       std::string GetBootstrapCdDirectories ( const std::string& bootcdDirectory,\r
                                                const Module& module ) const;\r
-       std::string GetNonModuleCdDirectories ( const std::string bootcdDirectory,\r
+       std::string GetNonModuleCdDirectories ( const std::string& bootcdDirectory,\r
                                                const Module& module ) const;\r
-       std::string GetCdDirectories ( const std::string bootcdDirectory,\r
+       std::string GetCdDirectories ( const std::string& bootcdDirectory,\r
                                       const Module& module ) const;\r
-       std::string GetBootstrapCdFiles ( const std::string bootcdDirectory,\r
-                                         const Module& module ) const;\r
-       std::string GetNonModuleCdFiles ( const std::string bootcdDirectory,\r
-                                         const Module& module ) const;\r
-       std::string GetCdFiles ( const std::string bootcdDirectory,\r
-                                const Module& module ) const;\r
-       void OutputBootstrapfileCopyCommands ( const std::string bootcdDirectory,\r
+       void GetBootstrapCdFiles ( std::vector<std::string>& out,\r
+                                  const Module& module ) const;\r
+       void GetNonModuleCdFiles ( std::vector<std::string>& out,\r
+                                  const Module& module ) const;\r
+       void GetCdFiles ( std::vector<std::string>& out,\r
+                         const Module& module ) const;\r
+       void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory,\r
                                               const Module& module ) const;\r
-       void OutputCdfileCopyCommands ( const std::string bootcdDirectory,\r
+       void OutputCdfileCopyCommands ( const std::string& bootcdDirectory,\r
                                        const Module& module ) const;\r
 };\r
 \r

diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h
index 619b5fe..926909f 100644 (file)
--- a/reactos/tools/rbuild/rbuild.h
+++ b/reactos/tools/rbuild/rbuild.h
@@ -133,9 +133,9 @@ enum ModuleType
 \r
 enum HostType\r
 {\r
+       HostFalse,\r
        HostDefault,\r
-       HostTrue,\r
-       HostFalse\r
+       HostTrue\r
 };\r
 \r
 class Module\r