Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20715/adminserver Modified Files: Makefile buildpaths.mk components.mk nsconfig.mk Log Message: Bug: 192785 Description: Admin Server: Move admin server console into a separate package Reviewed by: Noriko (Thanks!) Moved files into the top level admservconsole module - changed admin server build/packaging to pick up this as a component - removed now useless java build/makefiles Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile 21 Mar 2006 19:48:49 -0000 1.19 +++ Makefile 23 May 2006 22:13:36 -0000 1.20 @@ -33,7 +33,7 @@ PACKAGEDEPS = start_time ifndef NOJAVA -PACKAGEDEPS += ldapjdk nmcjdk jsssdk jsslib +PACKAGEDEPS += ldapjdk nmcjdk jsssdk jsslib admservconsole endif PACKAGEDEPS += pkgBase pkgAdmin pkgMcc end_time Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- buildpaths.mk 21 Mar 2006 19:48:49 -0000 1.9 +++ buildpaths.mk 23 May 2006 22:13:36 -0000 1.10 @@ -89,6 +89,8 @@ CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/.. +ADMSERVCONSOLE_SOURCE_DIR = $(BUILD_ROOT)/.. + #LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT) LDAPJDK_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/ldapjdk Index: components.mk =================================================================== RCS file: /cvs/dirsec/adminserver/components.mk,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- components.mk 12 May 2006 00:50:08 -0000 1.49 +++ components.mk 23 May 2006 22:13:36 -0000 1.50 @@ -399,6 +399,45 @@ endif ############################################################# +# Admserv Console java classes +############################################################# + +ADMSERVCONSOLE_SUF = 1.0.2 +ADMSERVCONSOLE_GEN_SUF = 1.0 +ADMSERVCONSOLE_RELDATE = 20060523 + +ADMSERVCONSOLE_COMP = admservconsole/$(ADMSERVCONSOLE_GEN_SUF) + +ADMSERVCONSOLE_VERSION = $(ADMSERVCONSOLE_RELDATE) + +ifeq ($(BUILD_MODE), int) +ifeq ($(INT_NMCSDK), 1) +ADMSERVCONSOLE_DIR = $(INT_DIR)/$(ADMSERVCONSOLE_COMP)/$(ADMSERVCONSOLE_VERSION)/$(NSOBJDIR_NAME) +else +ADMSERVCONSOLE_DIR = $(COMPONENTS_DIR)/$(ADMSERVCONSOLE_COMP)/$(ADMSERVCONSOLE_VERSION)/$(NSOBJDIR_NAME) +endif +else #fedora +ADMSERVCONSOLE_DIR = $(FED_COMPONENTS_DIR)/$(ADMSERVCONSOLE_COMP)/$(ADMSERVCONSOLE_VERSION)/$(NSOBJDIR_NAME) +endif + +# since the jar files are packaged as is, they should not be symlink'ed. +ADMSERVCONSOLE_METHOD = FTP + +admservconsole: +ifdef INTERNAL_BUILD + mkdir -p $(CLASS_DEST) +# grab the jar files + $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(ADMSERVCONSOLE_METHOD) -objdir $(ADMSERVCONSOLE_JAR_DIR) -componentdir $(ADMSERVCONSOLE_DIR)/java -files $(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_SUF).jar,$(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_SUF)_en.jar +ifneq ($(ARCH), WINNT) +# make symlinks; cannot FTP symlinked files + -(cd $(ADMSERVCONSOLE_JAR_DIR); ln -s $(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_SUF).jar $(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_GEN_SUF).jar) + -(cd $(ADMSERVCONSOLE_JAR_DIR); ln -s $(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_SUF)_en.jar $(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_GEN_SUF)_en.jar) +endif +else # INTERNAL_BUILD + @if [ ! -f $(ADMSERVCONSOLE_JAR_DIR)/$(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_SUF).jar ]; then echo The admservconsole jar files are missing from $(ADMSERVCONSOLE_JAR_DIR) - please build or download them ; exit 1 ; fi +endif + +############################################################# # JSS java classes ############################################################# Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- nsconfig.mk 24 Mar 2006 01:12:20 -0000 1.28 +++ nsconfig.mk 23 May 2006 22:13:36 -0000 1.29 @@ -944,6 +944,12 @@ CONSOLE_JAR_DIR = $(CLASS_DEST) endif +ifdef ADMSERVCONSOLE_SOURCE_ROOT + ADMSERVCONSOLE_JAR_DIR = $(ADMSERVCONSOLE_SOURCE_ROOT)/built/package +else + ADMSERVCONSOLE_JAR_DIR = $(CLASS_DEST) +endif + ifdef ONLINEHELP_SOURCE_DIR else endif