diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2006-09-06 16:56:44 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2006-09-06 16:56:44 +0000 |
| commit | 1198d440e04d163d0147382493e0356c508e9835 (patch) | |
| tree | 24be9513820e16c4dd4fb05f7921aa10d9bd98ac /Makefile | |
| parent | 0c389297612bdc3818f27a05116d7a00609d94c2 (diff) | |
| download | ds-1198d440e04d163d0147382493e0356c508e9835.tar.gz ds-1198d440e04d163d0147382493e0356c508e9835.tar.xz ds-1198d440e04d163d0147382493e0356c508e9835.zip | |
Bug(s) fixed: 205456
Bug Description: Enable core DS build
Reviewed by: nkinder, nhosoi (Thanks!)
Fix Description: I turned off all of the other components in the build,
such as adminserver, setuputil, clients, etc. and enabled the packaging
step when building just the core DS. Now, when you build just the core
DS, you get a slapd.tar.gz which you unpack in the server root you
create e.g. mkdir /opt/rhds ; cd /opt/rhds ; tar xfz slapd.tar.gz
In order to create an instance, you have to use the ds_newinst.pl script
as described here -
http://directory.fedora.redhat.com/wiki/Install_Guide#Installing_just_the_core_directory_server
I also got rid of several references to adminutil that are not needed
anymore.
Platforms tested: RHEL4 64
Flag Day: Yes. In order to build the full setuputil/adminserver
package, you must specify USE_SETUPUTIL=1 USE_ADMINSERVER=1 etc. on the
make/gmake command line.
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: I need to change the acceptance tests to
be able to test just the core DS package.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 40 |
1 files changed, 26 insertions, 14 deletions
@@ -130,9 +130,23 @@ help: ###### End of implementation notes. ifeq ($(INTERNAL_BUILD), 1) - COMPONENT_DEPENDENCIES = $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) \ - $(ICU_DEP) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \ - $(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP) $(PERLDAP_DEP) +# first list core dependencies + COMPONENT_DEPENDENCIES = $(NSPR_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) $(LDAPSDK_DEP) \ + $(ICU_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) +# these are only for packaging + COMPONENT_DEPENDENCIES += $(ADSYNC_DEP) $(NT4SYNC_DEP) +ifeq ($(USE_PERLDAP), 1) + COMPONENT_DEPENDENCIES += $(PERLDAP_DEP) +endif +ifeq ($(USE_ADMINSERVER), 1) + COMPONENT_DEPENDENCIES += $(ADMINUTIL_DEP) $(DSDOC_DEP) +endif +ifeq ($(USE_SETUPUTIL), 1) + COMPONENT_DEPENDENCIES += $(SETUPUTIL_DEP) +endif +ifeq ($(USE_DSMLGW), 1) + COMPONENT_DEPENDENCIES += $(AXIS_DEP) $(DSMLJAR_DEP) +endif endif components: $(COMPONENT_DEPENDENCIES) @@ -221,18 +235,18 @@ endif cd ldap; $(MAKE) $(MFLAGS) LDAP_NO_LIBLCACHE=1 BUILD_MODULE=DIRECTORY all @echo ==== Finished LDAP Server ========== @echo - @echo ==== Starting LDAP Server Console ========== - @echo - $(MAKE) $(MFLAGS) buildDirectoryConsole - @echo - @echo ==== Finished LDAP Server Console ========== - @echo @echo ==== Starting LDAP Server Clients ========== @echo $(MAKE) $(MFLAGS) buildDirectoryClients @echo @echo ==== Finished LDAP Server Clients ========== @echo + @echo ==== Starting LDAP Server Console ========== + @echo + $(MAKE) $(MFLAGS) buildDirectoryConsole + @echo + @echo ==== Finished LDAP Server Console ========== + @echo cleanDirectory: @echo @@ -258,14 +272,14 @@ ifeq ($(BUILD_JAVA_CODE),1) endif buildDirectoryClients: $(ANT_DEP) java_platform_check +ifeq ($(USE_DSGW), 1) + cd ldap/clients; $(MAKE) _dsgw +endif ifeq ($(BUILD_JAVA_CODE),1) ifeq ($(USE_DSMLGW), 1) cd ldap/clients; $(MAKE) _dsmlgw endif endif -ifeq ($(USE_DSGW), 1) - cd ldap/clients; $(MAKE) _dsgw -endif $(OBJDIR): if test ! -d $(OBJDIR); then mkdir -p $(OBJDIR); fi; @@ -304,9 +318,7 @@ Longduration: setupDirectory: cd ldap/cm; $(MAKE) $(MFLAGS) releaseDirectory; -ifeq ($(USE_SETUPUTIL), 1) cd ldap/cm; $(MAKE) $(MFLAGS) packageDirectory; -endif pkgDirectoryJars: cd ldap/cm; $(MAKE) $(MFLAGS) packageJars |