[Zope-CVS] CVS: Packages/WinBuilders/mk - python.mk:1.2

[Chris McDonough]

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

Modified Files:
	python.mk 
Log Message:
Use Python 2.3.2 as the default Python.  To go back to using 223,
check out the "with-python-223" tag of WinBuilders.


=== Packages/WinBuilders/mk/python.mk 1.1.1.1 => 1.2 ===
--- Packages/WinBuilders/mk/python.mk:1.1.1.1	Tue Aug 12 13:56:29 2003
+++ Packages/WinBuilders/mk/python.mk	Fri Oct  3 11:53:59 2003
@@ -51,7 +51,7 @@
 
 PYPROJECTS_BUILDFLAGS=$(PYPROJECTS:%=$(PYPCBUILDDIR)/%.builtflag)
 
-PYVERSION=2.2.3
+PYVERSION=2.3.2
 PYDIRNAME=Python-$(PYVERSION)
 PYSRCDIR=$(BASE_DIR)/src/$(PYDIRNAME)
 WIN_PYSRCDIR=$(shell cygpath -w $(PYSRCDIR))
@@ -62,7 +62,7 @@
 PYTESTCMD=$(SETPATH); from test import regrtest; \
           regrtest.main(use_resources=['largefile','network'])
 
-W32ALLVERSION=152
+W32ALLVERSION=157
 W32ALLDIRNAME=win32all-$(W32ALLVERSION)
 
 EXPATVERSION=1_95_6
@@ -89,16 +89,16 @@
               src/$(W32ALLDIRNAME)/readme.txt \
               $(PYPROJECTS_BUILDFLAGS) \
               $(PYSRCDIR)/Include/pyconfig.h \
-              $(PYSRCDIR)/libs/python22.lib
+              $(PYSRCDIR)/libs/python23.lib
 
 $(PYSRCDIR)/Include/pyconfig.h:
 	$(MKDIR) "$(PYSRCDIR)/Include"
 	$(CP) "$(PYSRCDIR)/PC/pyconfig.h" "$(PYSRCDIR)/Include"
 
 
-$(PYSRCDIR)/libs/python22.lib:
+$(PYSRCDIR)/libs/python23.lib:
 	$(MKDIR) "$(PYSRCDIR)/libs"
-	$(CP) "$(PYPCBUILDDIR)/python22.lib" "$(PYSRCDIR)/libs"
+	$(CP) "$(PYPCBUILDDIR)/python23.lib" "$(PYSRCDIR)/libs"
 
 $(PYPROJECTS_BUILDFLAGS):
 	$(CD) $(PYPCBUILDDIR); \
@@ -151,7 +151,7 @@
 	$(CP) "$(PYPCBUILDDIR)/python.exe" "$(BUILD_DIR)/bin"
 	$(CP) "$(PYPCBUILDDIR)/pythonw.exe" "$(BUILD_DIR)/bin"
 	$(CP) "$(PYPCBUILDDIR)/w9xpopen.exe" "$(BUILD_DIR)/bin"
-	$(CP) "$(PYPCBUILDDIR)/python22.dll" "$(BUILD_DIR)/bin"
+	$(CP) "$(PYPCBUILDDIR)/python23.dll" "$(BUILD_DIR)/bin"
 
 	$(MKDIR) "$(BUILD_DIR)/bin/DLLs"
 	$(XCOPY) "$(WIN_PYPCBUILDDIR)\*.pyd" "$(WIN_BUILD_DIR)\bin\DLLs"
@@ -178,7 +178,7 @@
 	$(XCOPY) "$(WIN_PYSRCDIR)\PC\*.h" "$(WIN_BUILD_DIR)\bin\Include"
 
 	$(MKDIR) "$(BUILD_DIR)/bin/libs"
-	$(CP) "$(PYPCBUILDDIR)/python22.lib" "$(BUILD_DIR)/bin/libs"
+	$(CP) "$(PYPCBUILDDIR)/python23.lib" "$(BUILD_DIR)/bin/libs"
 
 	$(CD) "$(BASE_DIR)"