[cwittich] 27374: renamed TypeLib target to EmbeddedTypeLib

Author: cwittich
Date: Tue Jul  3 23:10:33 2007
New Revision: 27374
URL: http://svn.reactos.org/svn/reactos?rev=27374&view=rev
Log:
renamed TypeLib target to EmbeddedTypeLib
Modified:
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
    trunk/reactos/tools/rbuild/bootstrap.cpp
    trunk/reactos/tools/rbuild/module.cpp
    trunk/reactos/tools/rbuild/rbuild.h
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Jul  3 23:10:33 2007
@@ -265,8 +265,8 @@
                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 @@
 }
 void
-MingwModuleHandler::GenerateWidlCommandsTypeLib (
+MingwModuleHandler::GenerateWidlCommandsEmbeddedTypeLib (
        const CompilationUnit& compilationUnit,
        const string& widlflagsMacro )
 {
@@ -1272,19 +1272,22 @@
        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 @@
        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 @@
 {
 }
-MingwTypeLibModuleHandler::MingwTypeLibModuleHandler (
+MingwEmbeddedTypeLibModuleHandler::MingwEmbeddedTypeLibModuleHandler (
        const Module& module_ )
        : MingwModuleHandler ( module_ )
@@ -2500,7 +2503,7 @@
 }
 void
-MingwTypeLibModuleHandler::Process ()
+MingwEmbeddedTypeLibModuleHandler::Process ()
 {
        GenerateRules ();
 }
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Tue Jul  3 23:10:33 2007
@@ -172,7 +172,7 @@
        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 @@
        virtual void Process ();
 };
-class MingwTypeLibModuleHandler : public MingwModuleHandler
-{
-public:
-       MingwTypeLibModuleHandler ( const Module& module );
+class MingwEmbeddedTypeLibModuleHandler : public MingwModuleHandler
+{
+public:
+       MingwEmbeddedTypeLibModuleHandler ( const Module& module );
        virtual HostType DefaultHost() { return HostFalse; }
        virtual void Process ();
 };
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 Tue Jul  3 23:10:33 2007
@@ -68,7 +68,7 @@
                case RpcClient:
                case Alias:
                case IdlHeader:
-               case TypeLib:
+               case EmbeddedTypeLib:
                        return false;
        }
        throw InvalidOperationException ( __FILE__,
Modified: trunk/reactos/tools/rbuild/module.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re…
==============================================================================
--- trunk/reactos/tools/rbuild/module.cpp (original)
+++ trunk/reactos/tools/rbuild/module.cpp Tue Jul  3 23:10:33 2007
@@ -839,8 +839,8 @@
                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 @@
                case BootProgram:
                case IdlHeader:
                        return "";
-               case TypeLib:
+               case EmbeddedTypeLib:
                        return ".tlb";
        }
        throw InvalidOperationException ( __FILE__,
@@ -943,7 +943,7 @@
                case Alias:
                case BootProgram:
                case IdlHeader:
-               case TypeLib:
+               case EmbeddedTypeLib:
                        return "";
        }
        throw InvalidOperationException ( __FILE__,
@@ -986,7 +986,7 @@
                case Alias:
                case BootProgram:
                case IdlHeader:
-               case TypeLib:
+               case EmbeddedTypeLib:
                        return "";
        }
        throw InvalidOperationException ( __FILE__,
@@ -1031,7 +1031,7 @@
                case RpcClient:
                case Alias:
                case IdlHeader:
-               case TypeLib:
+               case EmbeddedTypeLib:
                        return false;
        }
        throw InvalidOperationException ( __FILE__,
@@ -1063,7 +1063,7 @@
                case LiveIso:
                case IsoRegTest:
                case LiveIsoRegTest:
-               case TypeLib:
+               case EmbeddedTypeLib:
                        return true;
                case StaticLibrary:
                case ObjectLibrary:
@@ -1565,7 +1565,7 @@
                case RpcClient:
                case Alias:
                case IdlHeader:
-               case TypeLib:
+               case EmbeddedTypeLib:
                        return false;
        }
        throw InvalidOperationException ( __FILE__,
Modified: trunk/reactos/tools/rbuild/rbuild.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=…
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.h (original)
+++ trunk/reactos/tools/rbuild/rbuild.h Tue Jul  3 23:10:33 2007
@@ -274,7 +274,7 @@
        IdlHeader = 23,
        IsoRegTest = 24,
        LiveIsoRegTest = 25,
-       TypeLib = 26
+       EmbeddedTypeLib = 26
 };
 enum HostType