[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.38,1.39
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Sat Oct 29 02:21:59 UTC 2005
- Previous message (by thread): [Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw Makefile, 1.9, 1.10 build.xml, 1.6, 1.7
- Next message (by thread): [Fedora-directory-commits] ldapserver Makefile, 1.26, 1.27 component_versions.mk, 1.38, 1.39 internal_comp_deps.mk, 1.28, 1.29 nsdefs.mk, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21391/ldapserver/ldap/cm
Modified Files:
Makefile
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: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile 27 Oct 2005 14:12:40 -0000 1.38
+++ Makefile 29 Oct 2005 02:21:51 -0000 1.39
@@ -106,9 +106,9 @@
endif
ifdef USE_64
-VERSION=-ver 7.1-64bit
+VERSION=-ver 1.0-64bit
else
-VERSION=-ver 7.1
+VERSION=-ver 1.0
endif
ifeq ($(ARCH), HPUX)
@@ -185,10 +185,6 @@
PACKAGE_STAGE_DIR=$(OBJDIR)/package
endif
-ifdef INTERNAL_BUILD
- PERLDAP := perldap
-endif
-
# these are files and directories in the import adminsrv directory which we don't
# make a local copy of, we just import directly into the tar file or create a
# symlink to
@@ -225,7 +221,7 @@
ifdef BUILD_PATCH
PATCHINSTDIR = $(ABS_INSTDIR)-SP
-SLAPDSP = slapd-71
+SLAPDSP = slapd-10
endif
INST_TARGET_RESKIT=$(INSTDIR)/reskit
@@ -261,7 +257,7 @@
ifdef BUILD_RPM
# name and version of RPM - must correspond to the spec file - these get branded
RPM_BASE_NAME=fedora
- RPM_VERSION=7.1
+ RPM_VERSION=1.0
RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION)
RPM_ARCH = $(shell uname -i)
# root dir for RPM built and temp files
@@ -340,8 +336,8 @@
# install the DSMLGW into the client directory
ifeq ($(USE_DSMLGW), 1)
$(MKDIR) $(RELDIR)/clients/dsmlgw
- if [ -d $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis ] ; then \
- $(CP) -R $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/ ; \
+ if [ -d $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis ] ; then \
+ $(CP) -R $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/ ; \
fi
$(INSTALL) -m 644 $(NSDIST)/dsmlgw/dsmlgw.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
@@ -349,7 +345,7 @@
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
# now time to move the necessary jars in place
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/ldapjdk.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(LDAPJARFILE) $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
# if you use the jaxrpc.jar from the axis distribution, you don't need the api file
# or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa
@@ -473,9 +469,9 @@
endif
ifeq ($(USE_JAVATOOLS), 1)
$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
- $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSONJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
- if [ -f $(NSDIST)/classes/$(CRIMSON_LICENSE) ] ; then \
- $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) ; \
+ $(INSTALL) -m 644 $(CRIMSONJAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
+ if [ -f $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) ] ; then \
+ $(INSTALL) -m 644 $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) ; \
fi
endif
@@ -552,25 +548,6 @@
# For security reason, it's readable only by the owner
chmod 700 $(RELDIR)/bin/slapd/server
-# this is the rule to pull PerLDAP
-ifndef PERLDAP_PULL_METHOD
-PERLDAP_PULL_METHOD = FTP
-endif
-
-$(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE):
-ifdef INTERNAL_BUILD
- $(RM) $@
- $(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \
- -objdir $(dir $@) \
- -componentdir $(PERLDAP_COMPONENT_DIR) \
- -files $(notdir $@),perldap.inf
- @if [ ! -f $@ ] ; \
- then echo "Error: could not get component PERLDAP file $@" ; \
- exit 1 ; \
- fi
- $(PERL) -w fixPerlDAPInf.pl $(dir $@)/perldap.inf
-endif
-
$(INSTDIR)/slapd:
$(MKDIR) -p $@
@@ -580,7 +557,6 @@
# ---THE UNIX PACKAGE---
packageDirectory: $(INSTDIR)/slapd \
- $(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE) \
$(ADMSERV_DEP)
# this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others
@@ -675,6 +651,7 @@
for file in $(ADMINSERVER_SUBCOMPS) ; \
do rm -rf $(INSTDIR)/$$file ; \
cp -r $(ADMSERV_DIR)/$$file $(INSTDIR)/$$file ; \
+ rm -rf $(INSTDIR)/$$file/unzipped ; \
done ; \
fi
@@ -702,14 +679,14 @@
ifdef BUILD_SHIP
ifndef BUILD_PATCH
cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
- $(PERLDAP) dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
+ dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
endif
ifeq ($(DEBUG), optimize)
# $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
endif
else
cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
- $(PERLDAP) dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+ dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
endif # BUILD_SHIP
#cp $(INSTDIR).tar.gz $(BUILD_SHIP)
#cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz $(BUILD_SHIP)
@@ -882,11 +859,9 @@
SLAPD_DIR=slapd
-_perl: $(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE)
-
# ------------------------- all below this line is packageDirectory --------------------------
-packageDirectory: $(INSTDIR)/$(SLAPD_DIR) _admserv_files _perl _slapd_files _setup_files make_zip
+packageDirectory: $(INSTDIR)/$(SLAPD_DIR) _admserv_files _slapd_files _setup_files make_zip
#-------------------------- admserv rules ----------------------------------------------------
_admserv_files: $(INSTDIR) $(ADMSERV_DEP)
- Previous message (by thread): [Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw Makefile, 1.9, 1.10 build.xml, 1.6, 1.7
- Next message (by thread): [Fedora-directory-commits] ldapserver Makefile, 1.26, 1.27 component_versions.mk, 1.38, 1.39 internal_comp_deps.mk, 1.28, 1.29 nsdefs.mk, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list