From fbeaa5590f40f599c1737c87bce5ab8e1a2fea6c Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 7 Feb 2010 01:06:36 +0000
Subject: [PATCH] move run_fpdb.bat up a directory to /fpdb/

---
 pyfpdb/py2exe_setup.py              | 25 ++++++++++++++-----------
 pyfpdb/run_fpdb.bat => run_fpdb.bat |  0
 2 files changed, 14 insertions(+), 11 deletions(-)
 rename pyfpdb/run_fpdb.bat => run_fpdb.bat (100%)

diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index e6219ae3..28f13cc1 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -88,10 +88,10 @@ test_and_remove('gfx')
 
 
 today = date.today().strftime('%Y%m%d')
-print "\nOutput will be created in /dist/ and /fpdb_XXX_"+today+"/"
+print "\n" + r"Output will be created in \dist\ and \fpdb_XXX_"+today+'\\'
 print "Enter value for XXX (any length): ",     # the comma means no newline
 xxx = sys.stdin.readline().rstrip()
-dist_dir = r'..\fpdb-' + xxx + '-' + today
+dist_dir = r'..\fpdb-' + xxx + '-' + today + '-exe'
 print
 
 
@@ -106,23 +106,26 @@ setup(
               ],
 
     options = {'py2exe': {
-                      'packages'    : 'encodings',
-                      'includes'    : 'cairo, pango, pangocairo, atk, gobject, PokerStarsToFpdb',
-                      'excludes'    : '_tkagg, _agg2, cocoaagg, fltkagg',
-                      'dll_excludes': 'libglade-2.0-0.dll',
+                      'packages'    : ['encodings', 'matplotlib'],
+                      'includes'    : ['cairo', 'pango', 'pangocairo', 'atk', 'gobject'
+                                      ,'PokerStarsToFpdb', 'matplotlib.numerix.random_array'],
+                      'excludes'    : ['_gtkagg', '_tkagg', '_agg2', 'cocoaagg', 'fltkagg'],
+                      'dll_excludes': ['libglade-2.0-0.dll', 'libgdk-win32-2.0-0.dll'
+                                      ,'libgobject-2.0-0.dll'],
                   }
               },
 
-    # files are moved from 2nd value in tuple to dir named in 1st
+    # files in 2nd value in tuple are moved to dir named in 1st value
     data_files = [('', ['HUD_config.xml.example', 'Cards01.png', 'logging.conf'])
-                 ,(dist_dir, ['run_fpdb.bat'])
+                 ,(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')
                  #,(r'matplotlibdata', glob.glob(r'c:\python25\Lib\site-packages\matplotlib\mpl-data\*'))
                  ] + matplotlib.get_py2exe_datafiles()
 )
 
 
-print '\nIf py2exe was successful move the /dist/ directory '
-print 'into /'+dist_dir+'/ and rename it as /pyfpdb/'
-print "Don't forget to add the /etc /lib and /share dirs from your gtk dir\n"
+print '\n' + r'If py2exe was successful move the \dist\ directory '
+print 'into \\'+dist_dir+'\\ and rename it as \\pyfpdb\\'
+print "Don't forget to add the \\etc \\lib and \\share dirs from your gtk dir\n"
 
diff --git a/pyfpdb/run_fpdb.bat b/run_fpdb.bat
similarity index 100%
rename from pyfpdb/run_fpdb.bat
rename to run_fpdb.bat