[ros-diffs] [chorns] 15599: -mi switch for rbuild to not have rbuild create install directories.

-mi switch for rbuild to not have rbuild create install directories.
Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
Modified: trunk/reactos/tools/rbuild/configuration.cpp
Modified: trunk/reactos/tools/rbuild/rbuild.cpp
Modified: trunk/reactos/tools/rbuild/rbuild.h
  _____

Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp	2005-05-28
18:13:11 UTC (rev 15598)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp	2005-05-28
18:43:25 UTC (rev 15599)
@@ -670,7 +670,8 @@

printf ( "Creating directories..." );
    intermediateDirectory->GenerateTree ( "", configuration.Verbose
);
    outputDirectory->GenerateTree ( "", configuration.Verbose );
-	installDirectory->GenerateTree ( "", configuration.Verbose );
+	if ( !configuration.MakeHandlesInstallDirectories )
+		installDirectory->GenerateTree ( "",
configuration.Verbose );
    printf ( "done\n" );
 }

_____

Modified: trunk/reactos/tools/rbuild/configuration.cpp
--- trunk/reactos/tools/rbuild/configuration.cpp	2005-05-28
18:13:11 UTC (rev 15598)
+++ trunk/reactos/tools/rbuild/configuration.cpp	2005-05-28
18:43:25 UTC (rev 15599)
@@ -8,6 +8,7 @@

Verbose = false;
    CleanAsYouGo = false;
    AutomaticDependencies = true;
+	MakeHandlesInstallDirectories = false;
 }

Configuration::~Configuration ()
  _____

Modified: trunk/reactos/tools/rbuild/rbuild.cpp
--- trunk/reactos/tools/rbuild/rbuild.cpp	2005-05-28 18:13:11 UTC
(rev 15598)
+++ trunk/reactos/tools/rbuild/rbuild.cpp	2005-05-28 18:43:25 UTC
(rev 15599)
@@ -21,9 +21,26 @@

static Configuration configuration;

bool
+ParseMakeSwitch ( char switchChar2 )
+{
+	switch ( switchChar2 )
+	{
+		case 'i':
+			configuration.MakeHandlesInstallDirectories =
true;
+			break;
+		default:
+			printf ( "Unknown switch -m%c",
+			         switchChar2 );
+			return false;
+	}
+	return true;
+}
+
+bool
 ParseSwitch ( int argc, char** argv, int index )
 {
-	char switchChar = argv[index][1];
+	char switchChar = strlen ( argv[index] ) > 1 ? argv[index][1] :
' ';
+	char switchChar2 = strlen ( argv[index] ) > 2 ? argv[index][2] :
' ';
    switch ( switchChar )
    {
    	case 'v':
@@ -38,6 +55,8 @@
    	case 'r':
    		RootXmlFile = string(&argv[index][2]);
    		break;
+		case 'm':
+			return ParseMakeSwitch ( switchChar2 );
    	default:
    		printf ( "Unknown switch -%c",
    		         switchChar );
@@ -72,12 +91,13 @@
    if ( !ParseArguments ( argc, argv ) )
    {
    	printf ( "Generates project files for buildsystems\n\n"
);
-		printf ( "  rbuild [-v] [-rfile.xml] buildsystem\n\n" );
+		printf ( "  rbuild [switches] 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 needed anymore\n" );
+		printf ( "  -v           Be verbose.\n" );
+		printf ( "  -c           Clean as you go. Delete
generated files as soon as they are not needed anymore.\n" );
    	printf ( "  -d           Disable automatic
dependencies.\n" );
-		printf ( "  -rfile.xml   Name of the root xml file.
Default is ReactOS.xml\n" );
+		printf ( "  -rfile.xml   Name of the root xml file.
Default is ReactOS.xml.\n" );
+		printf ( "  -mi          Let make handle creation of
install directories. Rbuild will not generate the directories.\n" );
    	printf ( "\n" );
    	printf ( "  buildsystem  Target build system. Can be one
of:\n" );
    	printf ( "                 mingw   MinGW\n" );
  _____

Modified: trunk/reactos/tools/rbuild/rbuild.h
--- trunk/reactos/tools/rbuild/rbuild.h	2005-05-28 18:13:11 UTC (rev
15598)
+++ trunk/reactos/tools/rbuild/rbuild.h	2005-05-28 18:43:25 UTC (rev
15599)
@@ -76,6 +76,7 @@

bool Verbose;
    bool CleanAsYouGo;
    bool AutomaticDependencies;
+	bool MakeHandlesInstallDirectories;
 };

class Environment