mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 20:35:50 +00:00
MacOS build system changes to switch to LDAP C SDK version 5.0 (bug 124244). Patches from peterv@netscape.com, r=dmose@netscape.com; sr=smfr@netscape.com; a=asa@mozilla.org
This commit is contained in:
parent
5e565e67aa
commit
1cc4fac6b0
@ -1022,6 +1022,26 @@ sub BuildClientDist()
|
||||
#LDAP
|
||||
if ($main::options{ldap})
|
||||
{
|
||||
# Create the ldap-standard.h file from the template
|
||||
#
|
||||
my($template) = ":mozilla:directory:c-sdk:ldap:include:ldap-standard-tmpl.h";
|
||||
my($template_modtime) = GetFileModDate($template);
|
||||
my($header) = ":mozilla:directory:c-sdk:ldap:include:ldap-standard.h";
|
||||
my($header_modtime) = (-e $header ? GetFileModDate($header) : 0);
|
||||
if ($template_modtime > $header_modtime) {
|
||||
open(STDIN, "<$template");
|
||||
open(STDOUT, ">$header");
|
||||
@ARGV = ("LDAP_VENDOR_NAME=mozilla.org", "LDAP_VENDOR_VERSION=500");
|
||||
do ":mozilla:directory:c-sdk:ldap:build:replace.pl";
|
||||
if ($@) {
|
||||
close(STDOUT);
|
||||
close(STDIN);
|
||||
die "Error: can't create ldap-standard.h from ldap-standard-tmpl.h";
|
||||
}
|
||||
close(STDOUT);
|
||||
close(STDIN);
|
||||
}
|
||||
|
||||
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:");
|
||||
|
@ -11,7 +11,7 @@ mozilla/nsprpub, NSPRPUB_PRE_4_2_CLIENT_BRANCH
|
||||
mozilla/security/nss, NSS_CLIENT_TAG
|
||||
mozilla/security/manager,
|
||||
mozilla/accessible,
|
||||
DirectorySDKSourceC, LDAPCSDK_40_BRANCH
|
||||
DirectorySDKSourceC, ldapcsdk_50_client_branch
|
||||
mozilla/lib/mac/Instrumentation
|
||||
mozilla/gfx2
|
||||
mozilla/modules/libpr0n
|
||||
|
@ -1051,13 +1051,6 @@
|
||||
<FILEKIND>Library</FILEKIND>
|
||||
<FILEFLAGS>WeakImport</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPConnectionCallbacks.c</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS></FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPServer.cpp</PATH>
|
||||
@ -1134,11 +1127,6 @@
|
||||
<PATH>LDAPClientDebug.shlb</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPConnectionCallbacks.c</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPServer.cpp</PATH>
|
||||
@ -2149,13 +2137,6 @@
|
||||
<FILEKIND>Library</FILEKIND>
|
||||
<FILEFLAGS>WeakImport</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPConnectionCallbacks.c</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS></FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPServer.cpp</PATH>
|
||||
@ -2232,11 +2213,6 @@
|
||||
<PATH>LDAPClient.shlb</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPConnectionCallbacks.c</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPServer.cpp</PATH>
|
||||
@ -3268,13 +3244,6 @@
|
||||
<FILEKIND>Library</FILEKIND>
|
||||
<FILEFLAGS>WeakImport</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPConnectionCallbacks.c</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS></FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPServer.cpp</PATH>
|
||||
@ -3359,11 +3328,6 @@
|
||||
<PATH>LDAPClientDebug.shlb</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPConnectionCallbacks.c</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPServer.cpp</PATH>
|
||||
@ -4390,13 +4354,6 @@
|
||||
<FILEKIND>Library</FILEKIND>
|
||||
<FILEFLAGS>WeakImport</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPConnectionCallbacks.c</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS></FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPServer.cpp</PATH>
|
||||
@ -4481,11 +4438,6 @@
|
||||
<PATH>LDAPClient.shlb</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPConnectionCallbacks.c</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPServer.cpp</PATH>
|
||||
@ -4522,12 +4474,6 @@
|
||||
<PATH>nsLDAPConnection.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<TARGETNAME>mozldapDebug.shlb</TARGETNAME>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsLDAPConnectionCallbacks.c</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<TARGETNAME>mozldapDebug.shlb</TARGETNAME>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
|
Loading…
Reference in New Issue
Block a user