[Zope-Checkins] SVN: Zope/trunk/inst/WinBuilders/ - remove curl downloading so process matches docs and I can build from behind a firewall

[Chris Withers]

Log message for revision 65838:
  - remove curl downloading so process matches docs and I can build from behind a firewall
  - tweak pywin32 version
  - tweak docs

Changed:
  U   Zope/trunk/inst/WinBuilders/README.txt
  U   Zope/trunk/inst/WinBuilders/mk/common.mk
  U   Zope/trunk/inst/WinBuilders/mk/python.mk
  U   Zope/trunk/inst/WinBuilders/mk/zope.mk

-=-
Modified: Zope/trunk/inst/WinBuilders/README.txt
===================================================================
--- Zope/trunk/inst/WinBuilders/README.txt	2006-03-06 20:07:41 UTC (rev 65837)
+++ Zope/trunk/inst/WinBuilders/README.txt	2006-03-06 20:10:48 UTC (rev 65838)
@@ -36,8 +36,8 @@
 directory.  At the time of this writing, these are:
 
   - Python-2.4.2.tgz
-  - pywin32-205.win32-py2.4.exe
-  - Zope-2.9.0.tgz
+  - pywin32-207.win32-py2.4.exe
+  - Zope-2.10.0b1.tgz
 
 As time marches on, these version numbers will obviously change.  See/edit
 mk/python.mk and mk/zope.mk for the exact versions required.
@@ -57,7 +57,15 @@
   directory instead; if so, make a copy in the root of your Python
   installation.
 
+  Places you may want to hunt for python24.dll:
 
+  C:\Program Files
+  C:\Windows\System32
+
+  Place you most likely want to copy it to:
+
+  C:\Python24
+
 Building
 --------
 

Modified: Zope/trunk/inst/WinBuilders/mk/common.mk
===================================================================
--- Zope/trunk/inst/WinBuilders/mk/common.mk	2006-03-06 20:07:41 UTC (rev 65837)
+++ Zope/trunk/inst/WinBuilders/mk/common.mk	2006-03-06 20:10:48 UTC (rev 65838)
@@ -37,7 +37,6 @@
 SED=sed
 TOUCH=touch
 NMAKE=nmake
-CURL=curl -N
 CSCRIPT=cscript
 ECHO=echo
 ISS_DIR=$(CYGROOT)/Progra~1/Inno Setup 5

Modified: Zope/trunk/inst/WinBuilders/mk/python.mk
===================================================================
--- Zope/trunk/inst/WinBuilders/mk/python.mk	2006-03-06 20:07:41 UTC (rev 65837)
+++ Zope/trunk/inst/WinBuilders/mk/python.mk	2006-03-06 20:10:48 UTC (rev 65838)
@@ -16,7 +16,7 @@
 PYVERSION_MAJOR := 2
 PYVERSION_MINOR := 4
 PYVERSION_PATCH := 2
-W32ALLVERSION := 205
+W32ALLVERSION := 207
 
 PYVERSION := $(PYVERSION_MAJOR).$(PYVERSION_MINOR).$(PYVERSION_PATCH)
 
@@ -69,15 +69,7 @@
 # Fetch dependencies
 tmp:
 	$(MKDIR) tmp
-	
-tmp/$(W32ALLDIRNAME).exe: tmp
-	$(CURL) -o tmp/$(W32ALLDIRNAME).exe http://easynews.dl.sourceforge.net/sourceforge/pywin32/$(W32ALLDIRNAME).exe
-	$(TOUCH) tmp/$(W32ALLDIRNAME).exe
 
-tmp/$(PYDIRNAME).tgz: tmp
-	$(CURL) -o tmp/$(PYDIRNAME).tgz http://python.org/ftp/python/$(PYVERSION)/$(PYDIRNAME).tgz
-	$(TOUCH) tmp/$(PYDIRNAME).tgz
-
 $(ARB_PYSRCDIR): tmp/$(PYDIRNAME).tgz
 	$(MKDIR) "$(SRC_DIR)"
 	$(CD) "$(SRC_DIR)" && $(TAR) xvzf ../tmp/$(PYDIRNAME).tgz

Modified: Zope/trunk/inst/WinBuilders/mk/zope.mk
===================================================================
--- Zope/trunk/inst/WinBuilders/mk/zope.mk	2006-03-06 20:07:41 UTC (rev 65837)
+++ Zope/trunk/inst/WinBuilders/mk/zope.mk	2006-03-06 20:10:48 UTC (rev 65838)
@@ -65,7 +65,6 @@
 	$(TOUCH) $@
 
 tmp/$(ZOPEDIRNAME).tgz:
-	$(CURL) -o tmp/$(ZOPEDIRNAME).tgz http://www.zope.org/Products/Zope/$(ZOPEVERSION)/$(ZOPEDIRNAME).tgz
 	$(TOUCH) tmp/$(ZOPEDIRNAME).tgz
 
 # This merely unpacks the Zope tarball.