From ccf9439e1e684227ca094d3d762ec2ebe7b7691e Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Tue, 3 Jul 2007 19:10:33 +0000 Subject: [PATCH] renamed TypeLib target to EmbeddedTypeLib svn path=/trunk/; revision=27374 --- .../rbuild/backend/mingw/modulehandler.cpp | 25 +++++++++++-------- .../rbuild/backend/mingw/modulehandler.h | 6 ++--- reactos/tools/rbuild/bootstrap.cpp | 2 +- reactos/tools/rbuild/module.cpp | 16 ++++++------ reactos/tools/rbuild/rbuild.h | 2 +- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp index 95fb63101d2..9f196c264aa 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp @@ -265,8 +265,8 @@ MingwModuleHandler::InstanciateHandler ( case IdlHeader: handler = new MingwIdlHeaderModuleHandler ( module ); break; - case TypeLib: - handler = new MingwTypeLibModuleHandler ( module ); + case EmbeddedTypeLib: + handler = new MingwEmbeddedTypeLibModuleHandler ( module ); break; default: throw UnknownModuleTypeException ( @@ -1263,7 +1263,7 @@ MingwModuleHandler::GetIdlHeaderFilename ( string basename ) const } void -MingwModuleHandler::GenerateWidlCommandsTypeLib ( +MingwModuleHandler::GenerateWidlCommandsEmbeddedTypeLib ( const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { @@ -1272,19 +1272,22 @@ MingwModuleHandler::GenerateWidlCommandsTypeLib ( string dependencies = filename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string TypeLibFilename = module.GetTargetName (); - + string basename = GetBasename ( filename ); + string EmbeddedTypeLibFilename = basename + ".tlb"; + fprintf ( fMakefile, "%s: %s $(WIDL_TARGET) | %s\n", GetTargetMacro ( module ).c_str (), dependencies.c_str (), - GetDirectory ( TypeLibFilename ).c_str () ); + GetDirectory ( EmbeddedTypeLibFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, - "\t%s %s %s -t -T $@ %s\n", + //"\t%s %s %s -t -T $@ %s\n", + "\t%s %s %s -t -T %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), + EmbeddedTypeLibFilename.c_str(), filename.c_str () ); } @@ -1366,8 +1369,8 @@ MingwModuleHandler::GenerateWidlCommands ( else if ( module.type == RpcClient ) GenerateWidlCommandsClient ( compilationUnit, widlflagsMacro ); - else if ( module.type == TypeLib ) - GenerateWidlCommandsTypeLib ( compilationUnit, + else if ( module.type == EmbeddedTypeLib ) + GenerateWidlCommandsEmbeddedTypeLib ( compilationUnit, widlflagsMacro ); else // applies also for other module.types which include idl files GenerateWidlCommandsIdlHeader ( compilationUnit, @@ -2492,7 +2495,7 @@ MingwKernelModeDLLModuleHandler::MingwKernelModeDLLModuleHandler ( { } -MingwTypeLibModuleHandler::MingwTypeLibModuleHandler ( +MingwEmbeddedTypeLibModuleHandler::MingwEmbeddedTypeLibModuleHandler ( const Module& module_ ) : MingwModuleHandler ( module_ ) @@ -2500,7 +2503,7 @@ MingwTypeLibModuleHandler::MingwTypeLibModuleHandler ( } void -MingwTypeLibModuleHandler::Process () +MingwEmbeddedTypeLibModuleHandler::Process () { GenerateRules (); } diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h index 4a10330f526..105738eb53a 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.h +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h @@ -172,7 +172,7 @@ private: void GenerateWidlCommandsIdlHeader ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); - void GenerateWidlCommandsTypeLib ( + void GenerateWidlCommandsEmbeddedTypeLib ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); void GenerateWidlCommands ( const CompilationUnit& compilationUnit, @@ -505,10 +505,10 @@ public: virtual void Process (); }; -class MingwTypeLibModuleHandler : public MingwModuleHandler +class MingwEmbeddedTypeLibModuleHandler : public MingwModuleHandler { public: - MingwTypeLibModuleHandler ( const Module& module ); + MingwEmbeddedTypeLibModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); }; diff --git a/reactos/tools/rbuild/bootstrap.cpp b/reactos/tools/rbuild/bootstrap.cpp index b41b076d6e6..bf8c4d2d4da 100644 --- a/reactos/tools/rbuild/bootstrap.cpp +++ b/reactos/tools/rbuild/bootstrap.cpp @@ -68,7 +68,7 @@ Bootstrap::IsSupportedModuleType ( ModuleType type ) case RpcClient: case Alias: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return false; } throw InvalidOperationException ( __FILE__, diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp index e96587642da..b0133507186 100644 --- a/reactos/tools/rbuild/module.cpp +++ b/reactos/tools/rbuild/module.cpp @@ -839,8 +839,8 @@ Module::GetModuleType ( const string& location, const XMLAttribute& attribute ) return Alias; if ( attribute.value == "idlheader" ) return IdlHeader; - if ( attribute.value == "typelib" ) - return TypeLib; + if ( attribute.value == "embeddedtypelib" ) + return EmbeddedTypeLib; throw InvalidAttributeValueException ( location, attribute.name, attribute.value ); @@ -892,7 +892,7 @@ Module::GetDefaultModuleExtension () const case BootProgram: case IdlHeader: return ""; - case TypeLib: + case EmbeddedTypeLib: return ".tlb"; } throw InvalidOperationException ( __FILE__, @@ -943,7 +943,7 @@ Module::GetDefaultModuleEntrypoint () const case Alias: case BootProgram: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return ""; } throw InvalidOperationException ( __FILE__, @@ -986,7 +986,7 @@ Module::GetDefaultModuleBaseaddress () const case Alias: case BootProgram: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return ""; } throw InvalidOperationException ( __FILE__, @@ -1031,7 +1031,7 @@ Module::IsDLL () const case RpcClient: case Alias: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return false; } throw InvalidOperationException ( __FILE__, @@ -1063,7 +1063,7 @@ Module::GenerateInOutputTree () const case LiveIso: case IsoRegTest: case LiveIsoRegTest: - case TypeLib: + case EmbeddedTypeLib: return true; case StaticLibrary: case ObjectLibrary: @@ -1565,7 +1565,7 @@ AutoRegister::IsSupportedModuleType ( ModuleType type ) case RpcClient: case Alias: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return false; } throw InvalidOperationException ( __FILE__, diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h index bf89d83f172..538e6154e76 100644 --- a/reactos/tools/rbuild/rbuild.h +++ b/reactos/tools/rbuild/rbuild.h @@ -274,7 +274,7 @@ enum ModuleType IdlHeader = 23, IsoRegTest = 24, LiveIsoRegTest = 25, - TypeLib = 26 + EmbeddedTypeLib = 26 }; enum HostType