[Zope-CVS] CVS: Zope - configure:1.1.4.2 setup.py:1.10.4.1

Chris McDonough chrism@zope.com
Mon, 26 Aug 2002 02:23:06 -0400


Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv29520

Modified Files:
      Tag: chrism-install-branch
	configure setup.py 
Log Message:
More work on my Zope2 installer branch.  The branch is fully functional
at this point, at least on Linux (try it!).  The goal is to allow
a './configure; make; make install' Zope source installation possible. 

- The 'configure' step now checks for large file support
  and will only allow configuration to continue if you
  say "yes, I want to screw myself later." ;-)

- Replaced 'zctl' with Tres' 'zopectl'.  In the process,
  refactored zopectl so that it uses a Squid-like config file.
  The config file consists of "directives", each of
  which has a particular set of possible values explained
  in the config file.  The config file provides a uniform
  front-end to the mish-mash of environment variables
  and command-line switches that you normally need to
  deal with when you configure a Zope instance.

- Created a new package in software_home named Controller
  which holds the zctl libraries and some useful scripts
  to create directives.

- Merged HEAD changes onto branch.



=== Zope/configure 1.1.4.1 => 1.1.4.2 ===
--- Zope/configure:1.1.4.1	Thu Aug 22 00:30:15 2002
+++ Zope/configure	Mon Aug 26 02:22:36 2002
@@ -1,16 +1,22 @@
 #!/bin/sh
-#bootstrap ourselves by finding a Python interpreter
+
+# Zope buildout configure script
+# $Id$
+# $Revision$
+
+# bootstrap ourselves by finding a Python interpreter
+HERE=`dirname $0`
 OLDIFS="$IFS"
 IFS=":"
 TARGET=2.1.3
 ACCEPTABLE="2.1.2 2.1.1 2.1.0 2.2 2.2.1"
 EXENAMES="python python2 python2.1 python2.2"
 FOUND=""
-HERE=`dirname $0`
 echo
 echo "Configuring Zope installation"
 echo
 echo "Testing for an acceptable Python interpreter..."
+echo
 for dir in $PATH; do
     IFS=$OLDIFS
     for executable in $EXENAMES; do
@@ -18,9 +24,10 @@
         if [ -x $full ]; then
             cmd="import string,sys;print string.split(sys.version)[0]"
             version=`$full -c "$cmd"`
+            echo "  Python version $version found at $full"
             if [ $version = $TARGET ]; then
                 FOUND=$full
-                break 2
+		break 2
             else
                 for acceptable in $ACCEPTABLE; do
                     if [ $version = $acceptable ]; then
@@ -31,17 +38,22 @@
         fi
     done
 done
+echo
 PYTHON=$full
 if [ -z "$FOUND" ]; then
-    echo "  No suitable Python version found.  You must install Python \
-version $TARGET before continuing.  Versions $ACCEPTABLE will also work, \
-but not as optimally."
+    echo "  No suitable Python version found.  You must install Python"
+    echo "  version $TARGET before continuing.  Versions $ACCEPTABLE"
+    echo "  also work, but not as optimally."
     exit 127
 elif [ $version = $TARGET ]; then
     echo "  The optimimum Python version ($TARGET) was found at $full."
 else
-    echo "  An acceptable, but non-optimal version of Python ($version) was\
-found at $full but consider using version $TARGET instead before running \
-'make'."
+    echo "  !! WARNING !! "
+    echo "  An acceptable, but non-optimal version of Python ($version) was"
+    echo "  found at '$full' but consider installing version $TARGET"
+    echo "  before running 'make'."
 fi
+echo
+
+# run the Python configurator
 $full $HERE/inst/configure.py $@


=== Zope/setup.py 1.10 => 1.10.4.1 ===
--- Zope/setup.py:1.10	Thu Jul 18 11:25:47 2002
+++ Zope/setup.py	Mon Aug 26 02:22:36 2002
@@ -414,6 +414,14 @@
     cmdclass={'install_data': install_data}
 )
 
+# Signals
+setup(
+    name='Signals',
+    author=AUTHOR,
+
+    packages=['Signals'],
+)
+
 # ZRDB
 setup(
     name='ZRDB',