# HG changeset patch
# User Edouard Tisserant
# Date 1317656625 -7200
# Node ID edaf97f39e5ddedfc56173d94710b458905e75f8
# Parent  7bc9d95b92bcba9305e9fe9b447a803f6e309b8f
Added md5 checksum in distfiles + checking

diff -r 7bc9d95b92bc -r edaf97f39e5d Makefile
--- a/Makefile	Sat Oct 01 00:05:04 2011 +0200
+++ b/Makefile	Mon Oct 03 17:43:45 2011 +0200
@@ -26,7 +26,7 @@
 endef
 
 define get_src_http
-dld=$(distfiles)/$(2);[ -f $$dld ] && echo "Exists :" $(2) || wget $(1)/$(2) -O $$dld;
+dld=$(distfiles)/$(2);( ( [ -f $$dld ] || wget $(1)/$(2) -O $$dld ) && ( [ ! -f $$dld.md5 ] && md5sum $$dld > $$dld.md5 || md5sum -c $$dld.md5 ) ) &&
 endef
 
 define get_src_pypi
@@ -94,7 +94,7 @@
 	$(call get_src_http,http://www.python.org/ftp/python/2.7.2,python-2.7.2.msi)\
 	$(msiexec) /qn /a $$dld TARGETDIR=.\\$(pydir)
 	cp $(tmp)/drive_c/windows/system32/msvcr71.dll $(bin_collect_dir)
-	cp $(pydir)/python27.dll $(bin_collect_dir)
+	mv $(pydir)/python27.dll $(bin_collect_dir)
 	
 	# WxPython (needs running inno unpacker in wine)
 	$(call get_src_sf,innounp/innounp/innounp%200.36,innounp036.rar)\
@@ -103,12 +103,13 @@
 	$(wine) $(tmp)/innounp.exe -d$(tmp) -x $$dld
 	cp -R $(tmp)/\{code_GetPythonDir\}/* $(pydir)
 	cp -R $(tmp)/\{app\}/* $(pysite)
+	mv $(pysite)/wx-2.8-msw-unicode/wx/*.dll $(bin_collect_dir)
 	
 	# pywin32
 	$(call get_src_sf,pywin32/pywin32/Build216,pywin32-216.win32-py2.7.exe)\
 	unzip -d $(tmp)/pw32 $$dld ; [ $$? -eq 1 ] #silence error unziping .exe
 	cp -R $(tmp)/pw32/PLATLIB/* $(pysite)
-	cp $(pysite)/pywin32_system32/*.dll $(bin_collect_dir)
+	mv $(pysite)/pywin32_system32/*.dll $(bin_collect_dir)
 	
 	# Twisted
 	$(call get_src_pypi,2.7/T/Twisted,Twisted-11.0.0.winxp32-py2.7.msi)\
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/Nevow-0.10.0.tar.gz.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/Nevow-0.10.0.tar.gz.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+66dda2ad88f42dea05911add15f4d1b2  /home/edouard/src/beremiz_higen_dist/distfiles/Nevow-0.10.0.tar.gz
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/Pyro-3.15.tar.gz.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/Pyro-3.15.tar.gz.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+aa93ed5fd0987ab8e68bb52c021f0398  /home/edouard/src/beremiz_higen_dist/distfiles/Pyro-3.15.tar.gz
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/Twisted-11.0.0.winxp32-py2.7.msi.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/Twisted-11.0.0.winxp32-py2.7.msi.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+edc63d41222fdb9ef4545ee33931eca0  /home/edouard/src/beremiz_higen_dist/distfiles/Twisted-11.0.0.winxp32-py2.7.msi
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/b0247325407e.zip.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/b0247325407e.zip.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+aaf162a2c714d511b6e1137d341b565a  /home/edouard/src/beremiz_higen_dist/distfiles/b0247325407e.zip
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/binutils-2.21.53-1-mingw32-bin.tar.lzma.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/binutils-2.21.53-1-mingw32-bin.tar.lzma.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+f605735be00a8029943afa0384736e41  /home/edouard/src/beremiz_higen_dist/distfiles/binutils-2.21.53-1-mingw32-bin.tar.lzma
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/gcc-core-4.6.1-2-mingw32-bin.tar.lzma.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/gcc-core-4.6.1-2-mingw32-bin.tar.lzma.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+4c32ce090586e4fd3ca85028a8f8309b  /home/edouard/src/beremiz_higen_dist/distfiles/gcc-core-4.6.1-2-mingw32-bin.tar.lzma
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/innounp036.rar.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/innounp036.rar.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+414fde4c67f5fd86941d2fab50becf32  /home/edouard/src/beremiz_higen_dist/distfiles/innounp036.rar
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/libgettextpo-0.17-1-mingw32-dll-0.tar.lzma.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/libgettextpo-0.17-1-mingw32-dll-0.tar.lzma.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+ddcd7c17ddfe6f2fe8cb4bb244fed197  /home/edouard/src/beremiz_higen_dist/distfiles/libgettextpo-0.17-1-mingw32-dll-0.tar.lzma
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+5429715e4788eab934229d3941efc2dc  /home/edouard/src/beremiz_higen_dist/distfiles/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/libiconv-1.13.1-1-mingw32-dll-2.tar.lzma.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/libiconv-1.13.1-1-mingw32-dll-2.tar.lzma.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+df315275e770cc6c232ee5de6bfa5d85  /home/edouard/src/beremiz_higen_dist/distfiles/libiconv-1.13.1-1-mingw32-dll-2.tar.lzma
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/libintl-0.17-1-mingw32-dll-8.tar.lzma.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/libintl-0.17-1-mingw32-dll-8.tar.lzma.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+3eb8590e4caddc037f21f6148aa42a09  /home/edouard/src/beremiz_higen_dist/distfiles/libintl-0.17-1-mingw32-dll-8.tar.lzma
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/libmpc-0.8.1-1-mingw32-dll-2.tar.lzma.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/libmpc-0.8.1-1-mingw32-dll-2.tar.lzma.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+a4e341b0cd1d407d8c03cacc715088f7  /home/edouard/src/beremiz_higen_dist/distfiles/libmpc-0.8.1-1-mingw32-dll-2.tar.lzma
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/libmpfr-2.4.1-1-mingw32-dll-1.tar.lzma.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/libmpfr-2.4.1-1-mingw32-dll-1.tar.lzma.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+f7341132ca48b4cfa01446b8a561342f  /home/edouard/src/beremiz_higen_dist/distfiles/libmpfr-2.4.1-1-mingw32-dll-1.tar.lzma
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/mingwrt-3.20-mingw32-dev.tar.gz.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/mingwrt-3.20-mingw32-dev.tar.gz.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+2d2f5c8165ff9c29661a5be96336a4f7  /home/edouard/src/beremiz_higen_dist/distfiles/mingwrt-3.20-mingw32-dev.tar.gz
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/mingwrt-3.20-mingw32-dll.tar.gz.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/mingwrt-3.20-mingw32-dll.tar.gz.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+9115617aad0cab7fdfa124d2a9c59552  /home/edouard/src/beremiz_higen_dist/distfiles/mingwrt-3.20-mingw32-dll.tar.gz
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/numpy-1.6.1.win32-py2.7.exe.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/numpy-1.6.1.win32-py2.7.exe.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+30bec16292be262bd78ff1878a7d8953  /home/edouard/src/beremiz_higen_dist/distfiles/numpy-1.6.1.win32-py2.7.exe
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/python-2.7.2.msi.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/python-2.7.2.msi.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+44c8bbe92b644d78dd49e18df354386f  /home/edouard/src/beremiz_higen_dist/distfiles/python-2.7.2.msi
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/pywin32-216.win32-py2.7.exe.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/pywin32-216.win32-py2.7.exe.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+042a633e727bf8e1a899a94abf45be01  /home/edouard/src/beremiz_higen_dist/distfiles/pywin32-216.win32-py2.7.exe
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/simplejson-2.2.1.tar.gz.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/simplejson-2.2.1.tar.gz.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+070c6467462bd63306f1756b01df6d70  /home/edouard/src/beremiz_higen_dist/distfiles/simplejson-2.2.1.tar.gz
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/w32api-3.17-2-mingw32-dev.tar.lzma.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/w32api-3.17-2-mingw32-dev.tar.lzma.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+c3a86ffa6b8c21de868df54e4e38f05e  /home/edouard/src/beremiz_higen_dist/distfiles/w32api-3.17-2-mingw32-dev.tar.lzma
diff -r 7bc9d95b92bc -r edaf97f39e5d distfiles/wxPython2.8-win32-unicode-2.8.12.1-py27.exe.md5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distfiles/wxPython2.8-win32-unicode-2.8.12.1-py27.exe.md5	Mon Oct 03 17:43:45 2011 +0200
@@ -0,0 +1,1 @@
+895ba07ea6c05fcdbc273a921bad787b  /home/edouard/src/beremiz_higen_dist/distfiles/wxPython2.8-win32-unicode-2.8.12.1-py27.exe