[Zope-Checkins] CVS: Zope - Makefile.in:1.1.2.3 configure:1.1.2.4 setup.py:1.3.4.3 z2.py:1.65.24.1

[Matt Behrens]

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

Modified Files:
      Tag: zigg_unix-install-control-config-branch
	Makefile.in configure setup.py z2.py 
Log Message:
More progress:

- Rewrite the control script to not have any special knowledge of
  'create', to help maintain the divorce from what the software home's
  control package does.

- Add ZOPE_HOME, now that it's needed (to look at the default imports).

- A few more portability fixes (now working on Linux).

- Start to option-enable z2.py, though there is no code yet.



=== Zope/Makefile.in 1.1.2.2 => 1.1.2.3 ===
 DESTDIR=
 
-build:
+all:
 	${PYTHON} setup.py build
 
-install:	install-zope install-control-util register-installation
+install:	install-zope install-control register
 
 install-zope:
 	${PYTHON} setup.py install \
@@ -40,11 +40,11 @@
 		--install-platlib=${DESTDIR}${SOFTWARE_DIR}/${SOFTWARE_NAME} \
 		--install-purelib=${DESTDIR}${SOFTWARE_DIR}/${SOFTWARE_NAME}
 
-install-control-util:
+install-control:
 	install -d -m 755 ${DESTDIR}${BINDIR}
 	install -C -m 755 ZopeControl/zope ${DESTDIR}${BINDIR}
 
-register-installation:
+register:
 	install -d -m 755 ${DESTDIR}${CONFIG_DIR}
 	${PYTHON} inst/register_software.py ${CONFIG_DIR} ${SOFTWARE_NAME} \
 		${SOFTWARE_DIR}/${SOFTWARE_NAME} ${REGISTER_DEFAULT}


=== Zope/configure 1.1.2.3 => 1.1.2.4 ===
 # Search for these Python binaries by default.	Matches later in the list
 # win over ones earlier in the list.
-SEARCH_PYTHONS="python python$SUPPORTED_PATCHLEVEL python$SUPPORTED_VERSION"
+SEARCH_PYTHONS="python python2 python$SUPPORTED_PATCHLEVEL python$SUPPORTED_VERSION"
 
 # Default paths.
 PREFIX=/usr/local
@@ -144,7 +144,6 @@
     for search_python in $SEARCH_PYTHONS; do
 	if _which $search_python >/dev/null 2>&1; then
 	    python=`_which $search_python`
-	    echo $python is \\\c
 	    if $python inst/acceptable_version.py $SUPPORTED_VERSION $SUPPORTED_PATCHLEVEL; then
 		PYTHON=$python
 	    fi
@@ -159,7 +158,6 @@
 else
     if _which $OVERRIDE_PYTHON >/dev/null 2>&1; then
 	PYTHON=`_which $OVERRIDE_PYTHON`
-	echo $PYTHON is \\\c
 	if $PYTHON inst/acceptable_version.py $SUPPORTED_VERSION $SUPPORTED_PATCHLEVEL; then
 	    echo This is an acceptable version of Python for this version of Zope.
 	else


=== Zope/setup.py 1.3.4.2 => 1.3.4.3 ===
 			   '../Components/zlib/infcodes.c',
 			   '../Components/zlib/infutil.c',
-			   '../Components/zlib/inffast.c'])]
+			   '../Components/zlib/inffast.c',
+			   '../Components/zlib/zlib.c'])]
 )
 
 # initgroups
@@ -942,5 +943,22 @@
     author=AUTHOR,
 
     py_modules=['z2']
+)
+
+# zpasswd
+setup(
+    name='zpasswd',
+    author=AUTHOR,
+
+    py_modules=['zpasswd']
+)
+
+# Default imports
+setup(
+    name='Zope default imports',
+    author=AUTHOR,
+
+    data_files=[['import', ['import/*.zexp']]],
+    cmdclass={'install_data': install_data}
 )
 


=== Zope/z2.py 1.65 => 1.65.24.1 ===
       - The end of the request.
 
+  -C file
+
+     Read instance settings from the given configuration file.  All
+     other command-line options, including overrides (-o), take
+     precedence over settings in the configuration file.
+
+  -o section.option=value
+
+     Override the given configuration option with the given value.
+     Repeat as many times as necessary for each override.  Overrides
+     take precedence over the configuration file and over other
+     command line options.
+
 Environment settings are of the form: NAME=VALUE.
 
 Note: you *must* use Python 2.1 or later!
@@ -357,7 +370,7 @@
         raise 'Invalid python version', sys.version.split()[0]
 
     opts, args = getopt.getopt(sys.argv[1:],
-                               'hz:Z:t:i:a:d:u:w:W:f:p:m:Sl:2DP:rF:L:XM:',
+                               'hz:Z:t:i:a:d:u:w:W:f:p:m:Sl:2DP:rF:L:XM:C:o:',
                                ['icp=',
                                ])