[Zope-CVS] CVS: Packages/WinBuilders - Makefile.spread:1.2
Makefile.spreadwrapper:1.2 Makefile.python:1.3
Makefile.zeo:1.4 Makefile.zope:1.3
Tim Peters
tim.one at comcast.net
Thu Feb 5 00:09:25 EST 2004
Update of /cvs-repository/Packages/WinBuilders
In directory cvs.zope.org:/tmp/cvs-serv29908
Modified Files:
Makefile.python Makefile.zeo Makefile.zope
Added Files:
Makefile.spread Makefile.spreadwrapper
Log Message:
Merging tim-zrs-branch back to the head. This mainly introduces a
different way to build Python, + some new targets needed for ZRS.
- The python and zeo targets work fine, and also the new spread and
spreadwrapper targets. They even work fine on Win98SE, provided you
don't use the native xcopy or xcopy32 (see README.txt for details).
- I had two problems with the zope target on Win98SE:
+ The Cygwin bash shell provokes a segfault in kernel32.dll when trying
to run the synthesized .bat file that runs nmake. I ran that makefile
by hand from a regular DOS box instead, then reran the Zope buildout.
+ The Zope installer built by Inno Setup complains when it tries to
extract bin\Lib\site-packages\formatter.py, claiming that the file
is corrupted. I can't see how this can be anything other than an
Inno Setup bug: Inno compressed this file itself, so if it can't
extract it from the installer it builds, whose fault is that?
Clicking the Ignore button worked fine, and Inno went on to install
a working Zope. This instance of formatter.py comes from win32all,
and is used by PythonWin to drive the Scintilla text widget. Zope
doesn't need this. Maybe this bug is specific to Win98SE; maybe
not; beware!
- All the external extension modules that come with Python 2.3.3
are included now (this includes bsddb, zlib, bz2, OpenSSL, and
pyexpat). It's no longer necessary to download the source for these.
The inputs to the Python build process are now just python.org's source
tarball + python.org's matching Windows installer. The executables
(.pyd, .dll, .exe) are extracted, pre-built, from the latter. In fact,
you don't even need a compiler anymore to run the Python part of the
buildout.
Since the Python buildout extracts all .pyds from the Windows installer,
we'll automatically get all external extension modules that may be
added in later Pythons.
A less tangible benefit is that the python.org executables are much
better tested than we can afford to do (exactly the same compiled files
ship with Python 2.3.3 on Windows).
- For the zope and zeo targets, the build tree is cleaned up before
building the installer: embedded CVS directories are purged, and
most text files (.py, .txt, .bat) are converted to have Windows
line ends. Since buildout extracts source mostly from Unix tarballs,
most text files the installer pumped out were unintelligible using
normal Windows tools (due to the Unix line ends).
- Targets that need to run Python now use the Python buildout from the
build tree. We weren't using that for anything before, except as input
to Inno Setup, so the tree we put into the installer wasn't getting
tested before (not even used).
- Assorted minor improvements to the buildout process. It's still
very complicated, alas.
=== Packages/WinBuilders/Makefile.spread 1.1 => 1.2 ===
--- /dev/null Thu Feb 5 00:09:25 2004
+++ Packages/WinBuilders/Makefile.spread Thu Feb 5 00:08:54 2004
@@ -0,0 +1,15 @@
+# Justs repackages the Spread binaries.
+# Puts binaries into build/bin.
+
+# See README.txt for system requirements.
+
+# See spread.mk for the input files required in tmp/.
+
+default: install_spread
+
+build: build_spread
+
+install: install_spread
+
+include mk/common.mk
+include mk/spread.mk
=== Packages/WinBuilders/Makefile.spreadwrapper 1.1 => 1.2 ===
--- /dev/null Thu Feb 5 00:09:25 2004
+++ Packages/WinBuilders/Makefile.spreadwrapper Thu Feb 5 00:08:54 2004
@@ -0,0 +1,16 @@
+# Zope2 build and install Makefile for win32 (gnumake-style).
+# Creates an installable executable for the Python Spread wrapper module.
+
+# See README.txt for system requirements.
+
+# See spreadwrapper.mk for the input files required in tmp/.
+
+default: install
+
+build: build_spreadwrapper
+
+install: install_spreadwrapper
+
+
+include mk/common.mk
+include mk/spreadwrapper.mk
=== Packages/WinBuilders/Makefile.python 1.2 => 1.3 ===
--- Packages/WinBuilders/Makefile.python:1.2 Sun Jan 25 23:13:29 2004
+++ Packages/WinBuilders/Makefile.python Thu Feb 5 00:08:54 2004
@@ -1,24 +1,9 @@
# Zope/ZEO build and install Makefile for Python (gnumake-style).
# Puts binaries into build/bin
-# Use a Win2k/XP machine with Cygwin and VC++
+# See README.txt for system requirements.
-# also obtain and situate the following supporting files before
-# attempting to run the makefile:
-
-# obtain the source distribution of Python 2.2.X and put the tar.gz file
-# in tmp\Python-2.2.X.tgz
-
-# obtain the binary distribution of expat for Windows
-# (expat_win32bin_1_95_6.exe) from libexpat.org and put this binary in
-# $(BUILD_DIR)\tmp
-
-# obtain the source distribution of zlib
-# (zlib-1.1.4.tar.gz) from gzip.org/zlib and put this gzipped tar file in
-# $(BUILD_DIR)\tmp
-
-# obtain the binary distribution of win32all-152.exe and put this file in
-# $(BUILD_DIR)\tmp
+# See python.mk for the input files required in tmp/.
# do "make -f <makefile_name> build"
# then "make -f <makefile_name" install
@@ -32,6 +17,8 @@
install: build install_python
+# XXX test_python doesn't exist: there's not enough stuff in the
+# build/ directory to run the Python tests successfully.
test: test_python
clean: clean_python clean_libs unbuild
@@ -41,7 +28,3 @@
include mk/common.mk
include mk/python.mk
-
-
-
-
=== Packages/WinBuilders/Makefile.zeo 1.3 => 1.4 ===
--- Packages/WinBuilders/Makefile.zeo:1.3 Fri Jan 30 01:18:11 2004
+++ Packages/WinBuilders/Makefile.zeo Thu Feb 5 00:08:54 2004
@@ -10,19 +10,7 @@
# obtain the source distribution of ZODB 3.X.X and put the tar.gz file
# in tmp\ZODB3-3.2.tar.gz
-# obtain the source distribution of Python 2.2.X and put the tar.gz file
-# in tmp\Python-2.2.X.tgz
-
-# obtain the binary distribution of expat for Windows
-# (expat_win32bin_1_95_6.exe) from libexpat.org and put this binary in
-# $(BUILD_DIR)\tmp
-
-# obtain the source distribution of zlib
-# (zlib-1.1.4.tar.gz) from gzip.org/zlib and put this gzipped tar file in
-# $(BUILD_DIR)\tmp
-
-# obtain the binary distribution of win32all-152.exe and put this file in
-# $(BUILD_DIR)\tmp
+# see python.mk for files needed to build Python
# To produce the executable:
@@ -30,7 +18,7 @@
# then "make -f <makefile_name" install
# The resulting executable will show up in the "build" subdirectory
-# as "ZEO-2.X.X-win32.exe".
+# as "ZEO-3.X.X-win32.exe".
# include common subroutines
@@ -53,6 +41,3 @@
include mk/common.mk
include mk/python.mk
include mk/zeo.mk
-
-
-
=== Packages/WinBuilders/Makefile.zope 1.2 => 1.3 ===
--- Packages/WinBuilders/Makefile.zope:1.2 Sun Jan 25 23:13:29 2004
+++ Packages/WinBuilders/Makefile.zope Thu Feb 5 00:08:54 2004
@@ -10,19 +10,7 @@
# obtain the source distribution of Zope 2.7.X and put the tar.gz file
# in tmp\Zope-2.7.X.tar.gz
-# obtain the source distribution of Python 2.2.X and put the tar.gz file
-# in tmp\Python-2.2.X.tgz
-
-# obtain the binary distribution of expat for Windows
-# (expat_win32bin_1_95_6.exe) from libexpat.org and put this binary in
-# $(BUILD_DIR)\tmp
-
-# obtain the source distribution of zlib
-# (zlib-1.1.4.tar.gz) from gzip.org/zlib and put this gzipped tar file in
-# $(BUILD_DIR)\tmp
-
-# obtain the binary distribution of win32all-152.exe and put this file in
-# $(BUILD_DIR)\tmp
+# see python.mk for files needed to build Python
# To produce the executable:
More information about the Zope-CVS
mailing list