зеркало из https://github.com/mozilla/pjs.git
Making sure that we export & build LDAP before mailnews like we do on every other platform. This might fix the current bustage possibly related to bug #89198
This commit is contained in:
Родитель
65e904febe
Коммит
c4420406d6
|
@ -815,6 +815,15 @@ sub BuildClientDist()
|
|||
# XML-RPC
|
||||
InstallFromManifest(":mozilla:extensions:xml-rpc:idl:MANIFEST_IDL", "$distdirectory:idl:");
|
||||
|
||||
#LDAP
|
||||
if ($main::options{ldap})
|
||||
{
|
||||
InstallFromManifest(":mozilla:directory:c-sdk:ldap:include:MANIFEST", "$distdirectory:directory:");
|
||||
InstallFromManifest(":mozilla:directory:xpcom:base:public:MANIFEST", "$distdirectory:directory:");
|
||||
InstallFromManifest(":mozilla:directory:xpcom:base:public:MANIFEST_IDL", "$distdirectory:idl:");
|
||||
InstallFromManifest(":mozilla:xpfe:components:autocomplete:public:MANIFEST_IDL", "$distdirectory:idl:");
|
||||
}
|
||||
|
||||
# MAILNEWS
|
||||
InstallFromManifest(":mozilla:mailnews:public:MANIFEST", "$distdirectory:mailnews:");
|
||||
InstallFromManifest(":mozilla:mailnews:public:MANIFEST_IDL", "$distdirectory:idl:");
|
||||
|
@ -854,15 +863,6 @@ sub BuildClientDist()
|
|||
InstallFromManifest(":mozilla:extensions:transformiix:public:MANIFEST_IDL", "$distdirectory:idl:");
|
||||
}
|
||||
|
||||
#LDAP
|
||||
if ($main::options{ldap})
|
||||
{
|
||||
InstallFromManifest(":mozilla:directory:c-sdk:ldap:include:MANIFEST", "$distdirectory:directory:");
|
||||
InstallFromManifest(":mozilla:directory:xpcom:base:public:MANIFEST", "$distdirectory:directory:");
|
||||
InstallFromManifest(":mozilla:directory:xpcom:base:public:MANIFEST_IDL", "$distdirectory:idl:");
|
||||
InstallFromManifest(":mozilla:xpfe:components:autocomplete:public:MANIFEST_IDL", "$distdirectory:idl:");
|
||||
}
|
||||
|
||||
#XMLEXTRAS
|
||||
if ($main::options{xmlextras})
|
||||
{
|
||||
|
@ -1124,6 +1124,12 @@ sub BuildIDLProjects()
|
|||
|
||||
BuildIDLProject(":mozilla:xpinstall:macbuild:xpinstallIDL.mcp", "xpinstall");
|
||||
|
||||
if ($main::options{ldap})
|
||||
{
|
||||
BuildIDLProject(":mozilla:directory:xpcom:macbuild:mozldapIDL.mcp", "mozldap");
|
||||
BuildIDLProject(":mozilla:xpfe:components:autocomplete:macbuild:ldapAutoCompleteIDL.mcp", "ldapAutoComplete");
|
||||
}
|
||||
|
||||
BuildIDLProject(":mozilla:mailnews:base:macbuild:msgCoreIDL.mcp", "mailnews");
|
||||
BuildIDLProject(":mozilla:mailnews:compose:macbuild:msgComposeIDL.mcp", "MsgCompose");
|
||||
BuildIDLProject(":mozilla:mailnews:local:macbuild:msglocalIDL.mcp", "MsgLocal");
|
||||
|
@ -1148,12 +1154,6 @@ sub BuildIDLProjects()
|
|||
BuildIDLProject(":mozilla:extensions:transformiix:macbuild:transformiixIDL.mcp", "transformiix");
|
||||
}
|
||||
|
||||
if ($main::options{ldap})
|
||||
{
|
||||
BuildIDLProject(":mozilla:directory:xpcom:macbuild:mozldapIDL.mcp", "mozldap");
|
||||
BuildIDLProject(":mozilla:xpfe:components:autocomplete:macbuild:ldapAutoCompleteIDL.mcp", "ldapAutoComplete");
|
||||
}
|
||||
|
||||
if ($main::options{xmlextras})
|
||||
{
|
||||
BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlextrasIDL.mcp", "xmlextras");
|
||||
|
|
Загрузка…
Ссылка в новой задаче