Log message for revision 68989:
Merge tseaver-retire_spkg branch.
Changed:
D Zope/branches/2.9/buildsupport/
U Zope/branches/2.9/configure
U Zope/branches/2.9/doc/CHANGES.txt
U Zope/branches/2.9/inst/Makefile.in
U Zope/branches/2.9/inst/configure.py
_U Zope/branches/2.9/lib/python/
_U Zope/branches/2.9/lib/python/Zope2/
_U Zope/branches/2.9/lib/python/zope/
A Zope/branches/2.9/lib/python/zope/app/
A Zope/branches/2.9/lib/python/zope/app/EXTERNALS.txt
A Zope/branches/2.9/lib/python/zope/app/__init__.py
D Zope/branches/2.9/releases/
U Zope/branches/2.9/setup.py
-=-
Modified: Zope/branches/2.9/configure
===================================================================
--- Zope/branches/2.9/configure 2006-07-05 21:11:37 UTC (rev 68988)
+++ Zope/branches/2.9/configure 2006-07-05 21:21:49 UTC (rev 68989)
@@ -38,7 +38,8 @@
{
echo
echo "configure [--help] [--quiet] [--with-python=path] [--prefix=path] "
- echo " [--ignore-largefile] [--ignore-zlib] [--optimize]"
+ echo " [--build-base=path] [--ignore-largefile] [--ignore-zlib]"
+ echo " [--optimize]"
echo
echo " Creates a Makefile suitable for building and installing Zope"
echo
@@ -47,6 +48,7 @@
echo " --quiet suppress nonessential output"
echo " --with-python specify a path to a Python interpreter to use"
echo " --prefix specify an installation path for binary data"
+ echo " --build-base specify a temporary path for build files"
echo " --ignore-largefile ignore large file support warnings"
echo " --ignore-expat ignore warnings about expat/pyexpat"
echo " --ignore-zlib ignore warnings about zlib"
Modified: Zope/branches/2.9/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.9/doc/CHANGES.txt 2006-07-05 21:11:37 UTC (rev 68988)
+++ Zope/branches/2.9/doc/CHANGES.txt 2006-07-05 21:21:49 UTC (rev 68989)
@@ -47,6 +47,11 @@
- Collector #2063: cleaned up some mess in MailHost.sendTemplate()
+ Other Changes
+
+ - Returned to the "classic" './configure && make && make install'
+ recipe, dropping the use of 'zpkg' for building Zope2 releases.
+
Zope 2.9.3 (2006/05/13)
Bugs fixed
Modified: Zope/branches/2.9/inst/Makefile.in
===================================================================
--- Zope/branches/2.9/inst/Makefile.in 2006-07-05 21:11:37 UTC (rev 68988)
+++ Zope/branches/2.9/inst/Makefile.in 2006-07-05 21:21:49 UTC (rev 68989)
@@ -10,14 +10,17 @@
PACKAGE_NAME=${NAME}-${MAJOR_VERSION}.${MINOR_VERSION}-${RELEASE_TAG}
PYTHON="<<PYTHON>>"
-ZPKG=zpkg
-TMPDIR=<<TMP_DIR>>
+TMP_DIR=<<TMP_DIR>>
PREFIX=<<PREFIX>>
BASE_DIR=<<BASE_DIR>>
+BUILD_BASE=<<BUILD_BASE>>
DISTUTILS_OPTS=<<DISTUTILS_OPTS>>
INSTALL_FLAGS=<<INSTALL_FLAGS>>
TESTOPTS=-v
-BUILD_FLAGS=-i
+BUILD_FLAGS=--build-base="${BUILD_BASE}" \
+ --build-lib="${BUILD_BASE}/build-lib" \
+ --build-scripts="${BUILD_BASE}/build-scripts"\
+ --build-temp="${BUILD_BASE}/build-temp"
RM=rm -f
RMRF=rm -rf
@@ -29,7 +32,7 @@
TAR=tar
MKDIR=mkdir -p
-.PHONY : clean install instance untestinst testinst build
+.PHONY : clean install instance untestinst testinst build unbuild
.PHONY : default
# default: The default step (invoked when make is called without a target)
@@ -39,23 +42,38 @@
@echo to run a Zope instance directly from the build directory\).
@echo
-# build:
+# build: Do whatever 'setup.py build' implies
build:
${PYTHON} "${BASE_DIR}/setup.py" \
- ${DISTUTILS_OPTS} build_ext ${BUILD_FLAGS}
+ ${DISTUTILS_OPTS} build ${BUILD_FLAGS}
+# unbuild: Remove the build directory (undo the make build step)
+unbuild:
+ ${RMRF} ${BUILD_BASE}
+
# install: Install a software home.
-install:
- ${PYTHON} "${BASE_DIR}/setup.py" ${DISTUTILS_OPTS} \
- build_ext ${BUILD_FLAGS} \
- install --home="${PREFIX}" ${INSTALL_FLAGS}
+install: build version_txt
+ ${PYTHON} "${BASE_DIR}/setup.py" ${DISTUTILS_OPTS} install \
+ --home="${PREFIX}" ${BUILD_FLAGS} ${INSTALL_FLAGS}
[ -f ${PREFIX}/bin/python ] || ${LN} ${PYTHON} ${PREFIX}/bin/python
@echo
@echo Zope binaries installed successfully.
@echo Now run \'${PREFIX}/bin/mkzopeinstance.py\'
-# inplace: Do an in-place build
-inplace: build
+# inplace: Install a software home into to the source directory.
+#
+# Note: We used to run 'build_ext -i' for 'inplace', but that was
+# suboptimal because it had a tendency to try to rebuild all of the
+# (possibly already-built) extensions that might be built during a
+# previous 'make' step. built_ext doesn't understand '--build-base'
+# and friends so we can't stop it from doing this easily. So instead,
+# we rely on the stock install step and name the prefix as the current
+# directory. This is a little less efficient than just building the
+# extensions because it also compiles bytecode, but it's more intuitive and
+# less expensive in the common case than letting distutils
+# potentially rebuild the binaries when we've done that already.
+inplace: PREFIX=${BASE_DIR}
+inplace: install
# test: Do an inplace build and run the Zope test suite.
test: inplace
@@ -83,7 +101,7 @@
# clean: Delete the build files and any binaries/bytecode files in
# the source directory for good measure.
-clean:
+clean: unbuild
${FIND} "${BASE_DIR}" \
-name '*.py[co]' -o -name '*.so' -o -name '*.o' | ${XARGS} ${RM}
${RMRF} build
@@ -93,10 +111,24 @@
printf "Zope ${MAJOR_VERSION}.${MINOR_VERSION}-${RELEASE_TAG}" >\
"${BASE_DIR}/lib/python/Zope2/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}
+# sdist: Create a source distribution file (implies clobber).
+#
+sdist: clobber sdist_tgz
+# sdist_tgz: Create a tgz archive file as a source distribution.
+#
+sdist_tgz: version_txt
+ ${MKDIR} ${TMP_DIR}
+ ${CD} ${TMP_DIR} && ${LN} ${BASE_DIR} ${PACKAGE_NAME} && \
+ ${TAR} czfh ${BASE_DIR}/${PACKAGE_NAME}.tgz \
+ --exclude=${PACKAGE_NAME}.tgz\
+ --exclude=.svn\
+ --exclude=makefile \
+ --exclude=build-base \
+ --exclude=*~ \
+ --exclude=.#* ${PACKAGE_NAME}
+ ${RMRF} ${TMP_DIR}/${PACKAGE_NAME}
+
# clobber: Make the source tree 'pristine' again.
clobber: clean uninstance
Modified: Zope/branches/2.9/inst/configure.py
===================================================================
--- Zope/branches/2.9/inst/configure.py 2006-07-05 21:11:37 UTC (rev 68988)
+++ Zope/branches/2.9/inst/configure.py 2006-07-05 21:21:49 UTC (rev 68989)
@@ -34,6 +34,8 @@
# below assumes this script is in the BASE_DIR/inst directory
global PREFIX
BASE_DIR=os.path.abspath(os.path.dirname(os.path.dirname(sys.argv[0])))
+ BUILD_BASE=os.path.join(os.getcwd(), 'build-base',
+ 'python-%s.%s' % sys.version_info[:2])
PYTHON=sys.executable
TMP_DIR = tempfile.gettempdir()
MAKEFILE=open(os.path.join(BASE_DIR, 'inst', IN_MAKEFILE)).read()
@@ -67,6 +69,8 @@
INSTALL_FLAGS = '--optimize=1 --no-compile'
if o == '--no-compile':
INSTALL_FLAGS = '--no-compile'
+ if o == '--build-base':
+ BUILD_BASE = a
if o == '--quiet':
DISTUTILS_OPTS = '-q'
global QUIET
@@ -84,6 +88,7 @@
'<<PYTHON>>':PYTHON,
'<<PREFIX>>':PREFIX,
'<<BASE_DIR>>':BASE_DIR,
+ '<<BUILD_BASE>>':BUILD_BASE,
'<<TMP_DIR>>':TMP_DIR,
'<<INSTALL_FLAGS>>':INSTALL_FLAGS,
'<<ZOPE_MAJOR_VERSION>>':versions.ZOPE_MAJOR_VERSION,
Property changes on: Zope/branches/2.9/lib/python
___________________________________________________________________
Name: svn:ignore
- *so
*.pyc
build
+ *so
*.pyc
build
zope.proxy
Property changes on: Zope/branches/2.9/lib/python/Zope2
___________________________________________________________________
Name: svn:ignore
- *so
*.pyc
build
+ *so
*.pyc
build
version.txt
Property changes on: Zope/branches/2.9/lib/python/zope
___________________________________________________________________
Name: svn:externals
- app
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/app
cachedescriptors
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/cachedescriptors
component
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/component
configuration
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/configuration
documenttemplate
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/documenttemplate
event
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/event
exceptions
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/exceptions
hookable
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/hookable
i18n
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/i18n
i18nmessageid
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/i18nmessageid
interface
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/interface
modulealias
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/modulealias
pagetemplate
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/pagetemplate
proxy
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/proxy
publisher
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/publisher
schema
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/schema
security
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/security
server
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/server
structuredtext
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/structuredtext
tal
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/tal
tales
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/tales
thread
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/thread
deprecation
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/deprecation
dottedname
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/dottedname
formlib
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/formlib
index
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/index
testbrowser
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/testbrowser
testing -r 41141
svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
contentprovider
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/contentprovider
viewlet
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/viewlet
+ cachedescriptors
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/cachedescriptors
component
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/component
configuration
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/configuration
documenttemplate
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/documenttemplate
event
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/event
exceptions
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/exceptions
hookable
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/hookable
i18n
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/i18n
i18nmessageid
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/i18nmessageid
interface
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/interface
modulealias
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/modulealias
pagetemplate
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/pagetemplate
proxy
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/proxy
publisher
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/publisher
schema
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/schema
security
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/security
server
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/server
structuredtext
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/structuredtext
tal
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/tal
tales
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/tales
thread
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/thread
deprecation
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/deprecation
dottedname
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/dottedname
formlib
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/formlib
index
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/index
testbrowser
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/testbrowser
testing -r 41141
svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
contentprovider
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/contentprovider
viewlet
svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/viewlet
Property changes on: Zope/branches/2.9/lib/python/zope/app
___________________________________________________________________
Name: svn:externals
+ adapter
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/adapter
annotation
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/annotation
apidoc
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/apidoc
applicationcontrol
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/applicationcontrol
appsetup
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/appsetup
authentication
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/authentication
basicskin
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/basicskin
broken
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/broken
cache
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/cache
component
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/component
container
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/container
content
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/content
content_types
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/content_types
copypastemove
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/copypastemove
datetimeutils
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/datetimeutils
debug
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/debug
decorator
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/decorator
dependable
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/dependable
dtmlpage
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/dtmlpage
dublincore
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/dublincore
error
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/error
event
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/event
exception
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/exception
externaleditor
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/externaleditor
file
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/file
filerepresentation
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/filerepresentation
folder
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/folder
form
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/form
ftests
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/ftests
ftp
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/ftp
generations
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/generations
http
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/http
i18n
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/i18n
interface
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/interface
intid
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/intid
introspector
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/introspector
keyreference
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/keyreference
locales
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/locales
location
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/location
mail
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/mail
onlinehelp
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/onlinehelp
pagetemplate
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/pagetemplate
preference
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/preference
preview
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/preview
principalannotation
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/principalannotation
publication
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/publication
publisher
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/publisher
rdb
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/rdb
registration
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/registration
renderer
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/renderer
rotterdam
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/rotterdam
schema
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/schema
security
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/security
servicenames
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/servicenames
session
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/session
site
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/site
size
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/size
sqlscript
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/sqlscript
testing
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/testing
tests
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/tests
timezones
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/timezones
traversing
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/traversing
tree
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/tree
undo
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/undo
utility
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/utility
wsgi
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/wsgi
xmlrpcintrospection
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/xmlrpcintrospection
zapi
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/zapi
zopeappgenerations
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/zopeappgenerations
zptpage
svn://svn.zope.org/repos/main/Zope3/branches/3.2-zope.app.externals/src/zope/app/zptpage
Added: Zope/branches/2.9/lib/python/zope/app/EXTERNALS.txt
===================================================================
--- Zope/branches/2.9/lib/python/zope/app/EXTERNALS.txt 2006-07-05 21:11:37 UTC
(rev 68988)
+++ Zope/branches/2.9/lib/python/zope/app/EXTERNALS.txt 2006-07-05 21:21:49 UTC
(rev 68989)
@@ -0,0 +1,70 @@
+adapter -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/adapter
+annotation -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/annotation
+apidoc -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/apidoc
+applicationcontrol -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/applicationcontrol
+appsetup -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/appsetup
+authentication -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/authentication
+basicskin -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/basicskin
+broken -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/broken
+cache -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/cache
+component -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/component
+container -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/container
+content -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/content
+content_types -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/content_types
+copypastemove -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/copypastemove
+datetimeutils -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/datetimeutils
+debug -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/debug
+decorator -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/decorator
+dependable -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/dependable
+dtmlpage -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/dtmlpage
+dublincore -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/dublincore
+error -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/error
+event -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/event
+exception -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/exception
+externaleditor -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/externaleditor
+file -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/file
+filerepresentation -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/filerepresentation
+folder -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/folder
+form -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/form
+ftests -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/ftests
+ftp -r 68985 svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/ftp
+generations -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/generations
+http -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/http
+i18n -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/i18n
+interface -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/interface
+intid -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/intid
+introspector -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/introspector
+keyreference -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/keyreference
+locales -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/locales
+location -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/location
+mail -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/mail
+onlinehelp -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/onlinehelp
+pagetemplate -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/pagetemplate
+preference -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/preference
+preview -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/preview
+principalannotation -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/principalannotation
+publication -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/publication
+publisher -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/publisher
+rdb -r 68985 svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/rdb
+registration -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/registration
+renderer -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/renderer
+rotterdam -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/rotterdam
+schema -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/schema
+security -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/security
+servicenames -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/servicenames
+session -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/session
+site -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/site
+size -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/size
+sqlscript -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/sqlscript
+testing -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/testing
+tests -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/tests
+timezones -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/timezones
+traversing -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/traversing
+tree -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/tree
+undo -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/undo
+utility -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/utility
+wsgi -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/wsgi
+xmlrpcintrospection -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/xmlrpcintrospection
+zapi -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/zapi
+zopeappgenerations -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/zopeappgenerations
+zptpage -r 68985
svn://svn.zope.org/repos/main/Zope3/branches/3.2/src/zope/app/zptpage
Property changes on: Zope/branches/2.9/lib/python/zope/app/EXTERNALS.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: Zope/branches/2.9/lib/python/zope/app/__init__.py
===================================================================
--- Zope/branches/2.9/lib/python/zope/app/__init__.py 2006-07-05 21:11:37 UTC
(rev 68988)
+++ Zope/branches/2.9/lib/python/zope/app/__init__.py 2006-07-05 21:21:49 UTC
(rev 68989)
@@ -0,0 +1,17 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Zope application package.
+
+$Id$
+"""
Property changes on: Zope/branches/2.9/lib/python/zope/app/__init__.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Modified: Zope/branches/2.9/setup.py
===================================================================
--- Zope/branches/2.9/setup.py 2006-07-05 21:11:37 UTC (rev 68988)
+++ Zope/branches/2.9/setup.py 2006-07-05 21:21:49 UTC (rev 68989)
@@ -1,45 +1,510 @@
-#############################################################################
+#!/usr/bin/env python2.3
+
+##############################################################################
#
-# Copyright (c) 2005 Zope Corporation and Contributors.
-# All Rights Reserved.
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
+# FOR A PARTICULAR PURPOSE
#
##############################################################################
+"""
+Distutils setup for Zope
+
+ In-place building
+
+ This builds extension modules in-place, much like build_extensions.py
+ does. Use 'setup.py' like this::
+
+ python setup.py build_ext -i
+
+ Installation
+
+ This builds extension modules, compiles python modules, and installs
+ everything needed to support Zope instances in the directory of
+ your choosing. For example, to use '/usr/local/lib/zope'::
+
+ python setup.py install \
+ --home=/usr/local/lib/zope \
+ --install-platlib=/usr/local/lib/zope \
+ --install-purelib=/usr/local/lib/zope
+"""
+ZOPE_VERSION = '2.9.4-alpha'
+
+import glob
import os
-import site
import sys
-here = os.path.dirname(os.path.abspath(__file__))
-buildsupport = os.path.join(here, "buildsupport")
+import distutils.core
-# Add 'buildsupport' to sys.path and process *.pth files from 'buildsupport':
-last = len(sys.path)
-site.addsitedir(buildsupport)
-if len(sys.path) > last:
- # Move all appended directories to the start.
- # Make sure we use ZConfig shipped with the distribution
- new = sys.path[last:]
- del sys.path[last:]
- sys.path[:0] = new
+# Override install_data to install into module directories, and to support
+# globbing on data_files.
-import zpkgsetup.package
-import zpkgsetup.publication
-import zpkgsetup.setup
+from distutils.command.install import install
+from distutils.command.install_data import install_data
+from distutils.util import convert_path
+class ZopeInstallData(install_data):
+ def finalize_options(self):
+ self.set_undefined_options('install',
+ ('install_purelib', 'install_dir'),
+ ('root', 'root'),
+ ('force', 'force'),
+ )
-context = zpkgsetup.setup.SetupContext(
- "Zope", "2.8.42", __file__)
+ def run(self):
+ self.mkpath(self.install_dir)
+ for f in self.data_files:
+ if isinstance(f, str):
+ # it's a simple file, so copy it
+ f = convert_path(f)
+ gl = glob.glob(f)
+ if len(gl) == 0:
+ raise distutils.core.DistutilsFileError, \
+ "can't copy '%s': no matching files" % f
+ for g in gl:
+ if os.path.isfile(g):
+ if self.warn_dir:
+ self.warn("setup script did not provide a "
+ "directory for '%s' -- installing "
+ "right in '%s'" %
+ (g, self.install_dir))
+ (out, _) = self.copy_file(g, self.install_dir)
+ self.outfiles.append(out)
+ else:
+ # it's a tuple with path to install to and a list of files
+ dir = convert_path(f[0])
+ if not os.path.isabs(dir):
+ dir = os.path.join(self.install_dir, dir)
+ elif self.root:
+ dir = change_root(self.root, dir)
+ self.mkpath(dir)
+ for data in f[1]:
+ data = convert_path(data)
+ gl = glob.glob(data)
+ if len(gl) == 0:
+ raise distutils.core.DistutilsFileError, \
+ "can't copy '%s': no matching files" % data
+ for g in gl:
+ if os.path.isfile(g):
+ (out, _) = self.copy_file(g, dir)
+ self.outfiles.append(out)
-context.load_metadata(
- os.path.join(here, "releases", "Zope2",
- zpkgsetup.publication.PUBLICATION_CONF))
+# We create a custom "install scheme" that works the same way on all
+# platforms. We do this in order to prevent distutils from trying to
+# guess where to put our files on a per-platform basis.
-context.walk_packages("lib/python")
-context.setup()
+ZOPE_INSTALL_SCHEME = {
+ 'purelib': '$base/lib/python',
+ 'platlib': '$base/lib/python',
+ 'headers': '$base/lib/python',
+ 'scripts': '$base/bin',
+ 'data' : '$base/lib/python',
+ }
+
+class ZopeInstall(install):
+ # give distutils install step knowledge about build file placement options
+ user_options = install.user_options + [
+ ('build-base=', None, 'base directory for build library'),
+ ('build-lib=', None, 'build directory for all distribution'),
+ ('build-scripts=', None, 'build directory for scripts'),
+ ('build-temp=', None, 'temporary build directory'),
+ ]
+ build_scripts = None
+ build_temp = None
+
+ def run(self):
+ """ Override run to pass along build location info so
+ we can use custom build directories """
+ build = self.distribution.get_command_obj('build')
+ build.build_base = self.build_base
+ build.build_lib = self.build_lib
+ build.build_scripts = self.build_scripts
+ build.build_temp = self.build_temp
+
+ install.run(self)
+
+ def select_scheme(self, name):
+ """
+ Override the default platform installation schemes, ignoring whatever
+ 'name' is passed in. For our purposes, we want to put all library,
+ header, and data into [install_base]/lib/python. Comment
+ this method out to achieve distutils-standard platform-specific
+ behavior for 'setup.py install'. This is most useful if you set the
+ [install-base] by using the '--prefix' or '--home' flags on the
+ setup.py install command line. Otherwise, all Zope software
+ will probably be installed to your Python's 'lib/python' directory.
+ """
+ scheme = ZOPE_INSTALL_SCHEME
+ import distutils.command.install
+ for key in distutils.command.install.SCHEME_KEYS:
+ attrname = 'install_' + key
+ if getattr(self, attrname) is None:
+ setattr(self, attrname, scheme[key])
+
+class ZopeDistribution(distutils.core.Distribution):
+ def __init__(self, attrs):
+ distutils.core.Distribution.__init__(self, attrs)
+ self.cmdclass["install"] = ZopeInstall
+ self.cmdclass["install_data"] = ZopeInstallData
+
+# presumes this script lives in the base dir
+BASE_DIR=os.path.dirname(os.path.abspath(sys.argv[0]))
+
+AUTHOR = 'Zope Corporation and Contributors'
+
+# Most modules are in lib/python in the source distribution
+PACKAGES_ROOT = os.path.join(BASE_DIR, 'lib', 'python')
+os.chdir(PACKAGES_ROOT)
+
+
+# Most of this is ripped from the Zope 3 setup.py.
+
+from distutils import dir_util
+from distutils.command.build import build as buildcmd
+from distutils.command.build_ext import build_ext
+from distutils.command.install_lib import install_lib as installcmd
+from distutils.core import setup
+from distutils.dist import Distribution
+from distutils.extension import Extension
+
+
+# This class serves multiple purposes. It walks the file system looking for
+# auxiliary files that distutils doesn't install properly, and it actually
+# copies those files (when hooked into by distutils). It also walks the file
+# system looking for candidate packages for distutils to install as normal.
+# The key here is that the package must have an __init__.py file.
+class Finder:
+ def __init__(self, ignore, prefix):
+ self._files = []
+ self._pkgs = {}
+ self._ignore = ignore
+ # We're finding packages in lib/python in the source dir, but we're
+ # copying them directly under build/lib.<plat>. So we need to lop off
+ # the prefix when calculating the package names from the file names.
+ self._plen = len(prefix) + 1
+
+ def visit(self, dir, files):
+ # First see if this is one of the packages we want to add, or if
+ # we're really skipping this package.
+ if '__init__.py' in files:
+ aspkg = dir[self._plen:].replace(os.sep, '.')
+ self._pkgs[aspkg] = True
+ ignore = ('.py',) + self._ignore
+ else:
+ ignore = self._ignore
+ # Add any extra files we're interested in
+ for file in files:
+ base, ext = os.path.splitext(file)
+ if ext not in ignore:
+ self._files.append(os.path.join(dir, file))
+
+ def copy_files(self, cmd, outputbase):
+ for file in self._files:
+ dest = os.path.join(outputbase, file[self._plen:])
+ # Make sure the destination directory exists
+ dir = os.path.dirname(dest)
+ if not os.path.exists(dir):
+ dir_util.mkpath(dir)
+ cmd.copy_file(file, dest)
+
+ def get_packages(self):
+ return self._pkgs.keys()
+
+def remove_stale_bytecode(arg, dirname, names):
+ names = map(os.path.normcase, names)
+ for name in names:
+ if name.endswith(".pyc") or name.endswith(".pyo"):
+ srcname = name[:-1]
+ if srcname not in names:
+ fullname = os.path.join(dirname, name)
+ print "Removing stale bytecode file", fullname
+ os.unlink(fullname)
+#
+# Aliases for directories containing headers, to allow for Zope3 extensions
+# to include headers via stuff like '#include "zope.proxy/proxy.h"
+#
+HEADER_PATH_ALIASES = {'zope.proxy': 'zope/proxy'}
+
+# Create the finder instance, which will be used in lots of places. `finder'
+# is the global we're most interested in.
+IGNORE_EXTS = ('.pyc', '.pyo', '.c', '.h', '.so', '.cfg')
+finder = Finder(IGNORE_EXTS, PACKAGES_ROOT)
+
+for dirpath, dirnames, filenames in os.walk(PACKAGES_ROOT):
+ if not '.svn' in dirpath:
+ finder.visit(dirpath, filenames)
+packages = finder.get_packages()
+
+# Distutils hook classes
+class MyBuilder(buildcmd):
+ def run(self):
+ os.path.walk(os.curdir, remove_stale_bytecode, None)
+ buildcmd.run(self)
+ finder.copy_files(self, self.build_lib)
+
+class MyExtBuilder(build_ext):
+ # Override the default build_ext to remove stale bytecodes.
+ # Technically, removing bytecode has nothing to do with
+ # building extensions, but Zope's the build_ext -i variant
+ # is used to build Zope in place.
+ #
+ # Note that we also create symlinks for the oddball include
+ # directories used by some Zope3 extensions.
+ def run(self):
+ os.path.walk(os.curdir, remove_stale_bytecode, None)
+ for k, v in HEADER_PATH_ALIASES.items():
+ if not os.path.exists(k):
+ os.symlink(v, k)
+ build_ext.run(self)
+
+class MyLibInstaller(installcmd):
+ def run(self):
+ installcmd.run(self)
+ finder.copy_files(self, self.install_dir)
+
+class MyDistribution(Distribution):
+ # To control the selection of MyLibInstaller and MyPyBuilder, we
+ # have to set it into the cmdclass instance variable, set in
+ # Distribution.__init__().
+ def __init__(self, *attrs):
+ Distribution.__init__(self, *attrs)
+ self.cmdclass['install'] = ZopeInstall
+ self.cmdclass['build'] = MyBuilder
+ self.cmdclass['build_ext'] = MyExtBuilder
+ self.cmdclass['install_lib'] = MyLibInstaller
+
+
+EXTENSIONCLASS_INCLUDEDIRS = ['ExtensionClass', '.']
+
+# All extension modules must be listed here.
+ext_modules = [
+
+ # AccessControl
+ Extension(name='AccessControl.cAccessControl',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['Acquisition'],
+ sources=['AccessControl/cAccessControl.c'],
+ depends=['ExtensionClass/ExtensionClass.h',
+ 'ExtensionClass/pickle/pickle.c',
+ 'Acquisition/Acquisition.h']),
+
+ # BTrees
+ Extension(name='BTrees._OOBTree',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
+ sources=['BTrees/_OOBTree.c']),
+ Extension(name='BTrees._OIBTree',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
+ sources=['BTrees/_OIBTree.c']),
+ Extension(name='BTrees._IIBTree',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
+ define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
+ sources=['BTrees/_IIBTree.c']),
+ Extension(name='BTrees._IOBTree',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
+ define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
+ sources=['BTrees/_IOBTree.c']),
+ Extension(name='BTrees._IFBTree',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
+ define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
+ sources=['BTrees/_IFBTree.c']),
+ Extension(name='BTrees._fsBTree',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
+ define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
+ sources=['BTrees/_fsBTree.c']),
+
+ # DocumentTemplate
+ Extension(name='DocumentTemplate.cDocumentTemplate',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
+ sources=['DocumentTemplate/cDocumentTemplate.c']),
+
+ # ExtensionClass
+ Extension(name='ExtensionClass._ExtensionClass',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
+ sources=["ExtensionClass/_ExtensionClass.c"],
+ depends=["ExtensionClass/ExtensionClass.h"]),
+ Extension(name='Acquisition._Acquisition',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
+ sources=["Acquisition/_Acquisition.c"],
+ depends=["ExtensionClass/ExtensionClass.h",
+ "Acquisition/Acquisition.h"]),
+ Extension(name='MethodObject._MethodObject',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
+ sources=["MethodObject/_MethodObject.c"],
+ depends=["ExtensionClass/ExtensionClass.h"]),
+ Extension(name='MultiMapping._MultiMapping',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
+ sources=["MultiMapping/_MultiMapping.c"],
+ depends=["ExtensionClass/ExtensionClass.h"]),
+ Extension(name='ThreadLock._ThreadLock',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
+ sources=["ThreadLock/_ThreadLock.c"],
+ depends=["ExtensionClass/ExtensionClass.h"]),
+ Extension(name='Missing._Missing',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
+ sources=["Missing/_Missing.c"],
+ depends=["ExtensionClass/ExtensionClass.h"]),
+ Extension(name='Record._Record',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
+ sources=["Record/_Record.c"],
+ depends=["ExtensionClass/ExtensionClass.h"]),
+ Extension(name='ComputedAttribute._ComputedAttribute',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
+ sources=["ComputedAttribute/_ComputedAttribute.c"],
+ depends=["ExtensionClass/ExtensionClass.h"]),
+
+ # initgroups
+ Extension(name='initgroups._initgroups',
+ sources=['initgroups/_initgroups.c']),
+
+ # indexes
+
Extension(name='Products.PluginIndexes.TextIndex.Splitter.ZopeSplitter.ZopeSplitter',
+
sources=['Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/ZopeSplitter.c']),
+
Extension(name='Products.PluginIndexes.TextIndex.Splitter.ISO_8859_1_Splitter.ISO_8859_1_Splitter',
+
sources=['Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c']),
+
Extension(name='Products.PluginIndexes.TextIndex.Splitter.UnicodeSplitter.UnicodeSplitter',
+
sources=['Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/src/UnicodeSplitter.c']),
+ Extension(name='Products.ZCTextIndex.stopper',
+ sources=['Products/ZCTextIndex/stopper.c']),
+ Extension(name='Products.ZCTextIndex.okascore',
+ sources=['Products/ZCTextIndex/okascore.c']),
+
+ #ZODB
+ Extension(name = 'persistent.cPersistence',
+ include_dirs = ['persistent'],
+ sources= ['persistent/cPersistence.c',
+ 'persistent/ring.c'],
+ depends = ['persistent/cPersistence.h',
+ 'persistent/ring.h',
+ 'persistent/ring.c']
+ ),
+ Extension(name = 'Persistence._Persistence',
+ include_dirs = ['.', 'persistent', 'ExtensionClass'],
+ sources = ['Persistence/_Persistence.c'],
+ depends = ['persistent/cPersistence.h',
+ 'ExtensionClass/ExtensionClass.h']
+ ),
+ Extension(name = 'persistent.cPickleCache',
+ include_dirs = ['persistent'],
+ sources= ['persistent/cPickleCache.c',
+ 'persistent/ring.c'],
+ depends = ['persistent/cPersistence.h',
+ 'persistent/ring.h',
+ 'persistent/ring.c']
+ ),
+ Extension(name = 'persistent.TimeStamp',
+ sources= ['persistent/TimeStamp.c']
+ ),
+ Extension(name = 'ZODB.winlock',
+ sources = ['ZODB/winlock.c']
+ ),
+
+ #zope
+ Extension("zope.proxy._zope_proxy_proxy",
+ ["zope/proxy/_zope_proxy_proxy.c"],
+ include_dirs = [".", "zope/proxy"],
+ depends = ["zope/proxy/proxy.h"]),
+
+ Extension("zope.security._proxy", ["zope/security/_proxy.c"],
+ include_dirs = [".", "zope/proxy"],
+ depends = ["zope/proxy/proxy.h"]),
+
+ Extension("zope.security._zope_security_checker",
+ ["zope/security/_zope_security_checker.c"],
+ include_dirs = [],
+ depends = []),
+
+ Extension("zope.interface._zope_interface_coptimizations",
+ ["zope/interface/_zope_interface_coptimizations.c"]),
+
+ Extension("zope.i18nmessageid._zope_i18nmessageid_message",
+ ["zope/i18nmessageid/_zope_i18nmessageid_message.c"]),
+
+ Extension("zope.hookable._zope_hookable",
+ ["zope/hookable/_zope_hookable.c"]),
+
+ Extension("zope.thread._zope_thread",
+ ["zope/thread/_zope_thread.c"]),
+
+ Extension("zope.app.container._zope_app_container_contained",
+ ["zope/app/container/_zope_app_container_contained.c"],
+ include_dirs = [".",
+ "persistent",
+ "zope/proxy",
+ "zope/app/container"],
+ depends = [
+ "persistent/cPersistence.h",
+ "zope/proxy/_zope_proxy_proxy.c",
+ ]),
+
+ ]
+
+# We're using the module docstring as the distutils descriptions.
+doclines = __doc__.split("\n")
+
+setup(name='Zope',
+ author=AUTHOR,
+ version=ZOPE_VERSION,
+ maintainer="Zope Corporation",
+ maintainer_email="zope-dev@zope.org",
+ url = "http://www.zope.org/";,
+ ext_modules = ext_modules,
+ license = "http://www.zope.org/Resources/ZPL";,
+ platforms = ["any"],
+ description = doclines[0],
+ long_description = "\n".join(doclines[2:]),
+ packages = packages,
+ distclass = MyDistribution,
+ )
+
+# The rest of these modules live in the root of the source tree
+os.chdir(BASE_DIR)
+
+IGNORE_NAMES = (
+ 'CVS', '.svn', # Revision Control Directories
+ )
+
+def skel_visit(skel, dirname, names):
+ for ignore in IGNORE_NAMES:
+ if ignore in names:
+ names.remove(ignore)
+ L = []
+ for name in names:
+ if os.path.isfile(os.path.join(dirname, name)):
+ L.append("%s/%s" % (dirname, name))
+ skel.append(("../../" + dirname, L))
+
+installed_data_files = [
+ ["../../doc", ['doc/*.txt']],
+ ["../../bin", ['utilities/README.txt']],
+ ]
+
+os.path.walk("skel", skel_visit, installed_data_files)
+
+setup(
+ name='Zope',
+ author=AUTHOR,
+
+ data_files=installed_data_files,
+ scripts=["utilities/mkzeoinstance.py", "utilities/mkzopeinstance.py",
+ "utilities/check_catalog.py", "utilities/load_site.py",
+ "utilities/requestprofiler.py", "utilities/zpasswd.py",
+ "utilities/copyzopeskel.py", "utilities/reindex_catalog.py",
+ "utilities/compilezpy.py", "utilities/decompilezpy.py",
+ "utilities/ZODBTools/timeout.py",
"utilities/ZODBTools/analyze.py",
+ "utilities/ZODBTools/checkbtrees.py",
"utilities/ZODBTools/fsdump.py",
+ "utilities/ZODBTools/fsrefs.py" , "utilities/ZODBTools/fstail.py",
+ "utilities/ZODBTools/fstest.py", "utilities/ZODBTools/migrate.py",
+ "utilities/ZODBTools/netspace.py",
"utilities/ZODBTools/parsezeolog.py",
+ "utilities/ZODBTools/repozo.py", "utilities/ZODBTools/space.py",
+ "utilities/ZODBTools/timeout.py",
"utilities/ZODBTools/zeopack.py",
+ "utilities/ZODBTools/zeoqueue.py",
"utilities/ZODBTools/zeoreplay.py",
+ "utilities/ZODBTools/zeoserverlog.py",
"utilities/ZODBTools/zeoup.py",
+ "utilities/ZODBTools/zodbload.py",
+ "test.py"],
+ distclass=ZopeDistribution,
+ )
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
