Commit b82a955a authored by Chris Withers's avatar Chris Withers

- remove curl downloading so process matches docs and I can build from behind a firewall

- tweak pywin32 version
- tweak docs
parent ec15a969
...@@ -36,8 +36,8 @@ a "tmp" directory, inst/tmp. Place the necessary pre-requisites in the tmp ...@@ -36,8 +36,8 @@ a "tmp" directory, inst/tmp. Place the necessary pre-requisites in the tmp
directory. At the time of this writing, these are: directory. At the time of this writing, these are:
- Python-2.4.2.tgz - Python-2.4.2.tgz
- pywin32-205.win32-py2.4.exe - pywin32-207.win32-py2.4.exe
- Zope-2.9.0.tgz - Zope-2.9.1.tgz
As time marches on, these version numbers will obviously change. See/edit As time marches on, these version numbers will obviously change. See/edit
mk/python.mk and mk/zope.mk for the exact versions required. mk/python.mk and mk/zope.mk for the exact versions required.
...@@ -57,6 +57,14 @@ Python instead. Cautions: ...@@ -57,6 +57,14 @@ Python instead. Cautions:
directory instead; if so, make a copy in the root of your Python directory instead; if so, make a copy in the root of your Python
installation. 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 Building
-------- --------
......
...@@ -37,7 +37,6 @@ TAR=tar ...@@ -37,7 +37,6 @@ TAR=tar
SED=sed SED=sed
TOUCH=touch TOUCH=touch
NMAKE=nmake NMAKE=nmake
CURL=curl -N
CSCRIPT=cscript CSCRIPT=cscript
ECHO=echo ECHO=echo
ISS_DIR=$(CYGROOT)/Progra~1/Inno Setup 5 ISS_DIR=$(CYGROOT)/Progra~1/Inno Setup 5
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
PYVERSION_MAJOR := 2 PYVERSION_MAJOR := 2
PYVERSION_MINOR := 4 PYVERSION_MINOR := 4
PYVERSION_PATCH := 2 PYVERSION_PATCH := 2
W32ALLVERSION := 205 W32ALLVERSION := 207
PYVERSION := $(PYVERSION_MAJOR).$(PYVERSION_MINOR).$(PYVERSION_PATCH) PYVERSION := $(PYVERSION_MAJOR).$(PYVERSION_MINOR).$(PYVERSION_PATCH)
...@@ -69,14 +69,6 @@ clean_libs: ...@@ -69,14 +69,6 @@ clean_libs:
# Fetch dependencies # Fetch dependencies
tmp: tmp:
$(MKDIR) 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 $(ARB_PYSRCDIR): tmp/$(PYDIRNAME).tgz
$(MKDIR) "$(SRC_DIR)" $(MKDIR) "$(SRC_DIR)"
......
...@@ -65,7 +65,6 @@ $(BUILD_DIR)/lib/python/Zope2/version.txt: $(BUILD_DIR)/bin/python.exe ...@@ -65,7 +65,6 @@ $(BUILD_DIR)/lib/python/Zope2/version.txt: $(BUILD_DIR)/bin/python.exe
$(TOUCH) $@ $(TOUCH) $@
tmp/$(ZOPEDIRNAME).tgz: tmp/$(ZOPEDIRNAME).tgz:
$(CURL) -o tmp/$(ZOPEDIRNAME).tgz http://www.zope.org/Products/Zope/$(ZOPEVERSION)/$(ZOPEDIRNAME).tgz
$(TOUCH) tmp/$(ZOPEDIRNAME).tgz $(TOUCH) tmp/$(ZOPEDIRNAME).tgz
# This merely unpacks the Zope tarball. # This merely unpacks the Zope tarball.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment