From chrism at zope.com  Wed Jul  3 18:21:54 2002
From: chrism at zope.com (Chris McDonough)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.zinstance:1.6 Makefile.zope:1.5 cvs.mk:1.6
Message-ID: <200207032221.g63MLsF14246@cvs.baymountain.com>

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

Modified Files:
	Makefile.zinstance Makefile.zope cvs.mk 
Log Message:
Made NON_REDHAT work, changed CMF checkout to use HEAD.


=== NZO_SiteLayout/Makefile.zinstance 1.5 => 1.6 ===
 ZOPE_CHECKOUT=src/Zope-2.5-head
 ZEO_CHECKOUT=src/ZEO-1.0-head
-CMF_CHECKOUT=src/CMF-1.3-head
+CMF_CHECKOUT=src/CMF-head
 
 include python_targets.mk
 include zope_targets.mk
@@ -41,7 +41,7 @@
 ROOT_TARGETS=\
 ${INSTANCE_ROOT_TARGETS} \
 ${PRODUCT_ROOT_TARGETS} \
-$(if ${NON_REDHAT}, "", ${REDHAT_ROOT_TARGETS}) \
+$(if ${NON_REDHAT}, ${NOTHING}, ${REDHAT_ROOT_TARGETS}) \
 
 BIN_TARGETS=\
 ${INSTANCE_BIN_TARGETS} \


=== NZO_SiteLayout/Makefile.zope 1.4 => 1.5 ===
 ZOPE_CHECKOUT=src/Zope-2.5-head
 ZEO_CHECKOUT=src/ZEO-1.0-head
-CMF_CHECKOUT=src/CMF-1.3-head
+CMF_CHECKOUT=src/CMF-head
 
 include python_targets.mk
 include zope_targets.mk


=== NZO_SiteLayout/cvs.mk 1.5 => 1.6 ===
 src/CMF-1.3: CVS_TAG=-r CMF-1_3-release
 
-src/CMF-1.3-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
-src/CMF-1.3-head: CVS_MODULE=CMF
-src/CMF-1.3-head: CVS_TAG=-r CMF-1_3-branch
+src/CMF-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/CMF-head: CVS_MODULE=CMF
+src/CMF-head: CVS_TAG=
 
 #   Squid versions
 




From chrism at zope.com  Sun Jul 14 15:08:05 2002
From: chrism at zope.com (Chris McDonough)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.zss:1.5
Message-ID: <200207141908.g6EJ85M10402@cvs.baymountain.com>

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

Modified Files:
	Makefile.zss 
Log Message:
Added NON_REDHAT flag to storage server buildout.


=== NZO_SiteLayout/Makefile.zss 1.4 => 1.5 ===
 #
 #   Add / remove here as appropriate.
 #-----------------------------------------------------------------------
-ROOT_TARGETS=\
+REDHAT_ROOT_TARGETS=\
 /etc/rc.d/init.d/zeo_server \
+
+ROOT_TARGETS=\
+$(if ${NON_REDHAT}, ${NOTHING}, ${REDHAT_ROOT_TARGETS}) \
 
 SRC_TARGETS=\
 ${PYTHON_CHECKOUT} \




From chrism at zope.com  Fri Jul 26 17:28:29 2002
From: chrism at zope.com (Chris McDonough)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - cvs.mk:1.7 szodb_recipes.mk:1.4 szodb_targets.mk:1.3
Message-ID: <200207262128.g6QLSTF08033@cvs.baymountain.com>

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

Modified Files:
	cvs.mk szodb_recipes.mk szodb_targets.mk 
Log Message:
Make StandaloneZODB build and checkout respect its tag.


=== NZO_SiteLayout/cvs.mk 1.6 => 1.7 ===
 src/ZEO-1.0-head: CVS_MODULE=ZEO
 src/ZEO-1.0-head: CVS_TAG=-r zeo-1_0-branch
 
-src/StandaloneZODB-1.0-final: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
-src/StandaloneZODB-1.0-final: CVS_MODULE=StandaloneZODB
-src/StandaloneZODB-1.0-final: CVS_TAG=-r StandaloneZODB-1_0-final
+src/StandaloneZODB-1.0: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/StandaloneZODB-1.0: CVS_MODULE=StandaloneZODB
+src/StandaloneZODB-1.0: CVS_TAG=-r StandaloneZODB-1_0-branch
 
 #   CMF versions
 


=== NZO_SiteLayout/szodb_recipes.mk 1.3 => 1.4 ===
 #=======================================================================
 ${SZODB_SRC_TARGETS}:
 	${CD} ${BASE_DIR}/src \
-      && ${CVS} -d ${CVS_REPOSITORY} checkout -d ${@F} ${CVS_MODULE}
+      && ${CVS} -d ${CVS_REPOSITORY} checkout ${CVS_TAG} -d ${@F} ${CVS_MODULE}
 
 opt/StandaloneZODB: src/StandaloneZODB-1.0
 	${CPR} ${BASE_DIR}/$< ${BASE_DIR}/${<:src/%=opt/%} && \


=== NZO_SiteLayout/szodb_targets.mk 1.2 => 1.3 ===
 #	StandaloneZODB package targets
 #=======================================================================
 
-src/StandaloneZODB-1.0: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
-src/StandaloneZODB-1.0: CVS_MODULE=StandaloneZODB
-src/StandaloneZODB-1.0: CVS_TAG=-r StandaloneZODB-1_0-final
-
 SZODB_OPT_TARGETS=\
 opt/StandaloneZODB \
 opt/Python2/lib/python2.1/site-packages/Acquisition.so \



From tseaver at zope.com  Fri Jul 26 18:42:34 2002
From: tseaver at zope.com (Tres Seaver)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - ZopeCtl.py:1.5
Message-ID: <200207262242.g6QMgYT15019@cvs.baymountain.com>

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

Modified Files:
	ZopeCtl.py 
Log Message:
 - Ensure that PYTHONPATH gets set correctly.

=== NZO_SiteLayout/ZopeCtl.py 1.4 => 1.5 ===
         for k, v in self._env.items():
             os.environ[ k ] = str( v )
 
+        pp = os.environ.get( 'PYTHONPATH' )
+
+        if pp is None:
+            pp = []
+        else:
+            pp = pp.split( ':' )
+        
+        pp.insert( 0, ( '%s/lib/python' % os.environ[ 'ZOPE_HOME' ] ) )
+
+        os.environ[ 'PYTHONPATH' ] = ':'.join( pp )
+
         if not with_stupid_log:
             return