[Fedora-directory-commits] ldapserver buildpaths.mk, 1.7, 1.8 components.mk, 1.33, 1.34 internal_buildpaths.mk, 1.7, 1.8

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	buildpaths.mk components.mk internal_buildpaths.mk 
Log Message:
Bug(s) fixed: 171892
Bug Description: parameterize ldapjdk and crimson jar locations
Reviewed by: Noriko, Nathan (Thanks!)
Fix Description: This is also needed for GAR.  The xmltools also 
ldapjdk.jar, and needs crimson.jar.  DSMLGW does not need crimson.jar.  
It makes sense to separate these out of the dsmlgw jars.  I changed the 
dsmlgw build.xml to be able to pickup ldapjdk.jar from a different 
location - defaults to the usual dist/classes.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none

Bug(s) fixed: 172005
Bug Description: Change ldapserver version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: This also fixes some lingering build issues involving 
perldap, which is no longer a separate setup package, but just gets 
included into DS in a similar manner to nspr, nss, etc.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buildpaths.mk	27 Oct 2005 14:12:33 -0000	1.7
+++ buildpaths.mk	29 Oct 2005 02:21:40 -0000	1.8
@@ -122,7 +122,10 @@
 SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
 #SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
 
-LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+# it's customary and easier to use the pre-built jars
+#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+# Crimson - crimson.jar - http://xml.apache.org/crimson/
+#CRIMSON_SOURCE_DIR = $(BUILD_ROOT)/../crimson
 
 ADMINSERVER_SOURCE_ROOT = $(BUILD_ROOT)/../adminserver
 
@@ -134,9 +137,7 @@
 # Xerces-J - xercesImpl.jar, xml-apis.jar http://xml.apache.org/xerces2-j/download.cgi
 # JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html
 # JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html
-# Crimson - crimson.jar - http://xml.apache.org/crimson/
-# Also the ldapjdk.jar
-# all of these files need to be in the following directory
+# all of these files need to be in the following directory:
 DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars
 
 PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- components.mk	21 Oct 2005 19:21:04 -0000	1.33
+++ components.mk	29 Oct 2005 02:21:40 -0000	1.34
@@ -538,7 +538,8 @@
 LDAPJDK = ldapjdk.jar
 ifdef LDAPJDK_SOURCE_DIR
   LDAPJDK_DIR = $(LDAPJDK_SOURCE_DIR)/directory/java-sdk/dist/packages
-else
+endif
+ifndef LDAPJDK_DIR
   LDAPJDK_DIR = $(CLASS_DEST)
 endif
 LDAPJARFILE=$(LDAPJDK_DIR)/ldapjdk.jar
@@ -552,7 +553,13 @@
 
 CRIMSON_LICENSE = LICENSE.crimson
 CRIMSONJAR = crimson.jar
-CRIMSONJAR_FILE = $(CLASS_DEST)/$(CRIMSONJAR)
+ifdef CRIMSON_SOURCE_DIR
+  CRIMSONJAR_BUILD_DIR = $(CRIMSON_SOURCE_DIR)
+endif
+ifndef CRIMSONJAR_BUILD_DIR
+  CRIMSONJAR_BUILD_DIR = $(CLASS_DEST)
+endif
+CRIMSONJAR_FILE = $(CRIMSONJAR_BUILD_DIR)/$(CRIMSONJAR)
 
 ifdef ADMINSERVER_SOURCE_ROOT
   ADMSERV_DIR = $(ADMINSERVER_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)
@@ -744,12 +751,13 @@
 ########### PerLDAP #############
 ifdef PERLDAP_SOURCE_ROOT
   PERLDAP_BUILT_DIR = $(PERLDAP_SOURCE_ROOT)/directory/perldap/blib
-  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
-# else we're using the pre-built zip file - see ldap/cm/Makefile
+# 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_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_buildpaths.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- internal_buildpaths.mk	27 Oct 2005 14:12:33 -0000	1.7
+++ internal_buildpaths.mk	29 Oct 2005 02:21:40 -0000	1.8
@@ -141,3 +141,11 @@
 endif
 
 DSMLGWJARS_BUILD_DIR = $(CLASS_DEST)
+
+LDAPJDK_DIR = $(CLASS_DEST)
+
+CRIMSON_BUILD_DIR = $(CLASS_DEST)
+
+ifndef PERLDAP_SOURCE_ROOT
+PERLDAP_BUILT_DIR = $(NSCP_DISTDIR_FULL_RTL)/perldap
+endif