[Zope-Checkins] SVN: Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/ - Fetch the dependencies with curl

[Sidnei da Silva]

Log message for revision 41368:
  
  - Fetch the dependencies with curl
  

Changed:
  U   Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/common.mk
  U   Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/python.mk
  U   Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/zope.mk

-=-
Modified: Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/common.mk
===================================================================
--- Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/common.mk	2006-01-19 16:41:08 UTC (rev 41367)
+++ Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/common.mk	2006-01-19 17:47:05 UTC (rev 41368)
@@ -37,10 +37,11 @@
 SED=sed
 TOUCH=touch
 NMAKE=nmake
+CURL=curl -N
 CSCRIPT=cscript
 ECHO=echo
 ISS_DIR=$(CYGROOT)/Progra~1/Inno Setup 5
-ISS_COMPILER=$(ISS_DIR)/Compil32.exe
+ISS_COMPILER=$(ISS_DIR)/Compil32.exe /cc
 # We need a version that understands cygwin paths, so /bin/
 UNZIP=/bin/unzip
 

Modified: Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/python.mk
===================================================================
--- Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/python.mk	2006-01-19 16:41:08 UTC (rev 41367)
+++ Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/python.mk	2006-01-19 17:47:05 UTC (rev 41368)
@@ -66,6 +66,18 @@
 clean_libs:
 	$(RMRF) $(W32EXTRACTDIR)
 
+# 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/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/zope.mk
===================================================================
--- Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/zope.mk	2006-01-19 16:41:08 UTC (rev 41367)
+++ Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/zope.mk	2006-01-19 17:47:05 UTC (rev 41368)
@@ -38,7 +38,7 @@
 	find $(BUILD_DIR) -name "*.zcml" | xargs unix2dos
 
 	# Build the Inno installer.
-	$(CD) "$(BUILD_DIR)";"$(ISS_COMPILER)" /cc "$(WIN_BUILD_DIR)\zope.iss"
+	$(CD) "$(BUILD_DIR)";"$(ISS_COMPILER)" "$(WIN_BUILD_DIR)\zope.iss"
 
 # This builds Zope, then installs it into the build directory, then
 # creates lib/python/Zope2/version.txt in the build directory.