[Zope-Checkins] SVN: Zope/branches/2.9/inst/Makefile.in Reverted r40251 as I quite obviously didn't know what I was doing.

[Stefan H. Holek]

Log message for revision 40894:
  Reverted r40251 as I quite obviously didn't know what I was doing.
  

Changed:
  U   Zope/branches/2.9/inst/Makefile.in

-=-
Modified: Zope/branches/2.9/inst/Makefile.in
===
--- Zope/branches/2.9/inst/Makefile.in  2005-12-20 06:30:34 UTC (rev 40893)
+++ Zope/branches/2.9/inst/Makefile.in  2005-12-20 08:58:00 UTC (rev 40894)
@@ -48,7 +48,7 @@
 install:
${PYTHON} ${BASE_DIR}/setup.py ${DISTUTILS_OPTS} \
   build_ext ${BUILD_FLAGS} \
-  install --home=${PREFIX} ${INSTALL_FLAGS}
+  install --skip-build --home=${PREFIX} ${INSTALL_FLAGS}
[ -f ${PREFIX}/bin/python ] || ${LN} ${PYTHON} ${PREFIX}/bin/python
@echo
@echo Zope binaries installed successfully.

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/inst/Makefile.in Merged Zope-2_9-branch r40893:40894 into the trunk.

[Stefan H. Holek]

Log message for revision 40895:
  Merged Zope-2_9-branch r40893:40894 into the trunk.
  (Reverted r40251 as I quite obviously didn't know what I was doing.)
  

Changed:
  U   Zope/trunk/inst/Makefile.in

-=-
Modified: Zope/trunk/inst/Makefile.in
===
--- Zope/trunk/inst/Makefile.in 2005-12-20 08:58:00 UTC (rev 40894)
+++ Zope/trunk/inst/Makefile.in 2005-12-20 09:02:24 UTC (rev 40895)
@@ -48,7 +48,7 @@
 install: version_txt
${PYTHON} ${BASE_DIR}/setup.py ${DISTUTILS_OPTS} \
   build_ext ${BUILD_FLAGS} \
-  install --home=${PREFIX} ${INSTALL_FLAGS}
+  install --skip-build --home=${PREFIX} ${INSTALL_FLAGS}
[ -f ${PREFIX}/bin/python ] || ${LN} ${PYTHON} ${PREFIX}/bin/python
@echo
@echo Zope binaries installed successfully.

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/OFS/CopySupport.py Forgotten import.

[Florent Guillaume]

Log message for revision 40929:
  Forgotten import.
  

Changed:
  U   Zope/trunk/lib/python/OFS/CopySupport.py

-=-
Modified: Zope/trunk/lib/python/OFS/CopySupport.py
===
--- Zope/trunk/lib/python/OFS/CopySupport.py2005-12-21 00:04:08 UTC (rev 
40928)
+++ Zope/trunk/lib/python/OFS/CopySupport.py2005-12-21 00:05:31 UTC (rev 
40929)
@@ -34,6 +34,7 @@
 from App.Dialogs import MessageDialog
 from webdav.Lockable import ResourceLockedError
 from zExceptions import Unauthorized, BadRequest
+from ZODB.POSException import ConflictError
 from zope.interface import implements
 from zope.event import notify
 from zope.app.event.objectevent import ObjectCopiedEvent

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.9/releases/Zope2/test.py replaced old testrunner with most current version

[Andreas Jung]

Log message for revision 40940:
  replaced old testrunner with most current version
  

Changed:
  U   Zope/branches/2.9/releases/Zope2/test.py

-=-
Modified: Zope/branches/2.9/releases/Zope2/test.py
===
--- Zope/branches/2.9/releases/Zope2/test.py2005-12-21 06:40:00 UTC (rev 
40939)
+++ Zope/branches/2.9/releases/Zope2/test.py2005-12-21 06:41:43 UTC (rev 
40940)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python
 ##
 #
 # Copyright (c) 2004 Zope Corporation and Contributors.
@@ -12,25 +12,87 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##
-Test script for running unit tests in a distribution root.
+Zope 2 test script
 
-The functional tests can't be run since we don't have enough of the
-package configuration in a usable state.  The functional tests can be
-run from an installation.
+see zope.testing testrunner.txt
 
-$Id$
+$Id: test.py 33303 2005-07-13 22:28:33Z jim $
 
-import sys, os
-from distutils.util import get_platform
 
-PLAT_SPEC = %s-%s % (get_platform(), sys.version[0:3])
+import os.path, sys
 
-here = os.path.dirname(os.path.realpath(__file__))
-lib = os.path.join(here, build, lib. + PLAT_SPEC)
-sys.path.append(lib)
+shome = os.environ.get('SOFTWARE_HOME')
+zhome = os.environ.get('ZOPE_HOME')
+ihome = os.environ.get('INSTANCE_HOME')
 
-import zope.app.testing.test
+if zhome:
+zhome = os.path.abspath(zhome)
+if shome:
+shome = os.path.abspath(shome)
+else:
+shome = os.path.join(zhome, 'lib', 'python')
+elif shome:
+shome = os.path.abspath(shome)
+zhome = os.path.dirname(os.path.dirname(shome))
+elif ihome:
+print  sys.stderr, '''
+If INSTANCE_HOME is set, then at least one of SOFTWARE_HOME or ZOPE_HOME
+must be set
+'''
+else:
+# No zope home, assume that it is the script directory
+zhome = os.path.abspath(os.path.dirname(sys.argv[0]))
+shome = os.path.join(zhome, 'lib', 'python')
 
-if __name__ == '__main__':
-args = sys.argv[:1] + [-ul, lib] + sys.argv[1:]
-zope.app.testing.test.process_args(args)
+sys.path.insert(0, shome)
+
+defaults = '--tests-pattern ^tests$ -v'.split()
+defaults += ['-m',
+ '!^('
+ 'ZConfig'
+ '|'
+ 'BTrees'
+ '|'
+ 'persistent'
+ '|'
+ 'ThreadedAsync'
+ '|'
+ 'transaction'
+ '|'
+ 'ZEO'
+ '|'
+ 'ZODB'
+ '|'
+ 'ZopeUndo'
+ '|'
+ 'zdaemon'
+ '|'
+ 'zope[.]testing'
+ '|'
+ 'zope[.]app'
+ ')[.]']
+if ihome:
+ihome = os.path.abspath(ihome)
+defaults += ['--path', os.path.join(ihome, 'lib', 'python')]
+products = os.path.join(ihome, 'Products')
+if os.path.exists(products):
+defaults += ['--package-path', products, 'Products']
+else:
+defaults += ['--test-path', shome]
+
+from zope.testing import testrunner
+
+def load_config_file(option, opt, config_file, *ignored):
+config_file = os.path.abspath(config_file)
+print Parsing %s % config_file
+import Zope2
+Zope2.configure(config_file)
+
+testrunner.setup.add_option(
+'--config-file', action=callback, type=string, dest='config_file',
+callback=load_config_file,
+help=\
+Initialize Zope with the given configuration file.
+)
+
+sys.exit(testrunner.run(defaults))

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins