[Zope-CVS] CVS: Packages/WinBuilders - Makefile.python:1.2.2.1 Makefile.zeo:1.3.2.1 Makefile.zope:1.2.2.1

[Tim Peters]

Update of /cvs-repository/Packages/WinBuilders
In directory cvs.zope.org:/tmp/cvs-serv10965

Modified Files:
      Tag: tim-zrs-branch
	Makefile.python Makefile.zeo Makefile.zope 
Log Message:
Total overhaul of the way Python gets built:  we just extract precompiled
code out of the python.org Windows installer now.  Building Python from
scratch on Windows has gotten ever more complex since 2.1, and much more
so than on Linux because the Windows distro has to supply a large and
growing number of external packages too (from Sleepycat bsddb to
OpenSLL and zlib).

So you need to grab the Windows installer from python.org now, but no
longer need to get (or try to build) a dozen other non-Python packages.
Indeed, "building Python" doesn't even require a compiler now.

Also removed the test_python target, in large part because it didn't
test the Python we *install*, it tested the Python build tree, and
they're not the same thing.  The python.org Python has been tested
already, and the way we install Python is still too incomplete for many
tests to have any chance of passing from the build/ directory (basically
because the test directory and its subdirectories contain lots of
non-.py files needed to run and check the tests, and we don't install
any of those).

Changed the ZEO build process to use the Python in the build/ directory
instead of the one in the src/ directory.  Two reasons:  (1) at least
that gives *some* exercise to the Python setup in the build/ directory
(we previously didn't use it for anything, except as input to Inno
Setup); and, (2) since we're not compiling anything in the src/
directory anymore, we can't run a Python from there anymore even if
we wanted to.

The Zope build process on this branch is probably broken in that respect
now.


=== Packages/WinBuilders/Makefile.python 1.2 => 1.2.2.1 ===
--- Packages/WinBuilders/Makefile.python:1.2	Sun Jan 25 23:13:29 2004
+++ Packages/WinBuilders/Makefile.python	Sun Feb  1 00:33:48 2004
@@ -9,14 +9,6 @@
 #   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
 
@@ -41,7 +33,3 @@
 
 include mk/common.mk
 include mk/python.mk
-
-
-
-


=== Packages/WinBuilders/Makefile.zeo 1.3 => 1.3.2.1 ===
--- Packages/WinBuilders/Makefile.zeo:1.3	Fri Jan 30 01:18:11 2004
+++ Packages/WinBuilders/Makefile.zeo	Sun Feb  1 00:33:48 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.2.2.1 ===
--- Packages/WinBuilders/Makefile.zope:1.2	Sun Jan 25 23:13:29 2004
+++ Packages/WinBuilders/Makefile.zope	Sun Feb  1 00:33:48 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: