Log message for revision 68115: - A try at syncing the makefile.win.in with makefile.in
Changed: U Zope/branches/2.9/inst/Makefile.in U Zope/branches/2.9/inst/Makefile.win.in U Zope/branches/2.9/inst/configure.py -=- Modified: Zope/branches/2.9/inst/Makefile.in =================================================================== --- Zope/branches/2.9/inst/Makefile.in 2006-05-12 22:11:44 UTC (rev 68114) +++ Zope/branches/2.9/inst/Makefile.in 2006-05-13 03:38:11 UTC (rev 68115) @@ -11,7 +11,7 @@ PYTHON="<<PYTHON>>" ZPKG=zpkg -TMPDIR=/tmp +TMPDIR=<<TMP_DIR>> PREFIX=<<PREFIX>> BASE_DIR=<<BASE_DIR>> DISTUTILS_OPTS=<<DISTUTILS_OPTS>> Modified: Zope/branches/2.9/inst/Makefile.win.in =================================================================== --- Zope/branches/2.9/inst/Makefile.win.in 2006-05-12 22:11:44 UTC (rev 68114) +++ Zope/branches/2.9/inst/Makefile.win.in 2006-05-13 03:38:11 UTC (rev 68115) @@ -10,16 +10,14 @@ PACKAGE_NAME=$(NAME)-$(MAJOR_VERSION).$(MINOR_VERSION)-$(RELEASE_TAG) PYTHON="<<PYTHON>>" -PREFIX=<<PREFIX>> -BASE_DIR=<<BASE_DIR>> -BUILD_BASE=<<BUILD_BASE>> +ZPKG=zpkg +TMPDIR="<<TMP_DIR>>" +PREFIX="<<PREFIX>>" +BASE_DIR="<<BASE_DIR>>" DISTUTILS_OPTS=<<DISTUTILS_OPTS>> INSTALL_FLAGS=<<INSTALL_FLAGS>> TESTOPTS=-v -BUILD_FLAGS=--build-base="$(BUILD_BASE)" \ - --build-lib="$(BUILD_BASE)\build-lib" \ - --build-scripts="$(BUILD_BASE)\build-scripts" \ - --build-temp="$(BUILD_BASE)\build-temp" +BUILD_FLAGS=-i RM=del /f /q !IF ("$(OS)" == "Windows_NT") @@ -37,37 +35,74 @@ @ echo Zope built. Next, do 'nmake install'. @ echo. -.PHONY: clean install build unbuild -.PHONY: default +.PHONY : clean install instance untestinst testinst build +.PHONY : default # build: Do whatever 'setup.py build' implies build: $(PYTHON) "$(BASE_DIR)\setup.py" \ - $(DISTUTILS_OPTS) build $(BUILD_FLAGS) + $(DISTUTILS_OPTS) build_ext $(BUILD_FLAGS) -# unbuild: Remove the build directory (undo the make build step) -unbuild: - -$(RMRF) $(BUILD_BASE) - # install: Install a software home. install: build version_txt - $(PYTHON) "$(BASE_DIR)\setup.py" $(DISTUTILS_OPTS) install \ - --prefix="$(PREFIX)" $(BUILD_FLAGS) $(INSTALL_FLAGS) + $(PYTHON) "$(BASE_DIR)\setup.py" $(DISTUTILS_OPTS) \ + build_ext $(BUILD_FLAGS) \ + install --home="$(PREFIX)" $(INSTALL_FLAGS) @ echo. @ echo Zope binaries installed successfully. @ echo Now run '$(PYTHON) $(PREFIX)\bin\mkzopeinstance.py' +# inplace: Do an in-place build +inplace: build + +# test: Do an inplace build and run the Zope test suite. +test: inplace + $(PYTHON) "$(BASE_DIR)\test.py" $(TESTOPTS) + +# instance: Do an inplace build and create an instance home in the resulting +# software home. +instance: build + $(PYTHON) "$(BASE_DIR)\utilities\mkzopeinstance.py" $(MKZ_FLAGS) + +# testinst: Perform an inplace build and create an instance home in the +# resulting software home without asking questions. Useful when +# performing automated testing. +# testinst: MKZ_FLAGS=--user=admin:admin --dir="$(BASE_DIR)" +# testinst: instance + +# uninstance: Remove the instance files made by testinstance (w/ prejudice) +uninstance: + $(RMRF) "$(BASE_DIR)/bin" + $(RMRF) "$(BASE_DIR)/etc" + $(RMRF) "$(BASE_DIR)/import" + $(RMRF) "$(BASE_DIR)/log" + $(RMRF) "$(BASE_DIR)/var" + $(RMRF) "$(BASE_DIR)/Products" + +# clean: Delete the build files and any binaries/bytecode files in +# the source directory for good measure. +clean: + $(CD) "$(BASE_DIR)" + -$(RM) /s *.pyc *.pyo *.dll *.o *.obj *.pyd + -$(RM) "$(BASE_DIR)\lib\python\version.txt" + -$(RMRF) build + # version_txt: create a version file in lib/python/version.txt version_txt: echo Zope $(MAJOR_VERSION).$(MINOR_VERSION)-$(RELEASE_TAG) >\ "$(BASE_DIR)/lib/python/version.txt" -# clean: Delete the build files and any binaries/bytecode files in -# the source directory for good measure. -clean: unbuild - $(CD) "$(BASE_DIR) - -$(RM) /s *.pyc *.pyo *.dll *.o *.obj *.pyd - -$(RM) (BASE_DIR)\lib\python\version.txt +# Building a source distribution requires that zpkg be available: +sdist: version_txt + $(ZPKG) -C $(BASE_DIR)\releases\Zope2.cfg -r $(MAJOR_VERSION).$(MINOR_VERSION)$(RELEASE_TAG) +# clobber: Make the source tree 'pristine' again. +clobber: clean uninstance +# distclean: Make the source tree *really* 'pristine' again. +distclean: clobber + $(RM) makefile Makefile + $(RMRF) build-base + + Modified: Zope/branches/2.9/inst/configure.py =================================================================== --- Zope/branches/2.9/inst/configure.py 2006-05-12 22:11:44 UTC (rev 68114) +++ Zope/branches/2.9/inst/configure.py 2006-05-13 03:38:11 UTC (rev 68115) @@ -17,6 +17,7 @@ import os import sys import versions +import tempfile QUIET=0 @@ -34,6 +35,7 @@ global PREFIX BASE_DIR=os.path.abspath(os.path.dirname(os.path.dirname(sys.argv[0]))) PYTHON=sys.executable + TMP_DIR = tempfile.gettempdir() MAKEFILE=open(os.path.join(BASE_DIR, 'inst', IN_MAKEFILE)).read() REQUIRE_LF_ENABLED = 1 REQUIRE_ZLIB = 1 @@ -82,6 +84,7 @@ '<<PYTHON>>':PYTHON, '<<PREFIX>>':PREFIX, '<<BASE_DIR>>':BASE_DIR, + '<<TMP_DIR>>':TMP_DIR, '<<INSTALL_FLAGS>>':INSTALL_FLAGS, '<<ZOPE_MAJOR_VERSION>>':versions.ZOPE_MAJOR_VERSION, '<<ZOPE_MINOR_VERSION>>':versions.ZOPE_MINOR_VERSION, _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins