diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-10-27 14:12:40 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-10-27 14:12:40 +0000 |
| commit | 3b9f0ee6f85adb22d5a0c3fc656212e64e6dc6f3 (patch) | |
| tree | 695abf67eb134c492722cfb7a5a4b099272848c9 | |
| parent | 899056900648423b9d6144a2a848bd0b8998e66f (diff) | |
Bug(s) fixed: 171854
Bug Description: Allow DSMLGW to build with GAR build scripts
Reviewed by: nhosoi@redhat.com (Thanks!)
Fix Description: Add a new macro DSMLGWJARS_BUILD_DIR which defaults to
dist/classes for internal builds. For external builds, the developer
can grab these jars from their respective locations, or grab the bundle
from the fds download site, which is what the GAR builds will do. The
location is then passed in on the make command line as
DSMLGWJARS_BUILD_DIR=/path/to/dsmlgwjars. Regular internal builds
should continue to work as always.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
| -rw-r--r-- | buildpaths.mk | 3 | ||||
| -rw-r--r-- | internal_buildpaths.mk | 2 | ||||
| -rw-r--r-- | ldap/clients/dsmlgw/Makefile | 2 | ||||
| -rw-r--r-- | ldap/cm/Makefile | 16 |
4 files changed, 14 insertions, 9 deletions
diff --git a/buildpaths.mk b/buildpaths.mk index 83ee4069..0693c2ba 100644 --- a/buildpaths.mk +++ b/buildpaths.mk @@ -135,5 +135,8 @@ LDAPCONSOLE_SOURCE_ROOT = $(BUILD_ROOT)/../directoryconsole # 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 +DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT) diff --git a/internal_buildpaths.mk b/internal_buildpaths.mk index 9416009c..90de290d 100644 --- a/internal_buildpaths.mk +++ b/internal_buildpaths.mk @@ -139,3 +139,5 @@ endif # SETUPUTIL_SOURCE_ROOT ifndef ADMINSERVER_SOURCE_ROOT ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver endif + +DSMLGWJARS_BUILD_DIR = $(CLASS_DEST) diff --git a/ldap/clients/dsmlgw/Makefile b/ldap/clients/dsmlgw/Makefile index f7afbe5c..2b427027 100644 --- a/ldap/clients/dsmlgw/Makefile +++ b/ldap/clients/dsmlgw/Makefile @@ -49,7 +49,7 @@ all: $(ANT_DEP) $(LDAPJDK_DEP) @if [ ! -f $(CLASS_DEST)/axis.jar ]; then \ cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST) ; \ fi - $(ANT) + $(ANT) -Dglobaldist.dir=$(DSMLGWJARS_BUILD_DIR) clean: $(ANT) clean diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile index bc55e012..5d23d82c 100644 --- a/ldap/cm/Makefile +++ b/ldap/cm/Makefile @@ -349,18 +349,18 @@ ifeq ($(USE_DSMLGW), 1) $(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 $(NSDIST)/classes/ldapjdk.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib - $(INSTALL) -m 644 $(NSDIST)/classes/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/ldapjdk.jar $(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 # if so, I'm not sure where to get the implementation - if [ -f $(NSDIST)/classes/jaxrpc-api.jar ] ; then \ - $(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib ; \ + if [ -f $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar ] ; then \ + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib ; \ fi - $(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib - $(INSTALL) -m 644 $(NSDIST)/classes/saaj.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib - $(INSTALL) -m 644 $(NSDIST)/classes/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib - $(INSTALL) -m 644 $(NSDIST)/classes/xml-apis.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/saaj.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xml-apis.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib endif # USE_DSMLGW # PACKAGE_UNDER_JAVA is defined in components.mk - these are component .jar files to install |