[hpoussin] 31870: Fix separators for .rbuild files in the generated makefile Add a 'don't care' value for types and host.

Author: hpoussin
Date: Fri Jan 18 19:55:56 2008
New Revision: 31870

URL: http://svn.reactos.org/svn/reactos?rev=31870&view=rev
Log:
Fix separators for .rbuild files in the generated makefile
Add a 'don't care' value for types and host.

Modified:
    trunk/reactos/tools/rbuild/bootstrap.cpp
    trunk/reactos/tools/rbuild/module.cpp
    trunk/reactos/tools/rbuild/rbuild.h

Modified: trunk/reactos/tools/rbuild/bootstrap.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp?...
==============================================================================
--- trunk/reactos/tools/rbuild/bootstrap.cpp (original)
+++ trunk/reactos/tools/rbuild/bootstrap.cpp Fri Jan 18 19:55:56 2008
@@ -71,6 +71,8 @@
    	case EmbeddedTypeLib:
    	case ElfExecutable:
    		return false;
+		case TypeDontCare:
+			break;
    }
    throw InvalidOperationException ( __FILE__,
                                      __LINE__ );

Modified: trunk/reactos/tools/rbuild/module.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev...
==============================================================================
--- trunk/reactos/tools/rbuild/module.cpp (original)
+++ trunk/reactos/tools/rbuild/module.cpp Fri Jan 18 19:55:56 2008
@@ -254,7 +254,7 @@
    	                                  __LINE__,
    	                                  "Module created with non-<module> node" );

-	xmlbuildFile = Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename () );
+	xmlbuildFile = FixSeparator ( Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename () ) );

const XMLAttribute* att = moduleNode.GetAttribute ( "name", true );
    assert(att);
@@ -963,6 +963,8 @@
    	case Alias:
    	case IdlHeader:
    		return IntermediateDirectory;
+		case TypeDontCare:
+			break;
    }
    throw InvalidOperationException ( __FILE__,
                                      __LINE__,
@@ -1018,6 +1020,8 @@
    		return "";
    	case EmbeddedTypeLib:
    		return ".tlb";
+		case TypeDontCare:
+			break;
    }
    throw InvalidOperationException ( __FILE__,
                                      __LINE__ );
@@ -1070,6 +1074,8 @@
    	case ElfExecutable:
    	case EmbeddedTypeLib:
    		return "";
+		case TypeDontCare:
+			break;
    }
    throw InvalidOperationException ( __FILE__,
                                      __LINE__ );
@@ -1115,6 +1121,8 @@
    	case IdlHeader:
    	case EmbeddedTypeLib:
    		return "";
+		case TypeDontCare:
+			break;
    }
    throw InvalidOperationException ( __FILE__,
                                      __LINE__ );
@@ -1161,6 +1169,8 @@
    	case EmbeddedTypeLib:
    	case ElfExecutable:
    		return false;
+		case TypeDontCare:
+			break;
    }
    throw InvalidOperationException ( __FILE__,
                                      __LINE__ );

Modified: trunk/reactos/tools/rbuild/rbuild.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=3...
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.h (original)
+++ trunk/reactos/tools/rbuild/rbuild.h Fri Jan 18 19:55:56 2008
@@ -300,13 +300,15 @@
    EmbeddedTypeLib = 26,
    ElfExecutable = 27,
    RpcProxy,
+	TypeDontCare,
 };

enum HostType
 {
    HostFalse,
    HostDefault,
-	HostTrue
+	HostTrue,
+	HostDontCare,
 };

class FileLocation