[Zope-CVS] CVS: Packages/WinBuilders/mk - common.mk:1.2 python.mk:1.3 zeo.mk:1.3 zope.mk:1.3

Tim Peters tim.one at comcast.net
Sun Jan 25 23:14:03 EST 2004


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

Modified Files:
	common.mk python.mk zeo.mk zope.mk 
Log Message:
Most of the text files here had \r\n line ends checked in to the CVS
repository, so on checkout you got \r\n line ends on Linux and \r\r\n
line ends on Windows.  This just replaces the line ends so that they're
"normal" for text files.


=== Packages/WinBuilders/mk/common.mk 1.1.1.1 => 1.2 ===
--- Packages/WinBuilders/mk/common.mk:1.1.1.1	Thu Aug 14 12:18:45 2003
+++ Packages/WinBuilders/mk/common.mk	Sun Jan 25 23:13:31 2004
@@ -1,51 +1,51 @@
-BASE_DIR=$(shell pwd)
-WIN_BASE_DIR=$(shell cygpath -w $(BASE_DIR))
-BUILD_DIR=$(BASE_DIR)/build
-WIN_BUILD_DIR=$(shell cygpath -w $(BUILD_DIR))
-SRC_DIR=$(BASE_DIR)/src
-WIN_SRC_DIR=$(shell cygpath -w $(SRC_DIR))
-TMP_DIR=$(BASE_DIR)/tmp
-WIN_TMP_DIR=$(shell cygpath -w $(TMP_DIR))
-WIN_MAKEFILEDIR=$(shell cygpath -w $(MAKEFILEDIR))
-
-RM=rm -f
-RMRF=rm -rf
-CD=cd
-XCOPY=xcopy /i /s /e /y
-CPR=cp -r
-CP=cp
-MKDIR=mkdir -p
-CVS="$(MAKEFILEDIR)/bin/cvs.exe"
-TAR=tar
-SED=sed
-TOUCH=touch
-NMAKE=nmake
-CSCRIPT=cscript
-ECHO=echo
-ISS_DIR=/c/Program Files/Inno Setup 4
-ISS_COMPILER=$(ISS_DIR)/Compil32.exe
-
-$(REQUIRED_FILES):
-	if [ -z "$(BASE_DIR)/$@" ]; then echo. &echo. & echo \
-                   You must download $(@F) and place it in "$(BASE_DIR)/tmp" &\
-                   error 1; fi
-
-PRODUCTS_DIR=build/instance/Products
-
-PYLIBDIR=build/instance/lib/python
-
-CUSTOM_REPO_TAIL=korak.zope.com:/cvs-customer/TurboIntranet
-
-CUSTOM_CVS_REPOSITORY=:ext:${CUSTOM_REPO_TAIL}
-
-SHARED_REPO_TAIL=korak.zope.com:/cvs-customer/Shared
-
-SHARED_CUSTOMER_REPOSITORY=:ext:${SHARED_REPO_TAIL}
-
-ZOPE_CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-repository
-
-CVS=/usr/bin/cvs -z7 -q
-CVS_UPDATE=${CVS} update -dP
-
-CVSROOT=:ext:korak.zope.com:/cvs-turbointranet
-
+BASE_DIR=$(shell pwd)
+WIN_BASE_DIR=$(shell cygpath -w $(BASE_DIR))
+BUILD_DIR=$(BASE_DIR)/build
+WIN_BUILD_DIR=$(shell cygpath -w $(BUILD_DIR))
+SRC_DIR=$(BASE_DIR)/src
+WIN_SRC_DIR=$(shell cygpath -w $(SRC_DIR))
+TMP_DIR=$(BASE_DIR)/tmp
+WIN_TMP_DIR=$(shell cygpath -w $(TMP_DIR))
+WIN_MAKEFILEDIR=$(shell cygpath -w $(MAKEFILEDIR))
+
+RM=rm -f
+RMRF=rm -rf
+CD=cd
+XCOPY=xcopy /i /s /e /y
+CPR=cp -r
+CP=cp
+MKDIR=mkdir -p
+CVS="$(MAKEFILEDIR)/bin/cvs.exe"
+TAR=tar
+SED=sed
+TOUCH=touch
+NMAKE=nmake
+CSCRIPT=cscript
+ECHO=echo
+ISS_DIR=/c/Program Files/Inno Setup 4
+ISS_COMPILER=$(ISS_DIR)/Compil32.exe
+
+$(REQUIRED_FILES):
+	if [ -z "$(BASE_DIR)/$@" ]; then echo. &echo. & echo \
+                   You must download $(@F) and place it in "$(BASE_DIR)/tmp" &\
+                   error 1; fi
+
+PRODUCTS_DIR=build/instance/Products
+
+PYLIBDIR=build/instance/lib/python
+
+CUSTOM_REPO_TAIL=korak.zope.com:/cvs-customer/TurboIntranet
+
+CUSTOM_CVS_REPOSITORY=:ext:${CUSTOM_REPO_TAIL}
+
+SHARED_REPO_TAIL=korak.zope.com:/cvs-customer/Shared
+
+SHARED_CUSTOMER_REPOSITORY=:ext:${SHARED_REPO_TAIL}
+
+ZOPE_CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-repository
+
+CVS=/usr/bin/cvs -z7 -q
+CVS_UPDATE=${CVS} update -dP
+
+CVSROOT=:ext:korak.zope.com:/cvs-turbointranet
+


=== Packages/WinBuilders/mk/python.mk 1.2 => 1.3 ===
--- Packages/WinBuilders/mk/python.mk:1.2	Fri Oct  3 11:53:59 2003
+++ Packages/WinBuilders/mk/python.mk	Sun Jan 25 23:13:31 2004
@@ -1,209 +1,209 @@
-# Operation notes:
-
-# During the Python build, the bsddb and _tkinter modules
-# build failures are expected.  No other build failures should occur.
-
-# test_python tests for largefile support; this requires over 2GB of
-# free space on windws because windows has no notion of sparse files.
-
-# No test_python tests are expected to fail on windows, but some tests
-# will be skipped.  Here are the tests for Python 2.2.3 that are expected
-# to be skipped:
-
-#   test_bsddb
-#   test_cd
-#   test_cl
-#   test_commands
-#   test_crypt
-#   test_curses
-#   test_dbm
-#   test_dl
-#   test_email_codecs
-#   test_fcntl
-#   test_fork1
-#   test_gdbm
-#   test_gl
-#   test_grp
-#   test_imgfile
-#   test_linuxaudiodev
-#   test_mhlib
-#   test_nis
-#   test_optnpty
-#   test_poll
-#   test_pty
-#   test_pwd
-#   test_signal
-#   test_socket_ssl
-#   test_sunaudiodev
-#   test_timing
-
-# some deprecation warnings about :complex divmod(), // and % are deprecated"
-# are expected during the test run as well
-
-PYTHON_REQUIRED_FILES=tmp/$(ZLIBDIRNAME).tar.gz \
-               tmp/expat_win32bin_$(EXPATVERSION).exe \
-               tmp/$(W32ALLDIRNAME).exe \
-               tmp/$(PYDIRNAME).tgz \
-
-PYPROJECTS=pythoncore python pythonw parser _socket _sre \
-           _symtable _testcapi mmap select unicodedata w9xpopen winreg \
-           winsound pyexpat zlib \
-
-PYPROJECTS_BUILDFLAGS=$(PYPROJECTS:%=$(PYPCBUILDDIR)/%.builtflag)
-
-PYVERSION=2.3.2
-PYDIRNAME=Python-$(PYVERSION)
-PYSRCDIR=$(BASE_DIR)/src/$(PYDIRNAME)
-WIN_PYSRCDIR=$(shell cygpath -w $(PYSRCDIR))
-PYPCBUILDDIR=$(PYSRCDIR)/PCbuild
-WIN_PYPCBUILDDIR=$(shell cygpath -w $(PYPCBUILDDIR))
-SETPATH=import sys; \
-       sys.path=['$(WIN_PYSRCDIR)\\Lib\\test','$(WIN_PYPCBUILDDIR)','$(WIN_PYSRCDIR)\\Lib']
-PYTESTCMD=$(SETPATH); from test import regrtest; \
-          regrtest.main(use_resources=['largefile','network'])
-
-W32ALLVERSION=157
-W32ALLDIRNAME=win32all-$(W32ALLVERSION)
-
-EXPATVERSION=1_95_6
-
-ZLIBVERSION=1.1.4
-ZLIBDIRNAME=zlib-$(ZLIBVERSION)
-
-VC=msdev
-
-.PHONY: $(PYPROJECTS)
-
-# run the standard python test suite (including largefile and network tests)
-test_python:
-	"$(PYPCBUILDDIR)/python.exe" -c "$(PYTESTCMD)"
-
-# build python from source
-# also copy files around to allow the generated python to compile extensions
-# in-place
-build_python: $(PYPCBUILDDIR)/pcbuild.dsw \
-              $(PYPCBUILDDIR)/libexpat.dll \
-              patch_pyexpat \
-              src/expat/Source/expat.dsw \
-              src/$(ZLIBDIRNAME)/zlib.h \
-              src/$(W32ALLDIRNAME)/readme.txt \
-              $(PYPROJECTS_BUILDFLAGS) \
-              $(PYSRCDIR)/Include/pyconfig.h \
-              $(PYSRCDIR)/libs/python23.lib
-
-$(PYSRCDIR)/Include/pyconfig.h:
-	$(MKDIR) "$(PYSRCDIR)/Include"
-	$(CP) "$(PYSRCDIR)/PC/pyconfig.h" "$(PYSRCDIR)/Include"
-
-
-$(PYSRCDIR)/libs/python23.lib:
-	$(MKDIR) "$(PYSRCDIR)/libs"
-	$(CP) "$(PYPCBUILDDIR)/python23.lib" "$(PYSRCDIR)/libs"
-
-$(PYPROJECTS_BUILDFLAGS):
-	$(CD) $(PYPCBUILDDIR); \
-           MAKEFLAGS=; export MAKEFLAGS;\
-           $(VC) pcbuild.dsw /MAKE "$(@F:%.builtflag=%) - Win32 Release" /OUT \
-           $(@F:%.builtflag=%.buildlog)
-	$(TOUCH) "$@"
-
-patch_pyexpat: $(PYPCBUILDDIR)/pyexpat.org
-
-# patch pyexpat.dsp (Python VC++ project file) as it has an improper
-# declaration
-$(PYPCBUILDDIR)/pyexpat.org: EXPAT_SED="s@\\\\expat.lib@\\\\libexpat.lib at g"
-$(PYPCBUILDDIR)/pyexpat.org:
-	$(CP) "$(PYPCBUILDDIR)/pyexpat.dsp" "$(PYPCBUILDDIR)/pyexpat.org"
-	$(SED) $(EXPAT_SED)  < "$(PYPCBUILDDIR)/pyexpat.dsp" | unix2dos  > "$(PYPCBUILDDIR)/pyexpat.new"
-	$(CP) "$(PYPCBUILDDIR)/pyexpat.new" "$(PYPCBUILDDIR)/pyexpat.dsp"
-	$(TOUCH) "$(PYPCBUILDDIR)/pyexpat.org"
-
-$(PYPCBUILDDIR)/libexpat.dll: src/expat/Source/expat.dsw \
-                              $(PYPCBUILDDIR)/pcbuild.dsw
-	$(CP) "$(SRC_DIR)/expat/Libs/libexpat.dll" "$(PYPCBUILDDIR)"
-	$(TOUCH) "$(PYPCBUILDDIR)/libexpat.dll"
-
-clean_python:
-	$(RMRF) src/$(PYDIRNAME)
-
-clean_libs:
-	$(RMRF) src/expat
-	$(RMRF) src/$(ZLIBDIRNAME)
-	$(RMRF) src/$(W32ALLDIRNAME)
-
-install_python: $(BUILD_DIR)/bin/python.exe
-
-$(BUILD_DIR)/bin/python.exe:
-	$(MKDIR) "$(BUILD_DIR)"
-
-	$(MKDIR) "$(BUILD_DIR)/doc"
-	$(CP) "$(MAKEFILEDIR)/doc/ZC_PY_DIST_README.txt" \
-             "$(BUILD_DIR)/doc"
-	$(CP) "$(PYSRCDIR)/LICENSE" "$(BUILD_DIR)/doc/PYTHON_LICENSE.txt"
-	$(CP) "$(SRC_DIR)/$(W32ALLDIRNAME)/License.txt" \
-            "$(BUILD_DIR)/doc/WIN32ALL_LICENSE.txt"
-	$(CP) "$(SRC_DIR)/expat/COPYING.txt" \
-            "$(BUILD_DIR)/doc/EXPAT_LICENSE.txt"
-	$(CP) "$(SRC_DIR)/$(ZLIBDIRNAME)/README" \
-            "$(BUILD_DIR)/doc/ZLIB_LICENSE.txt"
-
-	$(MKDIR) "$(BUILD_DIR)/bin"
-	$(CP) "$(PYPCBUILDDIR)/python.exe" "$(BUILD_DIR)/bin"
-	$(CP) "$(PYPCBUILDDIR)/pythonw.exe" "$(BUILD_DIR)/bin"
-	$(CP) "$(PYPCBUILDDIR)/w9xpopen.exe" "$(BUILD_DIR)/bin"
-	$(CP) "$(PYPCBUILDDIR)/python23.dll" "$(BUILD_DIR)/bin"
-
-	$(MKDIR) "$(BUILD_DIR)/bin/DLLs"
-	$(XCOPY) "$(WIN_PYPCBUILDDIR)\*.pyd" "$(WIN_BUILD_DIR)\bin\DLLs"
-	$(CP) "$(PYPCBUILDDIR)/libexpat.dll" "$(BUILD_DIR)/bin/DLLs"
-
-	$(MKDIR) "$(BUILD_DIR)/bin/Lib"
-	$(XCOPY) "$(WIN_PYSRCDIR)\Lib\*.py" "$(WIN_BUILD_DIR)\bin\Lib"
-	$(MKDIR) "$(BUILD_DIR)/bin/Lib/site-packages"
-	$(CP) "$(PYSRCDIR)/Lib/site-packages/README" \
-             "$(BUILD_DIR)/bin/Lib/site-packages"
-	$(XCOPY) "$(WIN_SRC_DIR)\$(W32ALLDIRNAME)\*.pyd" \
-             "$(WIN_BUILD_DIR)\bin\Lib\site-packages"
-	$(XCOPY) "$(WIN_SRC_DIR)\$(W32ALLDIRNAME)\*.dll" \
-             "$(WIN_BUILD_DIR)\bin\Lib\site-packages"
-	$(XCOPY) "$(WIN_SRC_DIR)\$(W32ALLDIRNAME)\*.exe" \
-             "$(WIN_BUILD_DIR)\bin\Lib\site-packages"
-	$(XCOPY) "$(WIN_SRC_DIR)\$(W32ALLDIRNAME)\*.py" \
-             "$(WIN_BUILD_DIR)\bin\Lib\site-packages"
-	$(CP) "$(MAKEFILEDIR)/etc/sitecustomize.py" \
-             "$(BUILD_DIR)/bin/Lib/site-packages"
-
-	$(MKDIR) "$(BUILD_DIR)/bin/Include"
-	$(XCOPY) "$(WIN_PYSRCDIR)\Include\*.h" "$(WIN_BUILD_DIR)\bin\Include"
-	$(XCOPY) "$(WIN_PYSRCDIR)\PC\*.h" "$(WIN_BUILD_DIR)\bin\Include"
-
-	$(MKDIR) "$(BUILD_DIR)/bin/libs"
-	$(CP) "$(PYPCBUILDDIR)/python23.lib" "$(BUILD_DIR)/bin/libs"
-
-	$(CD) "$(BASE_DIR)"
-
-	$(TOUCH) "$(BUILD_DIR)/bin/python.exe"
-
-src/expat/Source/expat.dsw: tmp/expat_win32bin_$(EXPATVERSION).exe
-	$(MKDIR) "$(SRC_DIR)"
-	tmp/expat_win32bin_$(EXPATVERSION).exe \
-               /SP /VERYSILENT /NOCANCEL /NORESTART \
-               /DIR="$(WIN_BASE_DIR)\src\expat" /NOICONS
-	$(TOUCH) "src/expat/Source/expat.dsw"
-
-$(PYPCBUILDDIR)/pcbuild.dsw: tmp/$(PYDIRNAME).tgz
-	$(MKDIR) "$(SRC_DIR)"
-	$(CD) "$(SRC_DIR)" && $(TAR) xvzf ../tmp/$(PYDIRNAME).tgz && \
-            $(TOUCH) "$(PYPCBUILDDIR)/pcbuild.dsw"
-
-src/$(ZLIBDIRNAME)/zlib.h: tmp/$(ZLIBDIRNAME).tar.gz
-	$(MKDIR) "$(SRC_DIR)"
-	$(CD) "$(SRC_DIR)"; $(TAR) xvzf ../tmp/$(ZLIBDIRNAME).tar.gz; \
-            $(TOUCH) "$(ZLIBDIRNAME)/zlib.h"
-
-src/$(W32ALLDIRNAME)/readme.txt: tmp/$(W32ALLDIRNAME).exe
-	$(MKDIR) "$(SRC_DIR)/$(W32ALLDIRNAME)"
-	"$(BASE_DIR)/tmp/$(W32ALLDIRNAME).exe" \
-            /S /X "$(WIN_SRC_DIR)\$(W32ALLDIRNAME)"
-	$(TOUCH) "src/$(W32ALLDIRNAME)/readme.txt"
-
+# Operation notes:
+
+# During the Python build, the bsddb and _tkinter modules
+# build failures are expected.  No other build failures should occur.
+
+# test_python tests for largefile support; this requires over 2GB of
+# free space on windws because windows has no notion of sparse files.
+
+# No test_python tests are expected to fail on windows, but some tests
+# will be skipped.  Here are the tests for Python 2.2.3 that are expected
+# to be skipped:
+
+#   test_bsddb
+#   test_cd
+#   test_cl
+#   test_commands
+#   test_crypt
+#   test_curses
+#   test_dbm
+#   test_dl
+#   test_email_codecs
+#   test_fcntl
+#   test_fork1
+#   test_gdbm
+#   test_gl
+#   test_grp
+#   test_imgfile
+#   test_linuxaudiodev
+#   test_mhlib
+#   test_nis
+#   test_optnpty
+#   test_poll
+#   test_pty
+#   test_pwd
+#   test_signal
+#   test_socket_ssl
+#   test_sunaudiodev
+#   test_timing
+
+# some deprecation warnings about :complex divmod(), // and % are deprecated"
+# are expected during the test run as well
+
+PYTHON_REQUIRED_FILES=tmp/$(ZLIBDIRNAME).tar.gz \
+               tmp/expat_win32bin_$(EXPATVERSION).exe \
+               tmp/$(W32ALLDIRNAME).exe \
+               tmp/$(PYDIRNAME).tgz \
+
+PYPROJECTS=pythoncore python pythonw parser _socket _sre \
+           _symtable _testcapi mmap select unicodedata w9xpopen winreg \
+           winsound pyexpat zlib \
+
+PYPROJECTS_BUILDFLAGS=$(PYPROJECTS:%=$(PYPCBUILDDIR)/%.builtflag)
+
+PYVERSION=2.3.2
+PYDIRNAME=Python-$(PYVERSION)
+PYSRCDIR=$(BASE_DIR)/src/$(PYDIRNAME)
+WIN_PYSRCDIR=$(shell cygpath -w $(PYSRCDIR))
+PYPCBUILDDIR=$(PYSRCDIR)/PCbuild
+WIN_PYPCBUILDDIR=$(shell cygpath -w $(PYPCBUILDDIR))
+SETPATH=import sys; \
+       sys.path=['$(WIN_PYSRCDIR)\\Lib\\test','$(WIN_PYPCBUILDDIR)','$(WIN_PYSRCDIR)\\Lib']
+PYTESTCMD=$(SETPATH); from test import regrtest; \
+          regrtest.main(use_resources=['largefile','network'])
+
+W32ALLVERSION=157
+W32ALLDIRNAME=win32all-$(W32ALLVERSION)
+
+EXPATVERSION=1_95_6
+
+ZLIBVERSION=1.1.4
+ZLIBDIRNAME=zlib-$(ZLIBVERSION)
+
+VC=msdev
+
+.PHONY: $(PYPROJECTS)
+
+# run the standard python test suite (including largefile and network tests)
+test_python:
+	"$(PYPCBUILDDIR)/python.exe" -c "$(PYTESTCMD)"
+
+# build python from source
+# also copy files around to allow the generated python to compile extensions
+# in-place
+build_python: $(PYPCBUILDDIR)/pcbuild.dsw \
+              $(PYPCBUILDDIR)/libexpat.dll \
+              patch_pyexpat \
+              src/expat/Source/expat.dsw \
+              src/$(ZLIBDIRNAME)/zlib.h \
+              src/$(W32ALLDIRNAME)/readme.txt \
+              $(PYPROJECTS_BUILDFLAGS) \
+              $(PYSRCDIR)/Include/pyconfig.h \
+              $(PYSRCDIR)/libs/python23.lib
+
+$(PYSRCDIR)/Include/pyconfig.h:
+	$(MKDIR) "$(PYSRCDIR)/Include"
+	$(CP) "$(PYSRCDIR)/PC/pyconfig.h" "$(PYSRCDIR)/Include"
+
+
+$(PYSRCDIR)/libs/python23.lib:
+	$(MKDIR) "$(PYSRCDIR)/libs"
+	$(CP) "$(PYPCBUILDDIR)/python23.lib" "$(PYSRCDIR)/libs"
+
+$(PYPROJECTS_BUILDFLAGS):
+	$(CD) $(PYPCBUILDDIR); \
+           MAKEFLAGS=; export MAKEFLAGS;\
+           $(VC) pcbuild.dsw /MAKE "$(@F:%.builtflag=%) - Win32 Release" /OUT \
+           $(@F:%.builtflag=%.buildlog)
+	$(TOUCH) "$@"
+
+patch_pyexpat: $(PYPCBUILDDIR)/pyexpat.org
+
+# patch pyexpat.dsp (Python VC++ project file) as it has an improper
+# declaration
+$(PYPCBUILDDIR)/pyexpat.org: EXPAT_SED="s@\\\\expat.lib@\\\\libexpat.lib at g"
+$(PYPCBUILDDIR)/pyexpat.org:
+	$(CP) "$(PYPCBUILDDIR)/pyexpat.dsp" "$(PYPCBUILDDIR)/pyexpat.org"
+	$(SED) $(EXPAT_SED)  < "$(PYPCBUILDDIR)/pyexpat.dsp" | unix2dos  > "$(PYPCBUILDDIR)/pyexpat.new"
+	$(CP) "$(PYPCBUILDDIR)/pyexpat.new" "$(PYPCBUILDDIR)/pyexpat.dsp"
+	$(TOUCH) "$(PYPCBUILDDIR)/pyexpat.org"
+
+$(PYPCBUILDDIR)/libexpat.dll: src/expat/Source/expat.dsw \
+                              $(PYPCBUILDDIR)/pcbuild.dsw
+	$(CP) "$(SRC_DIR)/expat/Libs/libexpat.dll" "$(PYPCBUILDDIR)"
+	$(TOUCH) "$(PYPCBUILDDIR)/libexpat.dll"
+
+clean_python:
+	$(RMRF) src/$(PYDIRNAME)
+
+clean_libs:
+	$(RMRF) src/expat
+	$(RMRF) src/$(ZLIBDIRNAME)
+	$(RMRF) src/$(W32ALLDIRNAME)
+
+install_python: $(BUILD_DIR)/bin/python.exe
+
+$(BUILD_DIR)/bin/python.exe:
+	$(MKDIR) "$(BUILD_DIR)"
+
+	$(MKDIR) "$(BUILD_DIR)/doc"
+	$(CP) "$(MAKEFILEDIR)/doc/ZC_PY_DIST_README.txt" \
+             "$(BUILD_DIR)/doc"
+	$(CP) "$(PYSRCDIR)/LICENSE" "$(BUILD_DIR)/doc/PYTHON_LICENSE.txt"
+	$(CP) "$(SRC_DIR)/$(W32ALLDIRNAME)/License.txt" \
+            "$(BUILD_DIR)/doc/WIN32ALL_LICENSE.txt"
+	$(CP) "$(SRC_DIR)/expat/COPYING.txt" \
+            "$(BUILD_DIR)/doc/EXPAT_LICENSE.txt"
+	$(CP) "$(SRC_DIR)/$(ZLIBDIRNAME)/README" \
+            "$(BUILD_DIR)/doc/ZLIB_LICENSE.txt"
+
+	$(MKDIR) "$(BUILD_DIR)/bin"
+	$(CP) "$(PYPCBUILDDIR)/python.exe" "$(BUILD_DIR)/bin"
+	$(CP) "$(PYPCBUILDDIR)/pythonw.exe" "$(BUILD_DIR)/bin"
+	$(CP) "$(PYPCBUILDDIR)/w9xpopen.exe" "$(BUILD_DIR)/bin"
+	$(CP) "$(PYPCBUILDDIR)/python23.dll" "$(BUILD_DIR)/bin"
+
+	$(MKDIR) "$(BUILD_DIR)/bin/DLLs"
+	$(XCOPY) "$(WIN_PYPCBUILDDIR)\*.pyd" "$(WIN_BUILD_DIR)\bin\DLLs"
+	$(CP) "$(PYPCBUILDDIR)/libexpat.dll" "$(BUILD_DIR)/bin/DLLs"
+
+	$(MKDIR) "$(BUILD_DIR)/bin/Lib"
+	$(XCOPY) "$(WIN_PYSRCDIR)\Lib\*.py" "$(WIN_BUILD_DIR)\bin\Lib"
+	$(MKDIR) "$(BUILD_DIR)/bin/Lib/site-packages"
+	$(CP) "$(PYSRCDIR)/Lib/site-packages/README" \
+             "$(BUILD_DIR)/bin/Lib/site-packages"
+	$(XCOPY) "$(WIN_SRC_DIR)\$(W32ALLDIRNAME)\*.pyd" \
+             "$(WIN_BUILD_DIR)\bin\Lib\site-packages"
+	$(XCOPY) "$(WIN_SRC_DIR)\$(W32ALLDIRNAME)\*.dll" \
+             "$(WIN_BUILD_DIR)\bin\Lib\site-packages"
+	$(XCOPY) "$(WIN_SRC_DIR)\$(W32ALLDIRNAME)\*.exe" \
+             "$(WIN_BUILD_DIR)\bin\Lib\site-packages"
+	$(XCOPY) "$(WIN_SRC_DIR)\$(W32ALLDIRNAME)\*.py" \
+             "$(WIN_BUILD_DIR)\bin\Lib\site-packages"
+	$(CP) "$(MAKEFILEDIR)/etc/sitecustomize.py" \
+             "$(BUILD_DIR)/bin/Lib/site-packages"
+
+	$(MKDIR) "$(BUILD_DIR)/bin/Include"
+	$(XCOPY) "$(WIN_PYSRCDIR)\Include\*.h" "$(WIN_BUILD_DIR)\bin\Include"
+	$(XCOPY) "$(WIN_PYSRCDIR)\PC\*.h" "$(WIN_BUILD_DIR)\bin\Include"
+
+	$(MKDIR) "$(BUILD_DIR)/bin/libs"
+	$(CP) "$(PYPCBUILDDIR)/python23.lib" "$(BUILD_DIR)/bin/libs"
+
+	$(CD) "$(BASE_DIR)"
+
+	$(TOUCH) "$(BUILD_DIR)/bin/python.exe"
+
+src/expat/Source/expat.dsw: tmp/expat_win32bin_$(EXPATVERSION).exe
+	$(MKDIR) "$(SRC_DIR)"
+	tmp/expat_win32bin_$(EXPATVERSION).exe \
+               /SP /VERYSILENT /NOCANCEL /NORESTART \
+               /DIR="$(WIN_BASE_DIR)\src\expat" /NOICONS
+	$(TOUCH) "src/expat/Source/expat.dsw"
+
+$(PYPCBUILDDIR)/pcbuild.dsw: tmp/$(PYDIRNAME).tgz
+	$(MKDIR) "$(SRC_DIR)"
+	$(CD) "$(SRC_DIR)" && $(TAR) xvzf ../tmp/$(PYDIRNAME).tgz && \
+            $(TOUCH) "$(PYPCBUILDDIR)/pcbuild.dsw"
+
+src/$(ZLIBDIRNAME)/zlib.h: tmp/$(ZLIBDIRNAME).tar.gz
+	$(MKDIR) "$(SRC_DIR)"
+	$(CD) "$(SRC_DIR)"; $(TAR) xvzf ../tmp/$(ZLIBDIRNAME).tar.gz; \
+            $(TOUCH) "$(ZLIBDIRNAME)/zlib.h"
+
+src/$(W32ALLDIRNAME)/readme.txt: tmp/$(W32ALLDIRNAME).exe
+	$(MKDIR) "$(SRC_DIR)/$(W32ALLDIRNAME)"
+	"$(BASE_DIR)/tmp/$(W32ALLDIRNAME).exe" \
+            /S /X "$(WIN_SRC_DIR)\$(W32ALLDIRNAME)"
+	$(TOUCH) "src/$(W32ALLDIRNAME)/readme.txt"
+


=== Packages/WinBuilders/mk/zeo.mk 1.2 => 1.3 ===
--- Packages/WinBuilders/mk/zeo.mk:1.2	Wed Aug 20 16:53:51 2003
+++ Packages/WinBuilders/mk/zeo.mk	Sun Jan 25 23:13:31 2004
@@ -1,66 +1,66 @@
-ZODBVERSION=3.2b2
-ZODBDIRNAME=ZODB3-$(ZODBVERSION)
-ZEO_REQUIRED_FILES=tmp/$(ZODBDIRNAME).tar.gz
-
-REQUIRED_FILES=$(ZEO_REQUIRED_FILES)\
-               $(PYTHON_REQUIRED_FILES)
-
-# run the Zope tests
-
-clean_zope:
-	$(RMRF) src/$(ZODBDIRNAME)
-
-install_zeo: src/$(ZODBDIRNAME)/setup.py install_python \
-             $(BUILD_DIR)/lib/python/version.txt \
-             $(BUILD_DIR)/ZEO-$(ZODBDIRNAME)-win32.exe \
-
-ESCAPED=$(shell sh $(MAKEFILEDIR)/bin/escape.sh '$(WIN_MAKEFILEDIR)')
-SEDSCRIPT="s@<<VERSION>>@$(ZODBVERSION)@g;s@<<MAKEFILEDIR>>@$(ESCAPED)@g"
-
-$(BUILD_DIR)/ZEO-$(ZODBDIRNAME)-win32.exe: $(BUILD_DIR)/lib/python/version.txt
-	$(SED) $(SEDSCRIPT) < "$(MAKEFILEDIR)/etc/zeo.iss.in" | unix2dos > "$(BUILD_DIR)/zeo.iss"
-	$(CD) "$(BUILD_DIR)";"$(ISS_COMPILER)" /cc "$(WIN_BUILD_DIR)\zeo.iss"
-
-$(BUILD_DIR)/lib/python/ExtensionClass.pyd: WIN_TMPDIR=tmp\zeotmp
-$(BUILD_DIR)/lib/python/ExtensionClass.pyd: install_python
-	$(MKDIR) $(WIN_TMPDIR)
-	$(CD) $(SRC_DIR)/$(ZODBDIRNAME); \
-            $(PYPCBUILDDIR)/python.exe setup.py install \
-            --prefix="$(WIN_BASE_DIR)\$(WIN_TMPDIR)" --no-compile
-	$(MKDIR) $(@D)
-	$(XCOPY) "$(WIN_TMPDIR)\Lib\site-packages\*.py" "$(shell cygpath -w $(@D))"
-	$(XCOPY) "$(WIN_TMPDIR)\Lib\site-packages\*.pyd" "$(shell cygpath -w $(@D))"
-	$(XCOPY) "$(WIN_TMPDIR)\Lib\site-packages\*.txt" "$(shell cygpath -w $(@D))"
-	$(XCOPY) "$(WIN_TMPDIR)\Lib\site-packages\*.xml" "$(shell cygpath -w $(@D))"
-	$(XCOPY) "$(WIN_TMPDIR)\Lib\site-packages\*.conf" "$(shell cygpath -w $(@D))"
-	$(XCOPY) "$(WIN_TMPDIR)\Include\*.h" "$(WIN_BUILD_DIR)\bin\Include"
-	$(XCOPY) "$(WIN_TMPDIR)\Scripts\*.py" "$(WIN_BUILD_DIR)\bin"
-	$(RMRF) $(shell cygpath -u $(WIN_TMPDIR))
-
-$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_REPOSITORY=$(ZOPE_CVS_REPOSITORY)
-$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_MODULE=Zope/lib/python/nt_svcutils
-$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_TAG=-r HEAD
-
-$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py:
-	${CD} ${BUILD_DIR}/lib/python && \
-	${CVS} -d ${CVS_REPOSITORY} export ${CVS_TAG} -d \
-        $(shell basename $(@D)) ${CVS_MODULE}
-
-$(BUILD_DIR)/skel/README.txt:
-	$(MKDIR) "$(@D)"
-	$(CPR) $(MAKEFILEDIR)/zeo_addons/skel/* $(@D)
-	$(TOUCH) "$@"
-
-$(BUILD_DIR)/bin/mkzeoinstance.py:
-	$(MKDIR) "$(@D)"
-	$(CPR) $(MAKEFILEDIR)/zeo_addons/utilities/* $(@D)
-	$(TOUCH) "$(@)"
-
-$(BUILD_DIR)/lib/python/version.txt: $(BUILD_DIR)/lib/python/ExtensionClass.pyd $(BUILD_DIR)/lib/python/nt_svcutils/__init__.py $(BUILD_DIR)/skel/README.txt $(BUILD_DIR)/bin/mkzeoinstance.py
-	@echo ZEO $(ZODBVERSION) > "$(BUILD_DIR)/lib/python/version.txt"
-	$(TOUCH) $@
-
-src/$(ZODBDIRNAME)/setup.py:
-	$(MKDIR) "$(SRC_DIR)"
-	$(CD) "$(SRC_DIR)" && $(TAR) xvzf ../tmp/$(ZODBDIRNAME).tar.gz
-	$(TOUCH) $@
+ZODBVERSION=3.2b2
+ZODBDIRNAME=ZODB3-$(ZODBVERSION)
+ZEO_REQUIRED_FILES=tmp/$(ZODBDIRNAME).tar.gz
+
+REQUIRED_FILES=$(ZEO_REQUIRED_FILES)\
+               $(PYTHON_REQUIRED_FILES)
+
+# run the Zope tests
+
+clean_zope:
+	$(RMRF) src/$(ZODBDIRNAME)
+
+install_zeo: src/$(ZODBDIRNAME)/setup.py install_python \
+             $(BUILD_DIR)/lib/python/version.txt \
+             $(BUILD_DIR)/ZEO-$(ZODBDIRNAME)-win32.exe \
+
+ESCAPED=$(shell sh $(MAKEFILEDIR)/bin/escape.sh '$(WIN_MAKEFILEDIR)')
+SEDSCRIPT="s@<<VERSION>>@$(ZODBVERSION)@g;s@<<MAKEFILEDIR>>@$(ESCAPED)@g"
+
+$(BUILD_DIR)/ZEO-$(ZODBDIRNAME)-win32.exe: $(BUILD_DIR)/lib/python/version.txt
+	$(SED) $(SEDSCRIPT) < "$(MAKEFILEDIR)/etc/zeo.iss.in" | unix2dos > "$(BUILD_DIR)/zeo.iss"
+	$(CD) "$(BUILD_DIR)";"$(ISS_COMPILER)" /cc "$(WIN_BUILD_DIR)\zeo.iss"
+
+$(BUILD_DIR)/lib/python/ExtensionClass.pyd: WIN_TMPDIR=tmp\zeotmp
+$(BUILD_DIR)/lib/python/ExtensionClass.pyd: install_python
+	$(MKDIR) $(WIN_TMPDIR)
+	$(CD) $(SRC_DIR)/$(ZODBDIRNAME); \
+            $(PYPCBUILDDIR)/python.exe setup.py install \
+            --prefix="$(WIN_BASE_DIR)\$(WIN_TMPDIR)" --no-compile
+	$(MKDIR) $(@D)
+	$(XCOPY) "$(WIN_TMPDIR)\Lib\site-packages\*.py" "$(shell cygpath -w $(@D))"
+	$(XCOPY) "$(WIN_TMPDIR)\Lib\site-packages\*.pyd" "$(shell cygpath -w $(@D))"
+	$(XCOPY) "$(WIN_TMPDIR)\Lib\site-packages\*.txt" "$(shell cygpath -w $(@D))"
+	$(XCOPY) "$(WIN_TMPDIR)\Lib\site-packages\*.xml" "$(shell cygpath -w $(@D))"
+	$(XCOPY) "$(WIN_TMPDIR)\Lib\site-packages\*.conf" "$(shell cygpath -w $(@D))"
+	$(XCOPY) "$(WIN_TMPDIR)\Include\*.h" "$(WIN_BUILD_DIR)\bin\Include"
+	$(XCOPY) "$(WIN_TMPDIR)\Scripts\*.py" "$(WIN_BUILD_DIR)\bin"
+	$(RMRF) $(shell cygpath -u $(WIN_TMPDIR))
+
+$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_REPOSITORY=$(ZOPE_CVS_REPOSITORY)
+$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_MODULE=Zope/lib/python/nt_svcutils
+$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_TAG=-r HEAD
+
+$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py:
+	${CD} ${BUILD_DIR}/lib/python && \
+	${CVS} -d ${CVS_REPOSITORY} export ${CVS_TAG} -d \
+        $(shell basename $(@D)) ${CVS_MODULE}
+
+$(BUILD_DIR)/skel/README.txt:
+	$(MKDIR) "$(@D)"
+	$(CPR) $(MAKEFILEDIR)/zeo_addons/skel/* $(@D)
+	$(TOUCH) "$@"
+
+$(BUILD_DIR)/bin/mkzeoinstance.py:
+	$(MKDIR) "$(@D)"
+	$(CPR) $(MAKEFILEDIR)/zeo_addons/utilities/* $(@D)
+	$(TOUCH) "$(@)"
+
+$(BUILD_DIR)/lib/python/version.txt: $(BUILD_DIR)/lib/python/ExtensionClass.pyd $(BUILD_DIR)/lib/python/nt_svcutils/__init__.py $(BUILD_DIR)/skel/README.txt $(BUILD_DIR)/bin/mkzeoinstance.py
+	@echo ZEO $(ZODBVERSION) > "$(BUILD_DIR)/lib/python/version.txt"
+	$(TOUCH) $@
+
+src/$(ZODBDIRNAME)/setup.py:
+	$(MKDIR) "$(SRC_DIR)"
+	$(CD) "$(SRC_DIR)" && $(TAR) xvzf ../tmp/$(ZODBDIRNAME).tar.gz
+	$(TOUCH) $@


=== Packages/WinBuilders/mk/zope.mk 1.2 => 1.3 ===
--- Packages/WinBuilders/mk/zope.mk:1.2	Mon Sep 22 10:38:24 2003
+++ Packages/WinBuilders/mk/zope.mk	Sun Jan 25 23:13:31 2004
@@ -1,44 +1,44 @@
-ZOPE_REQUIRED_FILES=tmp/$(ZOPEDIRNAME).tgz
-
-REQUIRED_FILES=$(PYTHON_REQUIRED_FILES)\
-               $(ZOPE_REQUIRED_FILES)
-
-ZOPEVERSION=2.7.0-b2
-ZOPEDIRNAME=Zope-$(ZOPEVERSION)
-
-MAKEZOPE="$(MAKEFILEDIR)/bin/makezope.bat" "$(WIN_BUILD_DIR)"
-# run the Zope tests
-test_zope: 
-	$(CD) "$(BASE_DIR)/src/Zope"
-	"$(PYPCBUILDDIR)/python.exe" utilities/testrunner.py -a
-	$(CD) "$(BASE_DIR)"
-
-clean_zope:
-	$(RMRF) src/$(ZOPEDIRNAME)
-
-install_zope: src/$(ZOPEDIRNAME)/inst/configure.py install_python \
-              $(BUILD_DIR)/Zope-$(ZOPEVERSION)-win32.exe
-
-ESCAPED=$(shell sh $(MAKEFILEDIR)/bin/escape.sh '$(WIN_MAKEFILEDIR)')
-SEDSCRIPT="s@<<VERSION>>@$(ZOPEVERSION)@g;s@<<MAKEFILEDIR>>@$(ESCAPED)@g"
-
-$(BUILD_DIR)/Zope-$(ZOPEVERSION)-win32.exe: $(BUILD_DIR)/lib/python/version.txt
-	$(SED) $(SEDSCRIPT) < "$(MAKEFILEDIR)/etc/zope.iss.in" | unix2dos > "$(BUILD_DIR)/zope.iss"
-	$(CD) "$(BUILD_DIR)";"$(ISS_COMPILER)" /cc "$(WIN_BUILD_DIR)\zope.iss"
-
-$(BUILD_DIR)/lib/python/Zope/Startup/run.py:
-	$(CD) "$(BUILD_DIR)"; \
-	$(PYPCBUILDDIR)/python.exe \
-            "$(WIN_SRC_DIR)\$(ZOPEDIRNAME)\inst\configure.py" \
-            --prefix="$(WIN_BUILD_DIR)" --no-compile
-	$(MAKEZOPE)
-	$(TOUCH) "$(BUILD_DIR)/lib/python/Zope/Startup/run.py"
-
-$(BUILD_DIR)/lib/python/version.txt: $(BUILD_DIR)/lib/python/Zope/Startup/run.py
-	@echo Zope $(ZOPEVERSION) > "$(BUILD_DIR)/lib/python/version.txt"
-	$(TOUCH) "$(BUILD_DIR)/lib/python/version.txt"
-
-src/$(ZOPEDIRNAME)/inst/configure.py:
-	$(MKDIR) "$(SRC_DIR)"
-	$(CD) "$(SRC_DIR)" && $(TAR) xvzf ../tmp/$(ZOPEDIRNAME).tgz \
-           && $(TOUCH) $(ZOPEDIRNAME)/inst/configure.py
+ZOPE_REQUIRED_FILES=tmp/$(ZOPEDIRNAME).tgz
+
+REQUIRED_FILES=$(PYTHON_REQUIRED_FILES)\
+               $(ZOPE_REQUIRED_FILES)
+
+ZOPEVERSION=2.7.0-b2
+ZOPEDIRNAME=Zope-$(ZOPEVERSION)
+
+MAKEZOPE="$(MAKEFILEDIR)/bin/makezope.bat" "$(WIN_BUILD_DIR)"
+# run the Zope tests
+test_zope: 
+	$(CD) "$(BASE_DIR)/src/Zope"
+	"$(PYPCBUILDDIR)/python.exe" utilities/testrunner.py -a
+	$(CD) "$(BASE_DIR)"
+
+clean_zope:
+	$(RMRF) src/$(ZOPEDIRNAME)
+
+install_zope: src/$(ZOPEDIRNAME)/inst/configure.py install_python \
+              $(BUILD_DIR)/Zope-$(ZOPEVERSION)-win32.exe
+
+ESCAPED=$(shell sh $(MAKEFILEDIR)/bin/escape.sh '$(WIN_MAKEFILEDIR)')
+SEDSCRIPT="s@<<VERSION>>@$(ZOPEVERSION)@g;s@<<MAKEFILEDIR>>@$(ESCAPED)@g"
+
+$(BUILD_DIR)/Zope-$(ZOPEVERSION)-win32.exe: $(BUILD_DIR)/lib/python/version.txt
+	$(SED) $(SEDSCRIPT) < "$(MAKEFILEDIR)/etc/zope.iss.in" | unix2dos > "$(BUILD_DIR)/zope.iss"
+	$(CD) "$(BUILD_DIR)";"$(ISS_COMPILER)" /cc "$(WIN_BUILD_DIR)\zope.iss"
+
+$(BUILD_DIR)/lib/python/Zope/Startup/run.py:
+	$(CD) "$(BUILD_DIR)"; \
+	$(PYPCBUILDDIR)/python.exe \
+            "$(WIN_SRC_DIR)\$(ZOPEDIRNAME)\inst\configure.py" \
+            --prefix="$(WIN_BUILD_DIR)" --no-compile
+	$(MAKEZOPE)
+	$(TOUCH) "$(BUILD_DIR)/lib/python/Zope/Startup/run.py"
+
+$(BUILD_DIR)/lib/python/version.txt: $(BUILD_DIR)/lib/python/Zope/Startup/run.py
+	@echo Zope $(ZOPEVERSION) > "$(BUILD_DIR)/lib/python/version.txt"
+	$(TOUCH) "$(BUILD_DIR)/lib/python/version.txt"
+
+src/$(ZOPEDIRNAME)/inst/configure.py:
+	$(MKDIR) "$(SRC_DIR)"
+	$(CD) "$(SRC_DIR)" && $(TAR) xvzf ../tmp/$(ZOPEDIRNAME).tgz \
+           && $(TOUCH) $(ZOPEDIRNAME)/inst/configure.py




More information about the Zope-CVS mailing list