[zopeorg-checkins] CVS: NZO_SiteLayout - cleaninstance:1.1 standard_targets.mk:1.5 tools.mk:1.3 zproduct_targets.mk:1.10

[Sidnei da Silva]

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv5276

Modified Files:
	standard_targets.mk tools.mk zproduct_targets.mk 
Added Files:
	cleaninstance 
Log Message:
cleaninstance support

=== Added File NZO_SiteLayout/cleaninstance ===
#! /bin/sh
#
#   buildinstance [<INSTANCE_VAR=VALUE>]*
#
#
reldir=`dirname $0`

# fill in defaults
if test -z "$INSTANCE_PASSWD"; then
   INSTANCE_PASSWD=123
fi
if test -z "$INSTANCE_NAME"; then
   INSTANCE_NAME=Instance
fi
if test -z "$INSTANCE_HTTP_PORT"; then
   INSTANCE_HTTP_PORT=8080
fi
if test -z "$INSTANCE_FTP_PORT"; then
   INSTANCE_FTP_PORT=8021
fi
if test -z "$INSTANCE_DAV_PORT"; then
   INSTANCE_DAV_PORT=9800
fi
if test -z "$INSTANCE_MONITOR_PORT"; then
   INSTANCE_MONITOR_PORT=None
fi
if test -z "$ZEO_SERVER_HOST"; then
   ZEO_SERVER_HOST=localhost
fi
if test -z "$ZEO_SERVER_PORT"; then
   ZEO_SERVER_PORT=8001
fi
if test -z "$ZEO_SERVER_STORAGE"; then
   ZEO_SERVER_STORAGE=Main
fi
if test -z "$USE_ZEO_SERVER"; then
   USE_ZEO_SERVER=0
fi


if [ -f $reldir/Makefile.zinstance ]; then
  /usr/bin/make -f $reldir/Makefile.zinstance \
                -I $reldir MAKEFILEDIR=$reldir clean cleaninstance \
                INSTANCE_PASSWD=$INSTANCE_PASSWD \
                INSTANCE_NAME=$INSTANCE_NAME \
                INSTANCE_HTTP_PORT=$INSTANCE_HTTP_PORT \
                INSTANCE_FTP_PORT=$INSTANCE_FTP_PORT \
                INSTANCE_DAV_PORT=$INSTANCE_DAV_PORT \
                INSTANCE_MONITOR_PORT=$INSTANCE_MONITOR_PORT \
                ZEO_SERVER_HOST=$ZEO_SERVER_HOST \
                ZEO_SERVER_PORT=$ZEO_SERVER_PORT \
                ZEO_SERVER_STORAGE=$ZEO_SERVER_STORAGE \
                USE_ZEO_SERVER=$USE_ZEO_SERVER 

else
  echo "cleaninstance [<INSTANCE_VAR=value>]*"
  echo "acceptable instance variables are:"
  echo "  INSTANCE_PASSWD:        admin/superuser password (default '123')"
  echo "  INSTANCE_NAME:          'var'-relative directory name (default 'Instance')"
  echo "  INSTANCE_HTTP_PORT:     HTTP port (default '8080')"
  echo "  INSTANCE_FTP_PORT:      FTP port (default '8021')"
  echo "  INSTANCE_DAV_PORT:      DAV source port (default '9088')"
  echo "  INSTANCE_MONITOR_PORT:  Zope monitor port (default 'None')"
  echo "  ZEO_SERVER_HOST:        ZEO server hostname (default 'localhost')"
  echo "  ZEO_SERVER_PORT:        ZEO server portname (default '8001')"
  echo "  ZEO_SERVER_STORAGE:     storage name on ZSS (default 'Main')"
  echo "  USE_ZEO_SERVER:         1 if ZEO server is used, 0 if local FileStorage"
fi


=== NZO_SiteLayout/standard_targets.mk 1.4 => 1.5 ===
 clean:
 	${RM} ${OPT_TARGETS}
 
-cvsup:
-	${foreach ${DIR},${SRC_TARGETS},${${CD} ${DIR} && ${CVSUP}}}
+cleaninstance:
+	${RM} ${SRC_TARGETS}
+	${RM} ${PRODUCT_VAR_TARGETS}
+	${RM} ${CMF_INSTANCE_TARGETS}
 
 clobber: clean
 	${RM} {bin,opt,include,lib,man,src}
@@ -32,6 +34,7 @@
 clobber \
 standard_usage \
 usage \
+cleaninstance \
 
 standard_usage:
 	@${ECHO} "----------------------------------------------------------"


=== NZO_SiteLayout/tools.mk 1.2 => 1.3 ===
 CHMOD=/bin/chmod
 SUDO=sudo
 CHOWN=/bin/chown
+CVSUP=/usr/bin/cvs up -dP
 
 #
 #   We may have to arrange to get these built on some systems.


=== NZO_SiteLayout/zproduct_targets.mk 1.9 => 1.10 ===
 src/CMFDateIndexes-NV: CVS_MODULE=Products/CMFDateIndexes-NV
 src/CMFDateIndexes-NV: CVS_TAG=
 
-src/ZWiki: CVS_REPOSITORY=${ZWIKI_CVS_REPOSITORY}
-src/ZWiki: CVS_MODULE=zwiki
-src/ZWiki: CVS_TAG=
-
-src/BackTalk: CVS_REPOSITORY=${BACKTALK_CVS_REPOSITORY}
-src/BackTalk: CVS_MODULE=BackTalk
-src/BackTalk: CVS_TAG=
-
-src/CMFBackTalk: CVS_REPOSITORY=${COLLECTIVE_CVS_REPOSITORY}
-src/CMFBackTalk: CVS_MODULE=CMFBackTalk
-src/CMFBackTalk: CVS_TAG=
-
-src/DCWorkflow: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
-src/DCWorkflow: CVS_MODULE=CMF/DCWorkflow
-src/DCWorkflow: CVS_TAG=
+src/ZWiki-head: CVS_REPOSITORY=${ZWIKI_CVS_REPOSITORY}
+src/ZWiki-head: CVS_MODULE=zwiki
+src/ZWiki-head: CVS_TAG=
+
+src/BackTalk-head: CVS_REPOSITORY=${BACKTALK_CVS_REPOSITORY}
+src/BackTalk-head: CVS_MODULE=BackTalk
+src/BackTalk-head: CVS_TAG=
+
+src/CMFBackTalk-head: CVS_REPOSITORY=${COLLECTIVE_CVS_REPOSITORY}
+src/CMFBackTalk-head: CVS_MODULE=CMFBackTalk
+src/CMFBackTalk-head: CVS_TAG=
+
+src/DCWorkflow-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/DCWorkflow-head: CVS_MODULE=Products/DCWorkflow
+src/DCWorkflow-head: CVS_TAG=
 
 PRODUCT_CHECKOUTS=\
 src/ZopeOrg-NV \
 src/BTreeFolder2-0.5 \
 src/Rewriter-NV \
 src/CMFDateIndexes-NV \
-src/ZWiki \
-src/BackTalk \
-src/CMFBackTalk \
-src/DCWorkflow \
+src/ZWiki-head \
+src/BackTalk-head \
+src/CMFBackTalk-head \
+src/DCWorkflow-head \
 
 opt/ZopeOrg: src/ZopeOrg-NV
 opt/BTreeFolder2: src/BTreeFolder2-0.5
 opt/Rewriter: src/Rewriter-NV
 opt/CMFDateIndexes: src/CMFDateIndexes-NV
-opt/ZWiki: src/ZWiki
-opt/BackTalk: src/BackTalk
-opt/CMFBackTalk: src/CMFBackTalk
-opt/DCWorkflow: src/DCWorkflow
+opt/ZWiki: src/ZWiki-head
+opt/BackTalk: src/BackTalk-head
+opt/CMFBackTalk: src/CMFBackTalk-head
+opt/DCWorkflow: src/DCWorkflow-head
 
 PRODUCT_OPT_TARGETS=\
 opt/ZopeOrg \
@@ -77,7 +77,6 @@
 ${PRODUCTS_DIRECTORY}/BackTalk: opt/BackTalk
 ${PRODUCTS_DIRECTORY}/CMFBackTalk: opt/CMFBackTalk
 ${PRODUCTS_DIRECTORY}/DCWorkflow: opt/DCWorkflow
-
 
 PRODUCT_VAR_TARGETS=\
 ${PRODUCTS_DIRECTORY}/ZopeOrg \