From 222b70fbb454f0b22d17f24880fef5ae3aa52d64 Mon Sep 17 00:00:00 2001
From: gimick <bbtgaf@googlemail.com>
Date: Sat, 26 Jun 2010 00:48:55 +0100
Subject: [PATCH] add mysql to build instructions, py2.6 mods to py2exe, set
 ver 0.20pre3

---
 packaging/windows/py2exeWalkthroughPython26.txt |  2 ++
 pyfpdb/fpdb.pyw                                 |  2 +-
 pyfpdb/py2exe_setup.py                          | 15 ++++++++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packaging/windows/py2exeWalkthroughPython26.txt b/packaging/windows/py2exeWalkthroughPython26.txt
index c7ad72fe..de46a15e 100644
--- a/packaging/windows/py2exeWalkthroughPython26.txt
+++ b/packaging/windows/py2exeWalkthroughPython26.txt
@@ -20,6 +20,8 @@ pygtk 2.16.0 ... http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/2.16/pygtk-
 pycairo 1.8.6 ... http://ftp.gnome.org/pub/GNOME/binaries/win32/pycairo/1.8/pycairo-1.8.6.win32-py2.6.exe
 pyGobject 2.20.0 ... http://ftp.gnome.org/pub/GNOME/binaries/win32/pygobject/2.20/pygobject-2.20.0.win32-py2.6.exe
 py2exe 0.6.9 ... http://sourceforge.net/projects/py2exe/files/py2exe/0.6.9/py2exe-0.6.9.win32-py2.6.exe/download
+MySQL-python 1.2.3c1 ... http://www.codegood.com/download/4/  (MySQL-python-1.2.3c1.win32-py2.6.exe)
+
 
 
 Step 2 Setup GTK
diff --git a/pyfpdb/fpdb.pyw b/pyfpdb/fpdb.pyw
index df7bbb31..5715b884 100755
--- a/pyfpdb/fpdb.pyw
+++ b/pyfpdb/fpdb.pyw
@@ -111,7 +111,7 @@ import Database
 import Configuration
 import Exceptions
 
-VERSION = "0.20-pre1"
+VERSION = "0.20-pre3"
 
 
 class fpdb:
diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index be6caf2a..ceb490bc 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -63,6 +63,10 @@ Py2exe script for fpdb.
 #  
 #  libgobject-2.0-0.dll
 #  libgdk-win32-2.0-0.dll
+#
+#  Now updated to work with python 2.6 + related dependencies
+#  See walkthrough in packaging directory for versions used
+#  Updated to this script have broken python 2.5 compatibility (gio module, new licence file locations)
 
 
 import os
@@ -77,7 +81,9 @@ from datetime import date
 
 origIsSystemDLL = py2exe.build_exe.isSystemDLL
 def isSystemDLL(pathname):
-        if os.path.basename(pathname).lower() in ("msvcp71.dll", "dwmapi.dll"):
+        #VisC++ runtime msvcp71.dll removed; py2.6 needs msvcp90.dll which will not be distributed.
+        #dwmapi appears to be vista-specific file, not XP 
+        if os.path.basename(pathname).lower() in ("dwmapi.dll"):
                 return 0
         return origIsSystemDLL(pathname)
 py2exe.build_exe.isSystemDLL = isSystemDLL
@@ -150,7 +156,8 @@ setup(
               },
 
     # files in 2nd value in tuple are moved to dir named in 1st value
-    data_files = [('', ['HUD_config.xml.example', 'Cards01.png', 'logging.conf', '../docs/readme.txt'])
+    #data_files updated for new locations of licences + readme nolonger exists
+    data_files = [('', ['HUD_config.xml.example', 'Cards01.png', 'logging.conf', '../agpl-3.0.txt', '../fdl-1.2.txt', '../THANKS.txt'])
                  ,(dist_dir, [r'..\run_fpdb.bat'])
                  ,( dist_dir + r'\gfx', glob.glob(r'..\gfx\*.*') )
                  # line below has problem with fonts subdir ('not a regular file')
@@ -174,7 +181,7 @@ dest = dest.replace('\\', '\\\\')
 os.rename( 'pyfpdb', dest )
 
 
-print "Enter directory name for GTK 2.14 (e.g. c:\code\gtk_2.14.7-20090119)\n: ",     # the comma means no newline
+print "Enter directory name for GTK (e.g. c:\code\gtk_2.14.7-20090119)\n: ",     # the comma means no newline
 gtk_dir = sys.stdin.readline().rstrip()
 
 
@@ -223,6 +230,8 @@ pyfpdb/share/locale
 pyfpdb/share/man
 pyfpdb/share/themes/Default
 
+Please double-check that msvcp90.dll is NOT in the distribution tree
+
 Use 7-zip to zip up the distribution and create a self extracting archive and that's it!
 """