Log message for revision 68082: Collector #2081: 'make instance' forced inappropriate dir, credentials. "This time for sure!"
Changed: U Zope/branches/2.9/doc/CHANGES.txt U Zope/branches/2.9/inst/Makefile.in -=- Modified: Zope/branches/2.9/doc/CHANGES.txt =================================================================== --- Zope/branches/2.9/doc/CHANGES.txt 2006-05-10 17:19:02 UTC (rev 68081) +++ Zope/branches/2.9/doc/CHANGES.txt 2006-05-10 17:38:17 UTC (rev 68082) @@ -18,6 +18,8 @@ Bugs fixed + - Collector #2082: 'make install' broken. + - Collector #2081: 'make instance' forced inappropriate dir, credentials. - Collector #1447: When editing content on a virtual-hosted zope, Modified: Zope/branches/2.9/inst/Makefile.in =================================================================== --- Zope/branches/2.9/inst/Makefile.in 2006-05-10 17:19:02 UTC (rev 68081) +++ Zope/branches/2.9/inst/Makefile.in 2006-05-10 17:38:17 UTC (rev 68082) @@ -57,13 +57,22 @@ # 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} \ - --dir="${BASE_DIR}" + ${PYTHON} "${BASE_DIR}/utilities/mkzopeinstance.py" ${MKZ_FLAGS} -# uninstance: Remove the instance files made by make instance (w/ prejudice) +# 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" @@ -72,16 +81,6 @@ ${RMRF} "${BASE_DIR}/var" ${RMRF} "${BASE_DIR}/Products" -# 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 -testinst: instance - -# test: Do an inplace build and run the Zope test suite. -test: inplace - ${PYTHON} "${BASE_DIR}/test.py" ${TESTOPTS} - # clean: Delete the build files and any binaries/bytecode files in # the source directory for good measure. clean: _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins