[Fedora-directory-commits] adminserver components.mk, 1.43, 1.44 nsconfig.mk, 1.27, 1.28

[Doctor Conrad]

Author: nhosoi

Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7771

Modified Files:
	components.mk nsconfig.mk 
Log Message:
[186105] Admin Server Makefile updates for Internal build
Comment #11
. fixed jss jar file name to jss3.jar; mistakenly put minor version number in
the previous checkin (jss37.jar)
. changed to include the patch number in the jar file name
. fixed admin console package name in the Global Preferences: admserv72.jar ->
redhat-admserv-7.2.jar
. changed to create a symlink: redhat-admserv-7.2.jar pointing redhat-admserv-7.2.0.jar
. introduced CONSOLE-GEN-VERSION and CONSOLE-MAJOR-VERSION in the branding data



Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- components.mk	21 Mar 2006 19:48:49 -0000	1.43
+++ components.mk	24 Mar 2006 01:12:20 -0000	1.44
@@ -356,10 +356,11 @@
 # Console java classes 
 #############################################################
 
-NMCJDK_SUF =  1.0
+NMCJDK_SUF =  1.0.2
+NMCJDK_GEN_SUF =  1.0
 NMCJDK_RELDATE = 20060320
 
-NMCJDK_COMP = console/$(NMCJDK_SUF)
+NMCJDK_COMP = console/$(NMCJDK_GEN_SUF)
 
 NMCJDK_VERSION = $(NMCJDK_RELDATE)
 
@@ -383,6 +384,12 @@
 	mkdir -p $(CLASS_DEST)
 # grab the jar files
 	$(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST)
-componentdir $(NMCJDK_DIR)/java -files
$(ADMIN_BRAND)-base-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-mcc-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-mcc-$(NMCJDK_SUF)_en.jar,$(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF)_en.jar
+# make symlinks; cannot FTP symlinked files
+	-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-base-$(NMCJDK_SUF).jar
$(ADMIN_BRAND)-base-$(NMCJDK_GEN_SUF).jar)
+	-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-mcc-$(NMCJDK_SUF).jar
$(ADMIN_BRAND)-mcc-$(NMCJDK_GEN_SUF).jar)
+	-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-mcc-$(NMCJDK_SUF)_en.jar
$(ADMIN_BRAND)-mcc-$(NMCJDK_GEN_SUF)_en.jar)
+	-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF).jar
$(ADMIN_BRAND)-nmclf-$(NMCJDK_GEN_SUF).jar)
+	-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF)_en.jar
$(ADMIN_BRAND)-nmclf-$(NMCJDK_GEN_SUF)_en.jar)
 # grab the startconsole program
 	$(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST)
-componentdir $(NMCJDK_DIR) -files startconsole && chmod +x
$(CLASS_DEST)/startconsole
 else # INTERNAL_BUILD
@@ -394,7 +401,8 @@
 #############################################################
 
 JSS_SDK_VERSION = JSS_3_7_RTM
-JSSSDK = jss37.jar
+# xpclass.jar is copied to this name. don't put the minor version number
+JSSSDK = jss3.jar
 XPCLASS = $(JSS_JAR_NAME)
 
 ifeq ($(INT_JSS), 1)


Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nsconfig.mk	21 Mar 2006 19:48:49 -0000	1.27
+++ nsconfig.mk	24 Mar 2006 01:12:20 -0000	1.28
@@ -530,7 +530,8 @@
 endif
 endif
 
-ADM_SUF=1.0
+ADM_SUF=1.0.2
+ADM_GEN_SUF=1.0
 
 # CLEAN THIS UP