[zopeorg-checkins] CVS: NZO_SiteLayout - buildout_zope_sandbox:1.2
Sidnei da Silva
sidnei at x3ng.com.br
Thu May 29 11:19:06 EDT 2003
Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv1960
Modified Files:
buildout_zope_sandbox
Log Message:
Added QueueCatalog. Changed Zope to 2.6-branch. Changed ZODB to 3_1-branch. Changed Python to release22-maint.
=== NZO_SiteLayout/buildout_zope_sandbox 1.1 => 1.2 ===
PYXML_URL=$PYXML_SF_DOWNLOAD/PyXML-$PYXML_VERSION.tar.gz
ZOPE_CVSROOT=:pserver:anonymous at cvs.zope.org:/cvs-repository
+PYTHON_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/python
ZOPEORG_CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-zopeorg
COLLECTIVE_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/collective
ZWIKI_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/zwiki
@@ -67,21 +68,28 @@
PLONE_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/plone
FORMULATOR_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/formulator
-ZOPE_VERSION=${ZOPE_VERSION:-2.6.1} # XXX 2.6.2, 2.7?
+PYTHON_TAG=release22-maint
+PYTHON_MODULE=python/dist/src
+
+ZOPE_VERSION=${ZOPE_VERSION:-2.6-branch} # XXX 2.6.2, 2.7?
ZOPE_MODULE=Zope
if [ "$ZOPE_VERSION" == "2.6.1" ]; then
ZOPE_TAG=Zope-2-6-1-src
+elif [ "$ZOPE_VERSION" == "2.6-branch" ]; then
+ ZOPE_TAG=Zope-2_6-branch
elif [ "$ZOPE_VERSION" == "head" ]; then
ZOPE_TAG=HEAD
fi
-if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6.2" ]; then
- ZODB3_VERSION=${ZODB3_VERSION:-3.1.1} # XXX 3.1.2?
+if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6-branch" ]; then
+ ZODB3_VERSION=${ZODB3_VERSION:-3.1-branch} # XXX 3.1.2?
ZODB3_MODULE=ZODB3
if [ "$ZODB3_VERSION" == "3.1.1" ]; then
ZODB3_TAG=ZODB3-3-1-1-final
+ elif [ "$ZODB3_VERSION" == "3.1-branch" ]; then
+ ZODB3_TAG=ZODB3-3_1-branch
elif [ "$ZODB3_VERSION" == "3.1.2" ]; then
ZODB3_TAG=ZODB3-3-1-2-final
elif [ "$ZODB3_VERSION" == "head" ]; then
@@ -119,7 +127,7 @@
DCWORKFLOW_TAG=HEAD
fi
-if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6.2" ]; then
+if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6-branch" ]; then
# DBTab makes managing ZEO ClientStorage simpler under 2.6.*
DBTAB_VERSION=${DBTAB_VERSION:-1.2}
@@ -137,9 +145,9 @@
# Product Repositories
#------------------------------------------------------------------------------
ZopeOrg="$ZOPEORG_CVS_REPOSITORY co -dZopeOrg Products/ZopeOrg-NV"
+QueueCatalog="$ZOPEORG_CVSROOT co -dQueueCatalog Products/QueueCatalog"
BTreeFolder2="$ZOPEORG_CVS_REPOSITORY co -dBTreeFolder2 Products/BTreeFolder2"
Rewriter="$ZOPEORG_CVS_REPOSITORY co -dRewriter Products/Rewriter-NV"
-CMFDateIndexes="$ZOPEORG_CVS_REPOSITORY co -dCMFDateIndexes Products/CMFDateIndexes-NV"
ZWiki="$ZWIKI_CVS_REPOSITORY co -dZWiki zwiki"
BackTalk="$BACKTALK_CVS_REPOSITORY co -dBackTalk BackTalk"
CMFBackTalk="$COLLECTIVE_CVS_REPOSITORY co -dCMFBackTalk CMFBackTalk"
@@ -182,38 +190,11 @@
PYTHON_CONFIGS="$PYTHON_CONFIGS --with-dyld --with-suffix"
fi
-cd $tmpdir
-wget --continue $PYTHON_SOURCE_URL
cd $srcdir
-tar xzf $tmpdir/Python-$PYTHON_VERSION.tgz
-
-#
-# Work around glitch in remote configure for 2.2.2
-#
-if [ "$PYTHON_VERSION" == "2.2.2" ]; then
- cd $srcdir/Python-$PYTHON_VERSION
- patch Lib/distutils/sysconfig.py << PYTHON_222_DISTUTILS_PATCH_EOF
---- python/python/dist/src/Lib/distutils/sysconfig.py 2002/10/08 14:59:43 1.44.6.2
-+++ python/python/dist/src/Lib/distutils/sysconfig.py 2002/11/26 09:42:57 1.44.6.3
-@@ -29,13 +29,9 @@
-
- argv0_path = os.path.dirname(os.path.abspath(sys.executable))
- landmark = os.path.join(argv0_path, "Modules", "Setup")
--if not os.path.isfile(landmark):
-- python_build = 0
--elif os.path.isfile(os.path.join(argv0_path, "Lib", "os.py")):
-- python_build = 1
--else:
-- python_build = os.path.isfile(os.path.join(os.path.dirname(argv0_path),
-- "Lib", "os.py"))
-+
-+python_build = os.path.isfile(landmark)
-+
- del argv0_path, landmark
-
- # set_python_build() was present in 2.2 and 2.2.1; it's not needed
-PYTHON_222_DISTUTILS_PATCH_EOF
-fi
+while ! `cvs -d $PYTHON_CVS_REPOSITORY co -d Python-$PYTHON_VERSION -r $PYTHON_TAG $PYTHON_MODULE`; do
+ echo "cvs -d $PYTHON_CVS_REPOSITORY co -d Python-$PYTHON_VERSION -r $PYTHON_TAG $PYTHON_MODULE";
+ echo "Checking out Python";
+done
cd $optdir
mkdir -p Python-$PYTHON_VERSION/build
@@ -240,12 +221,12 @@
cd $srcdir/PyXML-$PYXML_VERSION
patch xml/sax/xmlreader.py << PYXML_081_PATCH_EOF
@@ -221,7 +221,7 @@
-
+
def getSystemId(self):
"Returns the system identifier of this InputSource."
- return self.__system_id
+ return str(self.__system_id)
-
+
def setEncoding(self, encoding):
"""Sets the character encoding of this InputSource.
PYXML_081_PATCH_EOF
@@ -261,7 +242,7 @@
cd $srcdir
cvs -d $ZOPE_CVSROOT co -d Zope-$ZOPE_VERSION -r $ZOPE_TAG $ZOPE_MODULE
cd $optdir
-if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6.2" ]; then
+if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6-branch" ]; then
cp -rs $srcdir/Zope-$ZOPE_VERSION .
cd Zope-$ZOPE_VERSION
$bindir/python wo_pcgi.py
@@ -291,7 +272,7 @@
#
# Build ZEO INSTANCE_HOME
#
-if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6.2" ]; then
+if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6-branch" ]; then
cd $vardir
mkdir -p storage/var
else
@@ -307,7 +288,7 @@
#
# Build Zope INSTANCE_HOME
#
-if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6.2" ]; then
+if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6-branch" ]; then
cd $vardir
mkdir -p zope/var zope/Products zope/import zope/Extensions
echo Creating initial "manager" account.
@@ -325,17 +306,60 @@
# Fetch products.
#------------------------------------------------------------------------------
cd $srcdir
-cvs -d $ZOPE_CVSROOT co -d CMF-$CMF_VERSION -r $CMF_TAG $CMF_MODULE
-cvs -d $ZopeOrg
-cvs -d $BTreeFolder2
-cvs -d $Rewriter
-cvs -d $CMFDateIndexes
-cvs -d $ZWiki
-cvs -d $BackTalk
-cvs -d $CMFPlone
-cvs -d $Formulator
-cvs -d $ExternalEditor
-cvs -d $CMFPackage
+while ! `cvs -d $ZOPE_CVSROOT co -d CMF-$CMF_VERSION -r $CMF_TAG $CMF_MODULE`; do
+ echo "Checking out CMF";
+ echo "cvs -d $ZOPE_CVSROOT co -d CMF-$CMF_VERSION -r $CMF_TAG $CMF_MODULE"
+done
+
+while ! `cvs -d $QueueCatalog`; do
+ echo "Checking out QueueCatalog";
+ echo "cvs -d $QueueCatalog";
+done
+
+while ! `cvs -d $ZopeOrg`; do
+ echo "Checking out ZopeOrg";
+ echo "cvs -d $ZopeOrg";
+done
+
+while ! `cvs -d $BTreeFolder2`; do
+ echo "Checking out BTreeFolder2";
+ echo "cvs -d $BTreeFolder2";
+done
+
+while ! `cvs -d $Rewriter`; do
+ echo "Checking out Rewriter";
+ echo "cvs -d $Rewriter";
+done
+
+while ! `cvs -d $ZWiki`; do
+ echo "Checking out ZWiki";
+ echo "cvs -d $ZWiki";
+done
+
+while ! `cvs -d $BackTalk`; do
+ echo "Checking out BackTalk";
+ echo "cvs -d $BackTalk";
+done
+
+while ! `cvs -d $CMFPlone`; do
+ echo "Checking out CMFPlone";
+ echo "cvs -d $CMFPlone";
+done
+
+while ! `cvs -d $Formulator`; do
+ echo "Checking out Formulator";
+ echo "cvs -d $Formulator";
+done
+
+while ! `cvs -d $ExternalEditor`; do
+ echo "Checking out ExternalEditor";
+ echo "cvs -d $ExternalEditor";
+done
+
+while ! `cvs -d $CMFPackage`; do
+ echo "Checking out CMFPackage";
+ echo "cvs -d $CMFPackage";
+done
cd $optdir
cp -rs $srcdir/CMF-$CMF_VERSION .
@@ -343,11 +367,10 @@
ln -s $srcdir/ZopeOrg .
ln -s $srcdir/BTreeFolder2 .
ln -s $srcdir/Rewriter .
-ln -s $srcdir/CMFDateIndexes .
ln -s $srcdir/ZWiki .
ln -s $srcdir/BackTalk .
ln -s $srcdir/CMFPlone .
-ln -s $srcdir/Formulator .
+ln -s $srcdir/Formulator .
ln -s $srcdir/ExternalEditor .
ln -s $srcdir/CMFPackage .
@@ -360,7 +383,7 @@
ln -s DCWorkflow-$DCWORKFLOW_VERSION DCWorkflow
fi
-if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6.2" ]; then
+if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6-branch" ]; then
cd $srcdir
cvs -d $ZOPE_CVSROOT co -d DBTab-$DBTAB_VERSION -r $DBTAB_TAG $DBTAB_MODULE
cd $optdir
@@ -380,22 +403,21 @@
ln -s $optdir/ZopeOrg .
ln -s $optdir/BTreeFolder2 .
ln -s $optdir/Rewriter .
-ln -s $optdir/CMFDateIndexes .
ln -s $optdir/ZWiki .
ln -s $optdir/BackTalk .
ln -s $optdir/CMFPlone .
-ln -s $optdir/Formulator .
+ln -s $optdir/Formulator .
ln -s $optdir/ExternalEditor .
ln -s $optdir/CMFPackage .
-if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6.2" ]; then
+if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6-branch" ]; then
ln -s $optdir/DBTab .
fi
#------------------------------------------------------------------------------
# Set up DBTab
#------------------------------------------------------------------------------
-if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6.2" ]; then
+if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6-branch" ]; then
cd $vardir/zope
ln -s Products/DBTab/custom_zodb.py .
cat > $etcdir/dbtab.conf << DBTAB_CONF_EOF
@@ -418,7 +440,7 @@
# Set up start / stop scripts
#------------------------------------------------------------------------------
-if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6.2" ]; then
+if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6-branch" ]; then
cat > $bindir/zeoctl << ZEOCTL_EOF
#!/bin/sh
#------------------------------------------------------------------------------
More information about the zopeorg-checkins
mailing list