[Zope-CVS] CVS: Products/OSCOM - buildout_zope_sandbox:1.3

[Tres Seaver]

Update of /cvs-repository/Products/OSCOM
In directory cvs.zope.org:/tmp/cvs-serv4217

Modified Files:
	buildout_zope_sandbox 
Log Message:


  - Install ZODB3 into SOFTWARE_HOME (for Zope 2.6) rather than into
    site-packages;  keeps the Zope software layout looking "normal"
    (we no longer have to remove dupes).


=== Products/OSCOM/buildout_zope_sandbox 1.2 => 1.3 ===
--- Products/OSCOM/buildout_zope_sandbox:1.2	Wed May  7 14:53:42 2003
+++ Products/OSCOM/buildout_zope_sandbox	Wed May  7 15:30:29 2003
@@ -42,6 +42,8 @@
 #              INSTANCE_HOME is in 'var/zope'.
 #
 #     'tmp' -- fetch directory for tarballs.
+#
+#   $Id$
 #==============================================================================
 PLATFORM=`uname`
 echo Building OSCOM Zope sandbox: PLATFORM is $PLATFORM
@@ -49,12 +51,16 @@
 #------------------------------------------------------------------------------
 #   Version / repository selectors
 #------------------------------------------------------------------------------
-ZOPE_CVSROOT=:pserver:anonymous@cvs.zope.org:/cvs-repository
-
 PYTHON_VERSION=${PYTHON_VERSION:-2.1.3}           # XXX 2.2.3?
 PYTHON_ORG=http://www.python.org/ftp/python
 PYTHON_SOURCE_URL=$PYTHON_ORG/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz
 
+PYXML_VERSION=${PYXML_VERSION:-0.8.1}             # 0.8.2?
+PYXML_SF_DOWNLOAD=http://aleron.dl.sourceforge.net/sourceforge/pyxml
+PYXML_URL=$PYXML_SF_DOWNLOAD/PyXML-$PYXML_VERSION.tar.gz
+
+ZOPE_CVSROOT=:pserver:anonymous@cvs.zope.org:/cvs-repository
+
 ZOPE_VERSION=${ZOPE_VERSION:-2.6.1}              # XXX 2.6.2, 2.7?
 ZOPE_MODULE=Zope
 
@@ -75,10 +81,6 @@
     fi
 fi
 
-PYXML_VERSION=${PYXML_VERSION:-0.8.1}             # 0.8.2?
-PYXML_SF_DOWNLOAD=http://aleron.dl.sourceforge.net/sourceforge/pyxml
-PYXML_URL=$PYXML_SF_DOWNLOAD/PyXML-$PYXML_VERSION.tar.gz
-
 CMF_VERSION=${CMF_VERSION:-1.3.1}               # XXX 1.4?
 CMF_MODULE=CMF
 
@@ -158,15 +160,6 @@
     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
-@@ -10,7 +10,7 @@
- Initial date: 17-Dec-1998
- """
- 
--__revision__ = "$Id$"
-+__revision__ = "$Id$"
- 
- import os
- import re
 @@ -29,13 +29,9 @@
  
  argv0_path = os.path.dirname(os.path.abspath(sys.executable))
@@ -200,19 +193,6 @@
 ln -s $optdir/Python2/bin/python .
 
 #------------------------------------------------------------------------------
-#   Install ZODB (only needed for Zope 2.6.*).
-#------------------------------------------------------------------------------
-if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6.2" ]; then
-    cd $srcdir
-    cvs -d $ZOPE_CVSROOT co -d ZODB3-$ZODB3_VERSION -r $ZODB3_TAG $ZODB3_MODULE
-    cd $optdir
-    cp -rs $srcdir/ZODB3-$ZODB3_VERSION .
-    ln -s ZODB3-$ZODB3_VERSION ZODB3
-    cd ZODB3
-    $bindir/python setup.py install
-fi
-
-#------------------------------------------------------------------------------
 #   Install PyXML
 #------------------------------------------------------------------------------
 cd $tmpdir
@@ -251,18 +231,16 @@
     cd Zope-$ZOPE_VERSION
     $bindir/python wo_pcgi.py
     rm inituser
-    echo Removing duplicated ZODB modules and packages.
-    for pkg in 'BTrees' 'Persistence' 'ThreadedAsync' 'zdaemon' 'zLOG' \
-               'ZODB' 'ZopeUndo';
-    do
-        rm -r lib/python/$pkg
-    done
-    for ext in 'Acquisition' 'ComputedAttribute' 'ExtensionClass' \
-               'MethodObject' 'Missing' 'MultiMapping' 'Record' \
-               'Sync' 'ThreadLock';
-    do
-        rm lib/python/$ext.so
-    done
+    #
+    #   Install ZODB (only needed for Zope 2.6.*).
+    #
+    cd $srcdir
+    cvs -d $ZOPE_CVSROOT co -d ZODB3-$ZODB3_VERSION -r $ZODB3_TAG $ZODB3_MODULE
+    cd $optdir
+    cp -rs $srcdir/ZODB3-$ZODB3_VERSION .
+    ln -s ZODB3-$ZODB3_VERSION ZODB3
+    cd ZODB3
+    $bindir/python setup.py install --home=$optdir/Zope-$ZOPE_VERSION
 else
     mkdir Zope-$ZOPE_VERSION/build
     cd Zope-$ZOPE_VERSION/build
@@ -379,7 +357,7 @@
 #------------------------------------------------------------------------------
 zeo_port=8001
 python=<<SANDBOX>>/bin/python
-zeo_start=<<SANDBOX>>/opt/Python2/lib/python2.1/site-packages/ZEO/start.py
+zeo_start=<<SANDBOX>>/opt/Zope/lib/python/ZEO/start.py
 
 INSTANCE_HOME=<<SANDBOX>>/var/storage
 export INSTANCE_HOME