Testing landing of bug 359716 again to see if we've fixed the bustages. It may stay if we have. r=benjamin (build config),sr=mscott
authorbugzilla@standard8.demon.co.uk
Fri, 06 Apr 2007 01:53:28 -0700
changeset 388 07fef86da4ada1f4df7764226e78f4b2e03cf96b
parent 387 2309bc10b54a2ae9bdff04668ecc1d70a2f6edb7
child 389 18cb1f4a1a14d66d9c373c0eaed6a8fc8ffdc6cc
push idunknown
push userunknown
push dateunknown
reviewersbenjamin, mscott
bugs359716
milestone1.9a4pre
Testing landing of bug 359716 again to see if we've fixed the bustages. It may stay if we have. r=benjamin (build config),sr=mscott
client.mk
configure.in
xpinstall/packager/os2/browser.jst
xpinstall/packager/packages-os2
xpinstall/packager/packages-unix
xpinstall/packager/packages-win
xpinstall/packager/unix/browser.jst
xpinstall/packager/windows/browser.jst
--- a/client.mk
+++ b/client.mk
@@ -402,17 +402,17 @@ MODULES_all :=                          
 #######################################################################
 # Checkout Tags
 #
 # For branches, uncomment the MOZ_CO_TAG line with the proper tag,
 # and commit this file on that tag.
 #MOZ_CO_TAG          = <tag>
 NSPR_CO_TAG          = NSPRPUB_PRE_4_2_CLIENT_BRANCH
 NSS_CO_TAG           = NSS_3_11_5_RTM
-LDAPCSDK_CO_TAG      = ldapcsdk_5_17_client_branch
+LDAPCSDK_CO_TAG      = LDAPCSDK_6_0_3_CLIENT_BRANCH
 LOCALES_CO_TAG       =
 
 #######################################################################
 # Defines
 #
 CVS = cvs
 comma := ,
 
--- a/configure.in
+++ b/configure.in
@@ -7538,24 +7538,24 @@ dnl ====================================
 if test "$MOZ_DEBUG" || test "$NS_TRACE_MALLOC"; then
     MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=
 fi
 
 if test "$MOZ_LDAP_XPCOM"; then
     LDAP_CFLAGS='-I${DIST}/public/ldap'
     if test "$OS_ARCH" = "WINNT"; then
         if test -n "$GNU_CC"; then
-            LDAP_LIBS='-L$(DIST)/lib -lnsldap32v50 -lnsldappr32v50'
+            LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60'
         else
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v50.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v50.${IMPORT_LIB_SUFFIX}'
+            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}'
         fi
     elif test "$VACPP"; then
-            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap50.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap50.${IMPORT_LIB_SUFFIX}'
+            LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}'
     else
-        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap50 -llber50 -lprldap50'
+        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
     fi
 fi
 
 if test "$COMPILE_ENVIRONMENT"; then
 if test "$SUNCTL"; then
     dnl older versions of glib do not seem to have gmodule which ctl needs
     _SAVE_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS $GLIB_CFLAGS"
--- a/xpinstall/packager/os2/browser.jst
+++ b/xpinstall/packager/os2/browser.jst
@@ -152,16 +152,18 @@ function upgradeCleanup()
   deleteThisFile("Components", "xpcom_ds.xpt");
   deleteThisFile("Components", "xpcom_io.xpt");
   deleteThisFile("Components", "xpcom_threads.xpt");
   deleteThisFile("Components", "xpcom_xpti.xpt");
   deleteThisFile("Components", "xpconnect.xpt");
   deleteThisFile("Components", "xpinstall.xpt");
   deleteThisFile("Components", "xuldoc.xpt");
   deleteThisFile("Components", "xultmpl.xpt");
+  deleteThisFile("Program", "ldap50.dll");
+  deleteThisFile("Program", "prldap50.dll");
 }
 
 // main
 var srDest;
 var err;
 var fProgram;
 
 srDest = $SpaceRequired$:bin;
--- a/xpinstall/packager/packages-os2
+++ b/xpinstall/packager/packages-os2
@@ -310,20 +310,21 @@ bin/components/xulappinfo.xpt
 ; spellchecker (may not be present)
 bin/components/myspell.dll
 bin/components/spellchk.dll
 bin/components/spellchecker.xpt
 
 ; LDAP components need to be in the browser for AutoConfig
 bin/components/mozldap.dll
 bin/components/mozldap.xpt
-;bin/nsldap32v50.dll
-bin/ldap50.dll
-;bin/nsldappr32v50.dll
-bin/prldap50.dll
+;bin/nsldap32v60.dll
+bin/ldap60.dll
+;bin/nsldappr32v60.dll
+bin/prldap60.dll
+bin/ldif60.dll
 
 ; p3p
 bin/components/p3p.xpt
 bin/components/p3p.dll
 
 ; classic theme
 bin/chrome/classic.jar
 bin/chrome/classic.manifest
--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@@ -308,19 +308,19 @@ bin/components/libauth.so
 ; GnomeVFS support
 bin/components/libnkgnomevfs.so
 
 ; webservices
 bin/components/libwebsrvcs.so
 bin/components/websrvcs.xpt
 
 ; LDAP components need to be in the browser for AutoConfig
-bin/libldap50.so
-bin/libprldap50.so
-bin/liblber50.so
+bin/libldap60.so
+bin/libprldap60.so
+bin/libldif60.so
 bin/components/libmozldap.so
 bin/components/mozldap.xpt
 
 ; Roaming
 bin/components/libsroaming.so
 bin/chrome/sroaming.jar
 
 ; p3p
--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@@ -188,18 +188,19 @@ bin\components\websrvcs.xpt
 ; spellchecker (may not be present)
 bin\components\myspell.dll
 bin\components\spellchk.dll
 bin\components\spellchecker.xpt
 
 ; LDAP components need to be in the browser for AutoConfig
 bin\components\mozldap.dll
 bin\components\mozldap.xpt
-bin\nsldap32v50.dll
-bin\nsldappr32v50.dll
+bin\nsldap32v60.dll
+bin\nsldappr32v60.dll
+bin\nsldif32v60.dll
 
 ;PSM related files
 bin\components\pippki.dll
 bin\components\pippki.xpt
 bin\chrome\pipnss.jar
 bin\chrome\pippki.jar
 
 ; chrome stuff
--- a/xpinstall/packager/unix/browser.jst
+++ b/xpinstall/packager/unix/browser.jst
@@ -44,16 +44,19 @@ function upgradeCleanup()
   deleteThisFile("Components", "xptitemp.dat");
   deleteThisFile("Program",    "defaults/pref/config.js");
   deleteThisFile("Program",    "defaults/pref/initpref.js");
   deleteThisFile("Program",    "defaults/pref/bug307259.js");
   deleteThisFile("Program",    "defaults/wallet/URLFieldSchema.tbl");
   deleteThisFile("Program",    "libcmt.so");
   deleteThisFile("Program",    "libjpeg.so");
   deleteThisFile("Program",    "libprotocol.so");
+  deleteThisFile("Program",    "libldap50.so");
+  deleteThisFile("Program",    "libprldap50.so");
+  deleteThisFile("Program",    "liblber50.so");
 }
 
 var srDest = $SpaceRequired$;
 
 var err = initInstall("$AppDisplayName$ Navigator", "Browser", "$Version$"); 
 logComment("initInstall: " + err);
 
 var communicatorFolder = getFolder("Program");
--- a/xpinstall/packager/windows/browser.jst
+++ b/xpinstall/packager/windows/browser.jst
@@ -384,16 +384,18 @@ function upgradeCleanup()
   // need to be cleaned up.
   deleteThisFile("Program",    "oji.dll");
   deleteThisFile("Program",    "jsdom.dll");
   deleteThisFile("Program",    "img3250.dll");
   deleteThisFile("Program",    "gkgfxwin.dll");
   deleteThisFile("Program",    "gkwidget.dll");
   deleteThisFile("Program",    "jpeg3250.dll");
   deleteThisFile("Program",    "mozreg.dll");
+  deleteThisFile("Program",    "nsldap32v50.dll");
+  deleteThisFile("Program",    "nsldappr32v50.dll");
   deleteThisFile("Program",    "ISimpleDOMNodeMarshal.dll");
   deleteThisFile("Program",    "ISimpleDOMDocumentMarshal.dll");
   deleteThisFile("Program",    "defaults/pref/config.js");
   deleteThisFile("Program",    "defaults/pref/initpref.js");
   deleteThisFile("Program",    "defaults/pref/psm-glue.js");
   deleteThisFile("Program",    "defaults/pref/typeaheadfind.js");
   deleteThisFile("Program",    "defaults/pref/bug307259.js");
   deleteThisFile("Program",    "defaults/wallet/URLFieldSchema.tbl");