Bug(s) fixed: 172056

Bug Description: Fix internal component versions and formats for initial
FDS 1.0 build
Reviewed by: Noriko (Thanks!)
Fix Description: Some of the naming conventions needed to change e.g.
/s/b/c/ldapconsole10ext became /fedora/components/directoryconsole/1.0.
Made the ds onlinehelp docs available to build externally.  Perldap has
no zip file anymore, just the dirs we copy over.  Adminserver includes
the unzipped directories - we need to fix that eventually, but in the
meantime, I made tar skip those unzipped directories.  I also merged
Noriko's fix for the assecure.txt problem in setup into Fedora DS.  Noriko also pointed out an unused Makefile variable.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no

buildpaths.mk

@@ -141,3 +141,5 @@ LDAPCONSOLE_SOURCE_ROOT = $(BUILD_ROOT)/../directoryconsole
 DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars
 
 PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
+
+ONLINEHELP_SOURCE_ROOT = $(BUILD_ROOT)/../dsonlinehelp

component_versions.mk

@@ -161,14 +161,14 @@ ifndef LDAPCONSOLE_REL
   LDAPCONSOLE_REL=10
 endif
 ifndef LDAPCONSOLE_COMP
-  LDAPCONSOLE_COMP = ldapconsole$(LDAPCONSOLE_REL)
+  LDAPCONSOLE_COMP = directoryconsole
 endif
 ifndef LDAPCONSOLE_RELDATE
-  LDAPCONSOLE_RELDATE=20051028
+  LDAPCONSOLE_RELDATE=1.0/20051028
 endif
 
 ifndef PERLDAP_VERSION
-  PERLDAP_VERSION=20051028
+  PERLDAP_VERSION=1.5/20051028
 endif
 
 ifndef JSS_COMP
@@ -205,7 +205,7 @@ endif
 
 # DOC
 ifndef DSDOC_RELDATE
-  DSDOC_RELDATE = 20050311
+  DSDOC_RELDATE = 20051028
 endif
 
 # WIX

components.mk

@@ -576,6 +576,29 @@ endif
 LDAPCONSOLEJAR = ds$(LDAPCONSOLE_REL).jar
 LDAPCONSOLEJAR_EN = ds$(LDAPCONSOLE_REL)_en.jar
 
+#### online help docs ######
+ifndef ONLINEHELP_SOURCE_ROOT
+  DSDOC_DIR = $(ABS_ROOT)/../dist/dsdoc
+else
+  DSDOC_DIR = $(ONLINEHELP_SOURCE_ROOT)
+endif
+DSDOC_CLIENTS = slapd_clients.zip
+DSDOC_COPYRIGHT = slapd_copyright.zip
+
+########### PerLDAP #############
+ifdef PERLDAP_SOURCE_ROOT
+  PERLDAP_BUILT_DIR = $(PERLDAP_SOURCE_ROOT)/directory/perldap/blib
+# else set in internal_buildpaths.mk and pulled in internal_comp_deps.mk
+endif
+
+PERLDAP_ARCHLIB_DIR = $(PERLDAP_BUILT_DIR)/arch
+PERLDAP_LIB_DIR = $(PERLDAP_BUILT_DIR)/lib/Mozilla
+PERLDAP_AUTOLIB_DIR = $(PERLDAP_BUILT_DIR)/lib/auto
+# under the serverroot/lib directory, we should have a perl directory which contains arch/, auto/, and Mozilla/
+PACKAGE_SRC_DEST += $(PERLDAP_ARCHLIB_DIR) lib/perl
+PACKAGE_SRC_DEST += $(PERLDAP_LIB_DIR) lib/perl
+PACKAGE_SRC_DEST += $(PERLDAP_AUTOLIB_DIR) lib/perl
+
 # must define dependencies last because they depend on the definitions above
 ifeq ($(INTERNAL_BUILD), 1)
 include $(BUILD_ROOT)/internal_comp_deps.mk
@@ -747,17 +770,3 @@ endif
 else
 	-@echo "MAVEN is not required except on Windows."
 endif #WINNT
-
-########### PerLDAP #############
-ifdef PERLDAP_SOURCE_ROOT
-  PERLDAP_BUILT_DIR = $(PERLDAP_SOURCE_ROOT)/directory/perldap/blib
-# else set in internal_buildpaths.mk and pulled in internal_comp_deps.mk
-endif
-
-PERLDAP_ARCHLIB_DIR = $(PERLDAP_BUILT_DIR)/arch
-PERLDAP_LIB_DIR = $(PERLDAP_BUILT_DIR)/lib/Mozilla
-PERLDAP_AUTOLIB_DIR = $(PERLDAP_BUILT_DIR)/lib/auto
-# under the serverroot/lib directory, we should have a perl directory which contains arch/, auto/, and Mozilla/
-PACKAGE_SRC_DEST += $(PERLDAP_ARCHLIB_DIR) lib/perl
-PACKAGE_SRC_DEST += $(PERLDAP_LIB_DIR) lib/perl
-PACKAGE_SRC_DEST += $(PERLDAP_AUTOLIB_DIR) lib/perl

internal_comp_deps.mk

@@ -327,8 +327,8 @@ ifeq ($(BUILD_MODE), int)
   ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
 # ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
 else
-  ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
-#  ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+#  ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+  ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
 endif
 ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil
 
@@ -550,8 +550,12 @@ endif
 ###########################################################
 
 #LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV)
+ifeq ($(BUILD_MODE), int)
 LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR)
-LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/ldapconsole/$(LDAPCONSOLE_COMP)$(BUILD_MODE)/$(LDAPCONSOLE_RELDATE)/jars
+else
+LDAPCONSOLE_RELEASE=$(FED_COMPONENTS_DIR)
+endif
+LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/$(LDAPCONSOLE_COMP)/$(LDAPCONSOLE_RELDATE)/jars
 LDAPCONSOLE_DEP = $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR)
 LDAPCONSOLE_FILES=$(LDAPCONSOLEJAR),$(LDAPCONSOLEJAR_EN)
 
@@ -573,7 +577,11 @@ endif
 ### Perldap package #######################################
 
 #PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
-PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
+ifeq ($(BUILD_MODE), int)
+PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
+else
+PERLDAP_COMPONENT_DIR = $(FED_COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
+endif
 PERLDAP_FILES=lib,arch
 PERLDAP_DEP = $(PERLDAP_BUILT_DIR)/lib
 
@@ -584,12 +592,12 @@ endif
 
 $(PERLDAP_DEP):
 ifdef INTERNAL_BUILD
-	$(RM) $@
+	$(RM) -rf $@
 	$(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \
 		-objdir $(dir $@) \
 		-componentdir $(PERLDAP_COMPONENT_DIR) \
 		-files $(PERLDAP_FILES)
-	@if [ ! -f $@ ] ; \
+	@if [ ! -d $@ ] ; \
 	then echo "Error: could not get component PERLDAP file $@" ; \
 	exit 1 ; \
 	fi
@@ -603,12 +611,15 @@ ADMIN_REL_DATE = $(ADM_VERSION)
 #ADMIN_FILE = adminserver.tar.gz
 ADMIN_FILE = $(subst $(SPACE),$(COMMA),$(ADMINSERVER_SUBCOMPS))
 ADMIN_FILE_TAR = adminserver.tar
+ifeq ($(BUILD_MODE), int)
 IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
-IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
+else
+IMPORTADMINSRV_BASE=$(FED_COMPONENTS_DIR)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
+endif
+IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME)
 ADMSERV_DEP = $(ADMSERV_DIR)/admin/admin.inf
 
 ADM_VERSION = $(ADM_RELDATE)
-ADM_RELEASE = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(NSOBJDIR_NAME)
 
 ifndef ADMSERV_PULL_METHOD
 ADMSERV_PULL_METHOD = $(COMPONENT_PULL_METHOD)
@@ -632,13 +643,14 @@ endif
 
 ### DOCS #################################
 # this is where the build looks for slapd docs
-DSDOC_DIR = $(ABS_ROOT)/../dist/dsdoc
-DSDOC_VERSDIR = $(DIR_NORM_VERSION)$(BUILD_MODE)
-#DSDOC_RELEASE = $(COMPONENTS_DIR_DEV)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE)
-DSDOC_RELEASE = $(COMPONENTS_DIR)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE)
+DSDOC_VERSDIR = $(DIR_NORM_VERSION)
+ifeq ($(BUILD_MODE), int)
+#DSDOC_RELEASE = $(COMPONENTS_DIR_DEV)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE)
+DSDOC_RELEASE = $(COMPONENTS_DIR)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE)
+else
+DSDOC_RELEASE = $(FED_COMPONENTS_DIR)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE)
+endif
 
-DSDOC_CLIENTS = slapd_clients.zip
-DSDOC_COPYRIGHT = slapd_copyright.zip
 DSDOC_FILES = $(DSDOC_COPYRIGHT),$(DSDOC_CLIENTS)
 DSDOC_DEP := $(DSDOC_DIR)/$(DSDOC_COPYRIGHT)
 

ldap/cm/Makefile

@@ -70,6 +70,8 @@ endif
 
 MMDD = $(shell date +%m.%d)
 
+TMPLIST := $(shell echo /tmp/build.$$$$)
+
 # we don't want to build with warnings-as-errors for the cm/ stuff, because
 # it's crappy C++ code which is LITTERED with warnings, most of which we
 # can't fix because it comes from files in dist/, etc.
@@ -483,16 +485,24 @@ endif
 # docs
 	-$(RM) -r $(RELDIR)/manual/en/slapd
 	-$(MKDIR) $(RELDIR)/manual/en/slapd
-	if [ "$(DSDOC_DIR)" -a -d "$(DSDOC_DIR)" ] ; then \
+# copy over the manual files built in our build tree
+	if [ -d "$(OBJDIR)/manual/slapd" ] ; then \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/help/*.* $(RELDIR)/manual/en/slapd/help ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.map $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.htm $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/pixel.gif $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/topicindex.htm $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/tokens.map $(RELDIR)/manual/en/slapd/ ; \
+    fi
+# copy the manual files from the zip files or checked out directory
+	if [ "$(DSDOC_DIR)" -a -d "$(DSDOC_DIR)" ] ; then \
 	  cd $(RELDIR)/manual/en/slapd; \
-	  $(UNZIP) $(DSDOC_DIR)/$(DSDOC_COPYRIGHT); \
-	  $(UNZIP) $(DSDOC_DIR)/$(DSDOC_CLIENTS); \
+      if [ -f $(DSDOC_DIR)/$(DSDOC_COPYRIGHT) ] ; then \
+	    $(UNZIP) $(DSDOC_DIR)/$(DSDOC_COPYRIGHT); \
+	    $(UNZIP) $(DSDOC_DIR)/$(DSDOC_CLIENTS); \
+      else \
+        cp -r $(DSDOC_DIR) . ; \
+      fi ; \
 	fi
 
 ifdef USE_PURIFY
@@ -651,7 +661,6 @@ endif
 		for file in $(ADMINSERVER_SUBCOMPS) ; \
 			do rm -rf $(INSTDIR)/$$file ; \
 			cp -r $(ADMSERV_DIR)/$$file $(INSTDIR)/$$file ; \
-			rm -rf $(INSTDIR)/$$file/unzipped ; \
 		done ; \
 	fi
 
@@ -685,8 +694,11 @@ ifeq ($(DEBUG), optimize)
 #	$(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
 endif
 else
+	echo base/unzipped > $(TMPLIST)
+	echo admin/unzipped >> $(TMPLIST)
 	cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd  \
-	dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+	dsktune $(ADMIN_IMPORTS) -X $(TMPLIST) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+	rm -f $(TMPLIST)
 endif # BUILD_SHIP
 #cp $(INSTDIR).tar.gz  $(BUILD_SHIP)
 #cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz  $(BUILD_SHIP)

ldap/cm/newinst/setup

@@ -312,38 +312,43 @@ adminXmlSSLOn() {
 }
 
 SSLOn() {
-	for dir in `cat dssecure.txt` ; do
-		if [ -f $dir/config/dse.ldif ]; then
-			security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
-			$dir/stop-slapd
-			cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
-			mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
-			echo "$dir/config/dse.ldif: SSL on ..."
-			echo "Restarting Directory Server: $dir/start-slapd"
-			$dir/start-slapd
-		fi
-	done
+	if [ -f dssecure.txt ]; then
+		for dir in `cat dssecure.txt` ; do
+			if [ -f $dir/config/dse.ldif ]; then
+				security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+				$dir/stop-slapd
+				cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
+				mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+				echo "$dir/config/dse.ldif: SSL on ..."
+				echo "Restarting Directory Server: $dir/start-slapd"
+				$dir/start-slapd
+			fi
+		done
+		rm -f dssecure.txt > /dev/null 2>&1
+	fi
 
 	if [ $isadminsslon -ne 0 ]; then
 		$sroot/stop-admin
 	fi
-	for confline in `cat assecure.txt` ; do
-		conffile=`echo $confline | awk -F= '{print $1}'`
-		confparam=`echo $confline | awk -F= '{print $2}'`
-		echo $conffile | grep "\.xml$" > /dev/null 2>&1
-		rval=$?
-		if [ $rval -eq 0 ]; then
-			adminXmlSSLOn $conffile $confparam
-		else
-			adminSSLOn $conffile $confparam
-		fi
-	done
+	if [ -f assecure.txt ]; then
+		for confline in `cat assecure.txt` ; do
+			conffile=`echo $confline | awk -F= '{print $1}'`
+			confparam=`echo $confline | awk -F= '{print $2}'`
+			echo $conffile | grep "\.xml$" > /dev/null 2>&1
+			rval=$?
+			if [ $rval -eq 0 ]; then
+				adminXmlSSLOn $conffile $confparam
+			else
+				adminSSLOn $conffile $confparam
+			fi
+		done
+		rm -f assecure.txt > /dev/null 2>&1
+	fi
 	if [ $isadminsslon -ne 0 ]; then
 		echo "Restarting Administration Server: $sroot/start-admin"
 		$sroot/start-admin
 	fi
 
-	rm -f dssecure.txt assecure.txt > /dev/null 2>&1
 }
 
 # check whether it is an in-place installation
@@ -362,7 +367,7 @@ if [ -f $sroot/admin-serv/config/adm.conf ]; then
 		suitespotgroup=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $4}'`
 		admindomain=`echo $ldaphost | awk -F. '{print $5 ? $2 "." $3 "." $4 "." $5: $4 ? $2 "." $3 "." $4 : $3 ? $2 "." $3 : $2 ? $2 : ""}'`
 		if [ "$admindomain" = "" ]; then
-    		admindomain=`domainname`
+			admindomain=`domainname`
 		fi
 
 		echo "In order to reconfigure your installation, the Configuration Directory"
@@ -376,8 +381,8 @@ if [ -f $sroot/admin-serv/config/adm.conf ]; then
 		echo "administrator ID: $siepid"
 		siepasswd=""
 		while [ "$siepasswd" = "" ]; do
-    		printf "Password: "
-    		read siepasswd
+			printf "Password: "
+			read siepasswd
 		done
 
 		inffile=$sroot/setup/myinstall.inf