[Fedora-directory-commits] adminserver/admserv Makefile, 1.6, 1.7 pkgadmin.mk, 1.34, 1.35

[Doctor Conrad]

Author: rmeggins

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

Modified Files:
    Makefile pkgadmin.mk 
Log Message:
It's a little bit tricky.  The base package is a dependency of both the main admin server package and the directory server package.  However, it works if you just create a zero length .zip file for the base archive - you get a warning when running setup, but everything installs correctly.  While it's not perfect (it will be addressed for the next major release) it will at least allow those developers who do not want to use java at all to build and install.

You must use "make NOJAVA=1 ..." to build and package admin server without java.

Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile	29 Sep 2005 22:11:58 -0000	1.6
+++ Makefile	18 Jan 2006 18:24:20 -0000	1.7
@@ -33,12 +33,21 @@
 MFLAGS :=
 endif

+ALLTARGETS = do-src do-cgi-src do-html
+ifndef NOJAVA
+ALLTARGETS += do-console
+endif
+
+ALLTARGETS += do-cfg
+
 ifeq ($(ARCH), WINNT)
-all: do-src do-cgi-src do-html do-console do-cfg do-viewurl do-inst do-ldap-stuffs do-icons
-else
-all: do-src do-cgi-src do-html do-console do-cfg do-inst do-ldap-stuffs do-icons
+ALLTARGETS += do-viewurl
 endif

+ALLTARGETS += do-inst do-ldap-stuffs do-icons
+
+all: $(ALLTARGETS)
+
 do-src:
 #	cd src; $(MAKE) BUILD_MODULE=HTTP_ADMIN $(MFLAGS)
    mkdir -p $(OBJDIR)/admin-lib

Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pkgadmin.mk	8 Dec 2005 02:37:25 -0000	1.34
+++ pkgadmin.mk	18 Jan 2006 18:24:20 -0000	1.35
@@ -139,6 +139,11 @@
 endif
 endif

+ifndef NOJAVA
+ALLTARGETS = pkguxClient
+endif
+ALLTARGETS += pkguxAdmin pkgSetup pkgSBC
+
 ifneq ($(strip $(ADM_VERSION)),)
 all:
    -if [ ! -d $(PKGTOP) ]; then \
@@ -150,7 +155,7 @@
    cd $(PKGTOP); $(TAR) xf $(ADM_RELEASE)/admserv.tar
 else

-all:  pkguxClient pkguxAdmin pkgSetup pkgSBC
+all:  $(ALLTARGETS)

endif

@@ -185,8 +190,10 @@
 # Note: need to do admin-nickname rather than admin-serv --MLM

-$(MKDIR) $(ADMIN_DIR)/dist
+ifndef NOJAVA
    -$(MKDIR) $(ADMIN_DIR)/java/jars
    -$(MKDIR) $(ADMIN_DIR)/java/html/en
+endif # NOJAVA

-$(MKDIR) $(ADMIN_DIR)/admin-serv
    -$(MKDIR) $(ADMIN_DIR)/admin-serv/config
@@ -262,6 +269,7 @@
    	cp -p $(ADMINUTIL_LIBPATH)/adminutil-properties/* $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \
    fi

+ifndef NOJAVA
    cd $(ADMSERV_OBJDIR)/cmdln; \
    cp -p admconfig $(ADMIN_DIR)/bin/admin;

@@ -269,6 +277,7 @@
       find *.html *.gif *.jpg | $(CPIO) $(ADMIN_DIR)/java/html
    cd $(ADMIN_JARS)/.. ; \
       find *.html | $(CPIO) $(ADMIN_DIR)/java/html/en
+endif # NOJAVA

cp $(BUILD_ROOT)/lib/ldaputil/certmap.conf $(ADMIN_DIR)/shared/config
    cp -p $(BUILD_ROOT)/admserv/cfgstuff/httpd.conf $(ADMIN_DIR)/shared/config/template/httpd.conf.tmpl