[Zope-CVS] CVS: Zope - Makefile.in:1.1.4.4 configure:1.1.4.8 makeinstance.in:1.1.2.3 stupid_clean:NONE w_pcgi.py:NONE wo_pcgi.py:NONE z2.py:NONE

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	Makefile.in configure makeinstance.in 
Removed Files:
      Tag: chrism-install-branch
	stupid_clean w_pcgi.py wo_pcgi.py z2.py 
Log Message:
Removed now-unnecessary files including z2.py, wo_pcgi.py, w_pcgi.py,
and several files in the inst directory.

Server ports may now be disabled by using the 'off' argument to their
respective directives.

Python module compilation now happens in the 'make install' step inside
the destination directory.  This prevents tracebacks from containing
the filenames of the files in the build directory.


=== Zope/Makefile.in 1.1.4.3 => 1.1.4.4 ===
--- Zope/Makefile.in:1.1.4.3	Thu Aug 29 12:38:14 2002
+++ Zope/Makefile.in	Mon Sep 16 01:49:42 2002
@@ -3,9 +3,9 @@
 # We do as much as possible in Python in order to avoid needing to
 # learn autoconf or some other awful thing. ;-)
 
-PYTHON="%(python)s"
-ZOPE_HOME=%(zope_home)s
-BUILD_DIR=%(build_dir)s
+PYTHON=<<PYTHON>>
+ZOPE_HOME=<<ZOPE_HOME>>
+BUILD_DIR=<<BUILD_DIR>>
 RM=rm -rf
 FIND=find
 XARGS=xargs
@@ -13,14 +13,14 @@
 .PHONY : clean install uninstall instance
 
 build:
-	${PYTHON} "${BUILD_DIR}/inst/compile_all.py"
-	${PYTHON} -c "open('${BUILD_DIR}/build', 'w')"
+	"${PYTHON}" "${BUILD_DIR}/setup.py" build_ext -i
+	"${PYTHON}" -c "open('${BUILD_DIR}/build', 'w')"
 	@echo Zope built.  Next, do \'make install\' \(or \'make instance\'
 	@echo to run a Zope instance directly from the build directory\).
 	@echo
 
 install: build
-	${PYTHON} "${BUILD_DIR}/inst/source_install.py" --src="${BUILD_DIR}"\
+	"${PYTHON}" "${BUILD_DIR}/inst/source_install.py" --src="${BUILD_DIR}"\
           --dst="${ZOPE_HOME}" --rm-from-dst="Makefile Makefile.in configure\
           stupid_clean w_pcgi.py wo_pcgi.py setup.py start stop build\
           inituser makeinstance.in *.pyc *.pyo"
@@ -29,7 +29,7 @@
 	@echo Now run \'${ZOPE_HOME}/makeinstance.\'
 
 instance: build
-	${PYTHON} "${BUILD_DIR}/inst/make_instance.py"
+	"${PYTHON}" "${BUILD_DIR}/inst/make_instance.py"
 
 uninstall:
 	${RM} "${ZOPE_HOME}"


=== Zope/configure 1.1.4.7 => 1.1.4.8 ===
--- Zope/configure:1.1.4.7	Tue Sep 10 23:19:09 2002
+++ Zope/configure	Mon Sep 16 01:49:42 2002
@@ -45,13 +45,13 @@
 		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
+		if [ "$VERSION" = "$TARGET" ]; then
 		    FOUND=$FULL
 		    FOUNDVERSION=$VERSION
 		    break 2
 		else
 		    for ACC in $ACCEPTABLE; do
-			if [ $VERSION = $ACC ]; then
+			if [ "$VERSION" = "$ACC" ]; then
 			    FOUND=$FULL
 			    FOUNDVERSION=$VERSION
 			fi
@@ -65,7 +65,7 @@
 	echo "  version $TARGET before continuing.  Versions $ACCEPTABLE"
 	echo "  also work, but not as optimally."
 	exit 127
-    elif [ $VERSION = $TARGET ]; then
+    elif [ "$VERSION" = "$TARGET" ]; then
 	echo "  The optimimum Python version ($TARGET) was found at $FOUND."
     else
 	echo "  !! WARNING !! "


=== Zope/makeinstance.in 1.1.2.2 => 1.1.2.3 ===
--- Zope/makeinstance.in:1.1.2.2	Thu Aug 29 12:38:14 2002
+++ Zope/makeinstance.in	Mon Sep 16 01:49:42 2002
@@ -1,2 +1,2 @@
 #!/bin/sh
-%(python)s %(zope_home)s/inst/make_instance.py $@
+"<<PYTHON>>" "<<ZOPE_HOME>>/inst/make_instance.py" $@

=== Removed File Zope/stupid_clean ===

=== Removed File Zope/w_pcgi.py ===

=== Removed File Zope/wo_pcgi.py ===

=== Removed File Zope/z2.py ===