[Zope-CVS] CVS: Zope - Makefile.in:1.1.4.3.2.1

[Tres Seaver]

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

Modified Files:
      Tag: tseaver-installer-rebranch
	Makefile.in 
Log Message:


  New branch off of Chris' installer branch:

    - Use 'python setup.py build_ext -b <ext. dir> -t <tmp dir.>' to
      get extensions built, instead of 'compileall'.

    - Make 'configure && make && make install' work from a separate
      directory (leaves source tree "pristine").

    - Factor 'configure.main()' logic into a separte configurator class.



=== Zope/Makefile.in 1.1.4.3 => 1.1.4.3.2.1 ===
--- Zope/Makefile.in:1.1.4.3	Thu Aug 29 12:38:14 2002
+++ Zope/Makefile.in	Sun Sep  1 22:06:23 2002
@@ -5,31 +5,83 @@
 
 PYTHON="%(python)s"
 ZOPE_HOME=%(zope_home)s
+SOURCE_DIR=%(source_dir)s
 BUILD_DIR=%(build_dir)s
+MKDIR=mkdir -p
+CD=cd
+CP=cp
 RM=rm -rf
 FIND=find
 XARGS=xargs
 
+EXCLUDE=\
+Makefile \
+Makefile.in \
+configure \
+inst \
+pcgi \
+stupid_clean \
+w_pcgi.py \
+wo_pcgi.py \
+setup.py \
+start \
+stop \
+build \
+inituser \
+makeinstance.in \
+*.pyc \
+*.pyo \
+
+#
+#   Copied to $PREFIX/bin
+#
+EXECUTABLES=\
+${SOURCE_DIR}/z2.py \
+${SOURCE_DIR}/zpasswd.py \
+${BUILD_DIR}/makeinstance \
+
+#
+#   Copied to $PREFIX/etc
+#
+CONFIG_FILES=\
+
 .PHONY : clean install uninstall instance
 
 build:
-	${PYTHON} "${BUILD_DIR}/inst/compile_all.py"
-	${PYTHON} -c "open('${BUILD_DIR}/build', 'w')"
+	${CD} ${SOURCE_DIR} && ${PYTHON} setup.py \
+          build_ext -b ${BUILD_DIR}/lib -t ${BUILD_DIR}/build
 	@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}"\
-          --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"
+install_exes: build
+	for exe in ${EXECUTABLES}; do \
+      ${MKDIR} ${ZOPE_HOME}/bin; \
+      ${CP} $$exe ${ZOPE_HOME}/bin; \
+    done
+
+install_cfg: build
+	for cfg in ${CONFIG_FILES}; do \
+      ${MKDIR} ${ZOPE_HOME}/etc; \
+      ${CP} $$cfg ${ZOPE_HOME}/etc; \
+    done
+
+install_libs: build
+	${MKDIR} ${ZOPE_HOME}/lib/zope
+	${CP} -r ${SOURCE_DIR}/lib/python/* ${ZOPE_HOME}/lib/zope
+	${CP} -r ${SOURCE_DIR}/ZServer ${ZOPE_HOME}/lib/zope
+
+install_extensions: build
+	${MKDIR} ${ZOPE_HOME}/lib/zope
+	${CP} -r ${BUILD_DIR}/lib/* ${ZOPE_HOME}/lib/zope
+
+install: build install_exes install_cfg install_libs install_extensions
 	@echo
-	@echo Zope binaries installed successfully.
+	@echo Zope software installed successfully.
 	@echo Now run \'${ZOPE_HOME}/makeinstance.\'
 
 instance: build
-	${PYTHON} "${BUILD_DIR}/inst/make_instance.py"
+	${PYTHON} "${SOURCE_DIR}/inst/make_instance.py"
 
 uninstall:
 	${RM} "${ZOPE_HOME}"