diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-10-29 02:21:51 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-10-29 02:21:51 +0000 |
| commit | 1edb0d5cd52be6c43a2291997468d7ff413f6a21 (patch) | |
| tree | 2b39b7c681498ecff7947fba1ae3f1b9d09792a5 /buildpaths.mk | |
| parent | 3d5f79ddfc4b6f9c6ee97c1e7a300bdc7ba90d01 (diff) | |
| download | ds-1edb0d5cd52be6c43a2291997468d7ff413f6a21.tar.gz ds-1edb0d5cd52be6c43a2291997468d7ff413f6a21.tar.xz ds-1edb0d5cd52be6c43a2291997468d7ff413f6a21.zip | |
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
Diffstat (limited to 'buildpaths.mk')
| -rw-r--r-- | buildpaths.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/buildpaths.mk b/buildpaths.mk index 0693c2ba..27bae67e 100644 --- a/buildpaths.mk +++ b/buildpaths.mk @@ -122,7 +122,10 @@ ADMINUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../adminutil 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 @@ LDAPCONSOLE_SOURCE_ROOT = $(BUILD_ROOT)/../directoryconsole # 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) |