Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 09:50:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix separators for .rbuild files in the generated makefile

Browse source 
Add a 'don't care' value for types and host.

svn path=/trunk/; revision=31870
This commit is contained in:
Hervé Poussineau 2008-01-18 16:55:56 +00:00
parent 462e70bed3
commit 83ea0639c1
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/tools/rbuild/bootstrap.cpp
View file

@ -71,6 +71,8 @@ Bootstrap::IsSupportedModuleType ( ModuleType type )
case EmbeddedTypeLib: case EmbeddedTypeLib:
case ElfExecutable: case ElfExecutable:
return false; return false;
case TypeDontCare:
break;
} }
throw InvalidOperationException ( __FILE__, throw InvalidOperationException ( __FILE__,
__LINE__ ); __LINE__ );

12
reactos/tools/rbuild/module.cpp
View file

@ -254,7 +254,7 @@ Module::Module ( const Project& project,
__LINE__, __LINE__,
"Module created with non-<module> node" ); "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 ); const XMLAttribute* att = moduleNode.GetAttribute ( "name", true );
assert(att); assert(att);
@ -963,6 +963,8 @@ Module::GetTargetDirectoryTree () const
case Alias: case Alias:
case IdlHeader: case IdlHeader:
return IntermediateDirectory; return IntermediateDirectory;
case TypeDontCare:
break;
} }
throw InvalidOperationException ( __FILE__, throw InvalidOperationException ( __FILE__,
__LINE__, __LINE__,
@ -1018,6 +1020,8 @@ Module::GetDefaultModuleExtension () const
return ""; return "";
case EmbeddedTypeLib: case EmbeddedTypeLib:
return ".tlb"; return ".tlb";
case TypeDontCare:
break;
} }
throw InvalidOperationException ( __FILE__, throw InvalidOperationException ( __FILE__,
__LINE__ ); __LINE__ );
@ -1070,6 +1074,8 @@ Module::GetDefaultModuleEntrypoint () const
case ElfExecutable: case ElfExecutable:
case EmbeddedTypeLib: case EmbeddedTypeLib:
return ""; return "";
case TypeDontCare:
break;
} }
throw InvalidOperationException ( __FILE__, throw InvalidOperationException ( __FILE__,
__LINE__ ); __LINE__ );
@ -1115,6 +1121,8 @@ Module::GetDefaultModuleBaseaddress () const
case IdlHeader: case IdlHeader:
case EmbeddedTypeLib: case EmbeddedTypeLib:
return ""; return "";
case TypeDontCare:
break;
} }
throw InvalidOperationException ( __FILE__, throw InvalidOperationException ( __FILE__,
__LINE__ ); __LINE__ );
@ -1161,6 +1169,8 @@ Module::IsDLL () const
case EmbeddedTypeLib: case EmbeddedTypeLib:
case ElfExecutable: case ElfExecutable:
return false; return false;
case TypeDontCare:
break;
} }
throw InvalidOperationException ( __FILE__, throw InvalidOperationException ( __FILE__,
__LINE__ ); __LINE__ );

4
reactos/tools/rbuild/rbuild.h
View file

@ -300,13 +300,15 @@ enum ModuleType
EmbeddedTypeLib = 26, EmbeddedTypeLib = 26,
ElfExecutable = 27, ElfExecutable = 27,
RpcProxy, RpcProxy,
TypeDontCare,
}; };
enum HostType enum HostType
{ {
HostFalse, HostFalse,
HostDefault, HostDefault,
HostTrue HostTrue,
HostDontCare,
}; };
class FileLocation class FileLocation