[Fedora-directory-commits] ldapserver buildpaths.mk, 1.8, 1.9 component_versions.mk, 1.39, 1.40 components.mk, 1.34, 1.35 internal_comp_deps.mk, 1.29, 1.30

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3786/ldapserver

Modified Files:
	buildpaths.mk component_versions.mk components.mk 
	internal_comp_deps.mk 
Log Message:
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



Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- buildpaths.mk	29 Oct 2005 02:21:40 -0000	1.8
+++ buildpaths.mk	31 Oct 2005 15:55:24 -0000	1.9
@@ -141,3 +141,5 @@
 DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars
 
 PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
+
+ONLINEHELP_SOURCE_ROOT = $(BUILD_ROOT)/../dsonlinehelp


Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- component_versions.mk	29 Oct 2005 02:25:50 -0000	1.39
+++ component_versions.mk	31 Oct 2005 15:55:24 -0000	1.40
@@ -161,14 +161,14 @@
   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 @@
 
 # DOC
 ifndef DSDOC_RELDATE
-  DSDOC_RELDATE = 20050311
+  DSDOC_RELDATE = 20051028
 endif
 
 # WIX


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- components.mk	29 Oct 2005 02:21:40 -0000	1.34
+++ components.mk	31 Oct 2005 15:55:24 -0000	1.35
@@ -576,6 +576,29 @@
 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 @@
 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


Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- internal_comp_deps.mk	29 Oct 2005 02:25:50 -0000	1.29
+++ internal_comp_deps.mk	31 Oct 2005 15:55:24 -0000	1.30
@@ -327,8 +327,8 @@
   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 @@
 ###########################################################
 
 #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 @@
 ### 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 @@
 
 $(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_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 @@
 
 ### 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)