mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 05:37:44 +00:00
renamed TypeLib target to EmbeddedTypeLib
svn path=/trunk/; revision=27374
This commit is contained in:
parent
c9c06660a0
commit
ccf9439e1e
|
@ -265,8 +265,8 @@ MingwModuleHandler::InstanciateHandler (
|
||||||
case IdlHeader:
|
case IdlHeader:
|
||||||
handler = new MingwIdlHeaderModuleHandler ( module );
|
handler = new MingwIdlHeaderModuleHandler ( module );
|
||||||
break;
|
break;
|
||||||
case TypeLib:
|
case EmbeddedTypeLib:
|
||||||
handler = new MingwTypeLibModuleHandler ( module );
|
handler = new MingwEmbeddedTypeLibModuleHandler ( module );
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw UnknownModuleTypeException (
|
throw UnknownModuleTypeException (
|
||||||
|
@ -1263,7 +1263,7 @@ MingwModuleHandler::GetIdlHeaderFilename ( string basename ) const
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
MingwModuleHandler::GenerateWidlCommandsTypeLib (
|
MingwModuleHandler::GenerateWidlCommandsEmbeddedTypeLib (
|
||||||
const CompilationUnit& compilationUnit,
|
const CompilationUnit& compilationUnit,
|
||||||
const string& widlflagsMacro )
|
const string& widlflagsMacro )
|
||||||
{
|
{
|
||||||
|
@ -1272,19 +1272,22 @@ MingwModuleHandler::GenerateWidlCommandsTypeLib (
|
||||||
string dependencies = filename;
|
string dependencies = filename;
|
||||||
dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
|
dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
|
||||||
|
|
||||||
string TypeLibFilename = module.GetTargetName ();
|
string basename = GetBasename ( filename );
|
||||||
|
string EmbeddedTypeLibFilename = basename + ".tlb";
|
||||||
|
|
||||||
fprintf ( fMakefile,
|
fprintf ( fMakefile,
|
||||||
"%s: %s $(WIDL_TARGET) | %s\n",
|
"%s: %s $(WIDL_TARGET) | %s\n",
|
||||||
GetTargetMacro ( module ).c_str (),
|
GetTargetMacro ( module ).c_str (),
|
||||||
dependencies.c_str (),
|
dependencies.c_str (),
|
||||||
GetDirectory ( TypeLibFilename ).c_str () );
|
GetDirectory ( EmbeddedTypeLibFilename ).c_str () );
|
||||||
fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" );
|
fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" );
|
||||||
fprintf ( fMakefile,
|
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)",
|
"$(Q)$(WIDL_TARGET)",
|
||||||
GetWidlFlags ( compilationUnit ).c_str (),
|
GetWidlFlags ( compilationUnit ).c_str (),
|
||||||
widlflagsMacro.c_str (),
|
widlflagsMacro.c_str (),
|
||||||
|
EmbeddedTypeLibFilename.c_str(),
|
||||||
filename.c_str () );
|
filename.c_str () );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1366,8 +1369,8 @@ MingwModuleHandler::GenerateWidlCommands (
|
||||||
else if ( module.type == RpcClient )
|
else if ( module.type == RpcClient )
|
||||||
GenerateWidlCommandsClient ( compilationUnit,
|
GenerateWidlCommandsClient ( compilationUnit,
|
||||||
widlflagsMacro );
|
widlflagsMacro );
|
||||||
else if ( module.type == TypeLib )
|
else if ( module.type == EmbeddedTypeLib )
|
||||||
GenerateWidlCommandsTypeLib ( compilationUnit,
|
GenerateWidlCommandsEmbeddedTypeLib ( compilationUnit,
|
||||||
widlflagsMacro );
|
widlflagsMacro );
|
||||||
else // applies also for other module.types which include idl files
|
else // applies also for other module.types which include idl files
|
||||||
GenerateWidlCommandsIdlHeader ( compilationUnit,
|
GenerateWidlCommandsIdlHeader ( compilationUnit,
|
||||||
|
@ -2492,7 +2495,7 @@ MingwKernelModeDLLModuleHandler::MingwKernelModeDLLModuleHandler (
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
MingwTypeLibModuleHandler::MingwTypeLibModuleHandler (
|
MingwEmbeddedTypeLibModuleHandler::MingwEmbeddedTypeLibModuleHandler (
|
||||||
const Module& module_ )
|
const Module& module_ )
|
||||||
|
|
||||||
: MingwModuleHandler ( module_ )
|
: MingwModuleHandler ( module_ )
|
||||||
|
@ -2500,7 +2503,7 @@ MingwTypeLibModuleHandler::MingwTypeLibModuleHandler (
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
MingwTypeLibModuleHandler::Process ()
|
MingwEmbeddedTypeLibModuleHandler::Process ()
|
||||||
{
|
{
|
||||||
GenerateRules ();
|
GenerateRules ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -172,7 +172,7 @@ private:
|
||||||
void GenerateWidlCommandsIdlHeader (
|
void GenerateWidlCommandsIdlHeader (
|
||||||
const CompilationUnit& compilationUnit,
|
const CompilationUnit& compilationUnit,
|
||||||
const std::string& widlflagsMacro );
|
const std::string& widlflagsMacro );
|
||||||
void GenerateWidlCommandsTypeLib (
|
void GenerateWidlCommandsEmbeddedTypeLib (
|
||||||
const CompilationUnit& compilationUnit,
|
const CompilationUnit& compilationUnit,
|
||||||
const std::string& widlflagsMacro );
|
const std::string& widlflagsMacro );
|
||||||
void GenerateWidlCommands ( const CompilationUnit& compilationUnit,
|
void GenerateWidlCommands ( const CompilationUnit& compilationUnit,
|
||||||
|
@ -505,10 +505,10 @@ public:
|
||||||
virtual void Process ();
|
virtual void Process ();
|
||||||
};
|
};
|
||||||
|
|
||||||
class MingwTypeLibModuleHandler : public MingwModuleHandler
|
class MingwEmbeddedTypeLibModuleHandler : public MingwModuleHandler
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MingwTypeLibModuleHandler ( const Module& module );
|
MingwEmbeddedTypeLibModuleHandler ( const Module& module );
|
||||||
virtual HostType DefaultHost() { return HostFalse; }
|
virtual HostType DefaultHost() { return HostFalse; }
|
||||||
virtual void Process ();
|
virtual void Process ();
|
||||||
};
|
};
|
||||||
|
|
|
@ -68,7 +68,7 @@ Bootstrap::IsSupportedModuleType ( ModuleType type )
|
||||||
case RpcClient:
|
case RpcClient:
|
||||||
case Alias:
|
case Alias:
|
||||||
case IdlHeader:
|
case IdlHeader:
|
||||||
case TypeLib:
|
case EmbeddedTypeLib:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
throw InvalidOperationException ( __FILE__,
|
throw InvalidOperationException ( __FILE__,
|
||||||
|
|
|
@ -839,8 +839,8 @@ Module::GetModuleType ( const string& location, const XMLAttribute& attribute )
|
||||||
return Alias;
|
return Alias;
|
||||||
if ( attribute.value == "idlheader" )
|
if ( attribute.value == "idlheader" )
|
||||||
return IdlHeader;
|
return IdlHeader;
|
||||||
if ( attribute.value == "typelib" )
|
if ( attribute.value == "embeddedtypelib" )
|
||||||
return TypeLib;
|
return EmbeddedTypeLib;
|
||||||
throw InvalidAttributeValueException ( location,
|
throw InvalidAttributeValueException ( location,
|
||||||
attribute.name,
|
attribute.name,
|
||||||
attribute.value );
|
attribute.value );
|
||||||
|
@ -892,7 +892,7 @@ Module::GetDefaultModuleExtension () const
|
||||||
case BootProgram:
|
case BootProgram:
|
||||||
case IdlHeader:
|
case IdlHeader:
|
||||||
return "";
|
return "";
|
||||||
case TypeLib:
|
case EmbeddedTypeLib:
|
||||||
return ".tlb";
|
return ".tlb";
|
||||||
}
|
}
|
||||||
throw InvalidOperationException ( __FILE__,
|
throw InvalidOperationException ( __FILE__,
|
||||||
|
@ -943,7 +943,7 @@ Module::GetDefaultModuleEntrypoint () const
|
||||||
case Alias:
|
case Alias:
|
||||||
case BootProgram:
|
case BootProgram:
|
||||||
case IdlHeader:
|
case IdlHeader:
|
||||||
case TypeLib:
|
case EmbeddedTypeLib:
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
throw InvalidOperationException ( __FILE__,
|
throw InvalidOperationException ( __FILE__,
|
||||||
|
@ -986,7 +986,7 @@ Module::GetDefaultModuleBaseaddress () const
|
||||||
case Alias:
|
case Alias:
|
||||||
case BootProgram:
|
case BootProgram:
|
||||||
case IdlHeader:
|
case IdlHeader:
|
||||||
case TypeLib:
|
case EmbeddedTypeLib:
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
throw InvalidOperationException ( __FILE__,
|
throw InvalidOperationException ( __FILE__,
|
||||||
|
@ -1031,7 +1031,7 @@ Module::IsDLL () const
|
||||||
case RpcClient:
|
case RpcClient:
|
||||||
case Alias:
|
case Alias:
|
||||||
case IdlHeader:
|
case IdlHeader:
|
||||||
case TypeLib:
|
case EmbeddedTypeLib:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
throw InvalidOperationException ( __FILE__,
|
throw InvalidOperationException ( __FILE__,
|
||||||
|
@ -1063,7 +1063,7 @@ Module::GenerateInOutputTree () const
|
||||||
case LiveIso:
|
case LiveIso:
|
||||||
case IsoRegTest:
|
case IsoRegTest:
|
||||||
case LiveIsoRegTest:
|
case LiveIsoRegTest:
|
||||||
case TypeLib:
|
case EmbeddedTypeLib:
|
||||||
return true;
|
return true;
|
||||||
case StaticLibrary:
|
case StaticLibrary:
|
||||||
case ObjectLibrary:
|
case ObjectLibrary:
|
||||||
|
@ -1565,7 +1565,7 @@ AutoRegister::IsSupportedModuleType ( ModuleType type )
|
||||||
case RpcClient:
|
case RpcClient:
|
||||||
case Alias:
|
case Alias:
|
||||||
case IdlHeader:
|
case IdlHeader:
|
||||||
case TypeLib:
|
case EmbeddedTypeLib:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
throw InvalidOperationException ( __FILE__,
|
throw InvalidOperationException ( __FILE__,
|
||||||
|
|
|
@ -274,7 +274,7 @@ enum ModuleType
|
||||||
IdlHeader = 23,
|
IdlHeader = 23,
|
||||||
IsoRegTest = 24,
|
IsoRegTest = 24,
|
||||||
LiveIsoRegTest = 25,
|
LiveIsoRegTest = 25,
|
||||||
TypeLib = 26
|
EmbeddedTypeLib = 26
|
||||||
};
|
};
|
||||||
|
|
||||||
enum HostType
|
enum HostType
|
||||||
|
|
Loading…
Reference in a new issue