[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.35, 1.36

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
	pkgadmin.mk 
Log Message:
[179394] HP-UX IPF support (adminserver)
0) support HP-UX 11.23 ia64
1) adjusted to the components' path name change (suffix, version number)
2) added [admin] section to setup.inf (in pkgadmin.mk)
3) fixed type mismatch for the cert version
4) adjusted the admin jar names
5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34)
6) added "admin" to the component list: "Components = ..." in setup.inf



Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pkgadmin.mk	18 Jan 2006 18:24:20 -0000	1.35
+++ pkgadmin.mk	1 Feb 2006 23:03:49 -0000	1.36
@@ -168,7 +168,7 @@
 
 # grab the jar files
 	cd $(ADMIN_JARS) ; \
-	   cp -p admserv$(ADM_SUF).jar admserv$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
+	   cp -p fedora-admserv-$(ADM_SUF).jar fedora-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
 
 #
 # Cleanup before making distributable zip
@@ -245,6 +245,12 @@
 
 # Copy LIB ICU
 	cd $(ICU_LIBPATH); cp -p $(ICU_SOLIBS) $(ADMIN_DIR)/bin/admin/lib
+	for file in $(ICU_SOLIBS); do \
+	  if [ `expr $$file : ".*\.$(DLL_SUFFIX)\.[0-9]*$$"` -ne 0 ]; then \
+	    mytmpfile=`echo $$file | sed -e "s/\(.*\)\.$(DLL_SUFFIX)\.[0-9]*$$/\1.$(DLL_SUFFIX)/"`; \
+	    (cd $(ADMIN_DIR)/bin/admin/lib; rm -rf $$mytmpfile; ln -s $$file $$mytmpfile); \
+	fi ; \
+	done
 
 # Cert System needs chk files [154431]
 	cd $(NSPR_LIBPATH); cp -p libsoftokn3.chk $(ADMIN_DIR)/bin/admin/lib
@@ -261,6 +267,12 @@
 
 # Copy LIB ADMIN UTIL
 	cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib
+	for file in $(ADMINUTIL_SOLIBS); do \
+	  if [ `expr $$file : ".*\.$(DLL_SUFFIX)\.[0-9]*$$"` -ne 0 ]; then \
+	    mytmpfile=`echo $$file | sed -e "s/\(.*\)\.$(DLL_SUFFIX)\.[0-9]*$$/\1.$(DLL_SUFFIX)/"`; \
+	    (cd $(ADMIN_DIR)/bin/admin/lib; rm -rf $$mytmpfile; ln -s $$file $$mytmpfile); \
+	fi ; \
+	done
 	if [ -d $(ADMINUTIL_LIBPATH)/property ] ; then \
 		$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property ; \
 		cp -p $(ADMINUTIL_LIBPATH)/property/* $(ADMIN_DIR)/bin/admin/lib/property ; \
@@ -379,6 +391,16 @@
 
 	cp -p $(SETUPUTIL_BIN)/setup $(PKGTOP)
 	cp -p $(SETUPUTIL_BIN)/setup.inf $(PKGTOP)
+	-if [ -z "`egrep "\[admin\]" $(SETUPUTIL_BIN)/setup.inf`" ]; then \
+	    components=`grep "^Components.*=" $(SETUPUTIL_BIN)/setup.inf`; \
+		if [ `expr "$$components" : ".*admin"` -eq 0 ]; then \
+	      cat $(SETUPUTIL_BIN)/setup.inf | sed -e "s/^Components.*=.*/&, admin/" > $(PKGTOP)/setup.inf; \
+	    fi; \
+	    echo "" >> $(PKGTOP)/setup.inf; \
+	    echo "# added in the adminserver package phase" >> $(PKGTOP)/setup.inf; \
+	    echo "[admin]" >> $(PKGTOP)/setup.inf; \
+	    echo "ComponentInfoFile = admin/admin.inf" >> $(PKGTOP)/setup.inf; \
+	fi
 	cp -p $(ADMSERV_OBJDIR)/LICENSE.txt $(PKGTOP)
 	cp -p $(ADMSERV_OBJDIR)/README.txt $(PKGTOP)
 	cp -p $(SETUPUTIL_BIN)/unzip_wrapper.pl $(PKGTOP)