DIRECTORY_C_SDK_30_BRANCH to TRUNK merge

git-svn-id: svn://10.0.0.236/trunk@7820 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/config/rules.mk

@@ -254,7 +254,9 @@ all:: export libs install
 #
 # Maybe this should be done in config/Makefile so it only happens once...?
 #
-TARGETS			+= tweak_nspr
+#XXXceb
+# Directory SDK doesn't use NSPR
+#TARGETS			+= tweak_nspr
 
 #
 # Since the NSPR folks won't help, we'll fix things the sneaky way.

mozilla/directory/buildsdk.txt

@@ -1,6 +1,7 @@
 ======================================================================
                     NETSCAPE DIRECTORY SDK FOR C: 
                          BUILD INSTRUCTIONS
+                     Last updated: May 31, 1998
 ======================================================================
 For information on the Netscape Directory SDK source release,
 see http://www.mozilla.org/directory/
@@ -27,6 +28,7 @@ Instructions:
    In csh/tcsh: 
       setenv MOZILLA_CLIENT 1
       setenv NO_MDUPDATE 1
+      setenv MOZ_LDAP_SDK 1
       unsetenv MOZ_LI 
       unsetenv MOZ_LITE 
       unsetenv MOZ_MEDIUM 
@@ -35,7 +37,8 @@ Instructions:
    In sh/bash/ksh:
       MOZILLA_CLIENT=1
       NO_MDUPDATE=1
-      export MOZILLA_CLIENT NO_MDUPDATE
+      MOZ_LDAP_SDK=1
+      export MOZILLA_CLIENT NO_MDUPDATE MOZ_LDAP_SDK
       unset MOZ_LI 
       unset MOZ_LITE 
       unset MOZ_MEDIUM 
@@ -43,12 +46,13 @@ Instructions:
 
 3. Build the SDK by entering the following commands:
 
-   cd ns
-   gmake
+   cd mozilla
+   gmake -f directory/ldapsdk.mk build
 
    The SDK will be built and copied into the following directories:
        mozilla/dist/public/ldap - header files
-       mozilla/dist/<architecture>/bin - LDAP API shared object/library
+       mozilla/dist/<architecture>/bin - LDAP API shared object/libraries
+         (libldap.so, liblber.so)
 
 
 Windows Build Instructions
@@ -95,6 +99,9 @@ Instructions:
    through the Control Panel | System control panel): 
        set HOME=(your home directory) 
        set MOZ_BITS=32
+       set MOZ_DEBUG=1
+       set MOZ_GOLD=0
+       set MOZ_JAVA=0
        set MOZ_NT=351 (if running NT 3.51, don't set otherwise) 
        set MOZ_SRC=(top of your source tree, drive letter and path. 
          For example, set MOZ_SRC=d:\mozilla_src, if the mozilla 
@@ -109,15 +116,13 @@ Instructions:
        set VERBOSE=1 
 
    Unset the following environment variables:
+       set MOZ_LI=
+       set MOZ_LITE=
        set MOZ_MEDIUM= 
-       set MOZ_LITE= 
-       set NO_SECURITY= 
-       set MOZ_LI= 
-       set MOZ_DATE= 
 
 2. Enter the following commands to build the SDK: 
-       cd ns 
-       nmake -f ldapsdk.mak build_ldap  
+       cd mozilla\directory 
+       nmake -f ldapsdk.mak
 
    The SDK will be built and copied into the following directories:
        mozilla\dist\public\ldap - header files

mozilla/directory/ldapsdk.mak

@@ -1,5 +1,19 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 !if !defined(MOZ_TOP)
 #enable builds from changed top level directories
@@ -22,7 +36,7 @@ HAVE_BRANCH=0
 #//
 
 
-LDAPSDK_BRANCH =-r Ldapsdk31_StableBuild
+LDAPSDK_BRANCH =-r DIRECTORY_C_SDK_30_BRANCH
 
 !if "$(MOZ_DATE)" != ""
 CVS_BRANCH=-D "$(MOZ_DATE)"
@@ -65,7 +79,7 @@ clobber_build_all:: 	clobber_all \
 pull_all:: 
 
 
-#    -cvs co $(LDAPSDK_BRANCH)  LDAPCClientLibrary
+#    -cvs co $(LDAPSDK_BRANCH) DirectorySDKSource
 
 
 
@@ -90,10 +104,9 @@ build_ldap:
 # remove all source files from the tree and print a report of what was missed
 #
 clobber_all:
-    cd $(MOZ_SRC)\directory\c-sdk\ldap\libraries\msdos\winsock
+    cd $(MOZ_SRC)\mozilla\directory\c-sdk\ldap\libraries\msdos\winsock
     $(NMAKE) -f nsldap.mak clobber_all
 
-
 depend:
     -del /s /q make.dep
     $(NMAKE) -f makefile.win depend

mozilla/directory/ldapsdk.mk

@@ -1,5 +1,18 @@
 #
-# God of Unix builds.
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
 #
 
 #
@@ -16,7 +29,7 @@ endif
 
 CVS_CMD		= cvs $(CVS_FLAGS)
 TARGETS		= export libs install
-LDAP_MODULE      = LDAPCClientLibrary
+LDAP_MODULE      = DirectorySDKSource
 
 
 #
@@ -32,7 +45,7 @@ endif
 
 
 ifndef MOZ_LDAPVER
-MOZ_LDAPVER = -r Ldapsdk31_StableBuild
+MOZ_LDAPVER = -r DIRECTORY_C_SDK_30_BRANCH
 endif
 
 
@@ -46,4 +59,13 @@ ifdef LDAP_MODULE
 endif
 
 build:
+	cd config; $(MAKE)
 	cd directory; $(MAKE) $(TARGETS)
+
+
+
+
+
+
+
+