Add ROS_ARCH environment variable

[reactos.git] / reactos / tools / rbuild / rbuild.cpp

diff --git a/reactos/tools/rbuild/rbuild.cpp b/reactos/tools/rbuild/rbuild.cpp
index 447ff4f..abe255f 100644 (file)
--- a/reactos/tools/rbuild/rbuild.cpp
+++ b/reactos/tools/rbuild/rbuild.cpp
@@ -33,7 +33,7 @@ using std::string;
 using std::vector;
 
 static string BuildSystem;
-static string RootXmlFile = "ReactOS.rbuild";
+static string RootXmlFile;
 static Configuration configuration;
 
 bool
@@ -86,6 +86,8 @@ ParseVCProjectSwitch (
        char switchChar2,
        char* switchStart )
 {
+       string temp;
+
        switch ( switchChar2 )
        {
                case 's':
@@ -112,6 +114,19 @@ ParseVCProjectSwitch (
                        configuration.VSConfigurationType = string (&switchStart[3]);
                        configuration.InstallFiles = true;
                        break;
+               case 'o':
+                       if ( strlen ( switchStart ) <= 3 )
+                       {
+                               printf ( "Invalid switch\n" );
+                               return false;
+                       }
+                       temp = string (&switchStart[3]);
+                       if ( temp.find ("configuration") != string::npos )
+                               configuration.UseConfigurationInPath = true;
+                       
+                       if ( temp.find ("version") != string::npos )
+                               configuration.UseVSVersionInPath = true;
+                       break;
                default:
                        printf ( "Unknown switch -d%c\n",
                                 switchChar2 );
@@ -160,7 +175,7 @@ ParseSwitch ( int argc, char** argv, int index )
        switch ( switchChar )
        {
                case 'v':
-                       if (switchChar2 == 's' || switchChar2 == 'c' )
+                       if (switchChar2 == 's' || switchChar2 == 'c' || switchChar2 == 'o')
                        {
                                return ParseVCProjectSwitch (
                                        switchChar2,
@@ -224,12 +239,11 @@ main ( int argc, char** argv )
        if ( !ParseArguments ( argc, argv ) )
        {
                printf ( "Generates project files for buildsystems\n\n" );
-               printf ( "  rbuild [switches] buildsystem\n\n" );
+               printf ( "  rbuild [switches] -r{rootfile.rbuild} buildsystem\n\n" );
                printf ( "Switches:\n" );
                printf ( "  -v            Be verbose.\n" );
                printf ( "  -c            Clean as you go. Delete generated files as soon as they are not\n" );
                printf ( "                needed anymore.\n" );
-               printf ( "  -r{file.rbuild}  Name of the root rbuild file. Default is ReactOS.rbuild.\n" );
                printf ( "  -dd           Disable automatic dependencies.\n" );
                printf ( "  -dm{module}   Check only automatic dependencies for this module.\n" );
                printf ( "  -ud           Disable multiple source files per compilation unit.\n" );
@@ -238,19 +252,23 @@ main ( int argc, char** argv )
                printf ( "  -ps           Generate proxy makefiles in source tree instead of the output.\n" );
                printf ( "                tree.\n" );
                printf ( "  -vs{version}  Version of MS VS project files. Default is %s.\n", MS_VS_DEF_VERSION );
+               printf ( "  -vo{version|configuration} Adds subdirectory path to the default Intermediate-Outputdirectory.\n" );
                printf ( "\n" );
                printf ( "  buildsystem   Target build system. Can be one of:\n" );
- 
-               std::map<std::string,Backend::Factory*>::iterator iter;
-               for (iter = Backend::Factory::map_begin(); iter != Backend::Factory::map_end(); iter++)
-               {
-                       Backend::Factory *factory = iter->second;
-                       printf ( "                %-10s %s\n", factory->Name(), factory->Description());
-               }
+
+               std::map<std::string,Backend::Factory*>::iterator iter;
+               for (iter = Backend::Factory::map_begin(); iter != Backend::Factory::map_end(); iter++)
+               {
+                       Backend::Factory *factory = iter->second;
+                       printf ( "                %-10s %s\n", factory->Name(), factory->Description());
+               }
                return 1;
        }
        try
        {
+               if ( RootXmlFile.length () == 0 )
+                       throw MissingArgumentException ( "-r" );
+
                string projectFilename ( RootXmlFile );
 
                printf ( "Reading build files..." );