From 4f24569ebb9de3b2433cef9b2ed8dcf8ebbe8633 Mon Sep 17 00:00:00 2001
From: pin <pin@fe552daf-6dbe-4428-90eb-1537e0879342>
Date: Thu, 27 May 2010 13:28:13 +0000
Subject: [PATCH] =?utf8?q?youpiya,=20=C3=A7a=20marche,=20mais=20sans=20les?=
 =?utf8?q?=20wiimotes...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@194 fe552daf-6dbe-4428-90eb-1537e0879342
---
 setup_win_exe.py        | 19 +++++++++++++------
 src/minwii/start_win.py |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/setup_win_exe.py b/setup_win_exe.py
index 55050ab..39cf87e 100755
--- a/setup_win_exe.py
+++ b/setup_win_exe.py
@@ -53,6 +53,12 @@ class MinWii2exe(py2exe.build_exe.py2exe) :
         self.copyDataFiles('src/minwii/soundfonts', 'minwii/soundfonts')
         self.copyDataFiles('src/minwii/widgets/data', 'minwii/widgets/data')
         self.copyDataFiles(findPguThemesDir(), 'data/themes')
+
+        pygamedir = os.path.dirname(pygame.base.__file__)
+        pygame_default_font = os.path.join(pygamedir, pygame.font.get_default_font())
+        dest = os.path.join(self.collect_dir, 'pygame', pygame.font.get_default_font())
+        self.copy_file(pygame_default_font, dest)
+        self.compiled_files.append(os.path.join('pygame', pygame.font.get_default_font()))
     
     def copyDataFiles(self, src, dest) :
         src = src.replace('/', os.path.sep)
@@ -126,7 +132,7 @@ class BuildExe:
         self.exclude_dll = ['']
 
         #Zip file name (None will bundle files in exe instead of zip file)
-        self.zipfile_name = None
+        self.zipfile_name = 'minwii_lib.zip'
 
         #Dist directory
         self.dist_dir ='dist'
@@ -164,11 +170,12 @@ class BuildExe:
             #}],
             console = [self.script],
             options = {'py2exe': {#'optimize': 2,
-                                  'bundle_files': 1,
-                                  'compressed': True,
-                                  'excludes': self.exclude_modules,
-                                  'packages': self.extra_modules,
-                                  'dll_excludes': self.exclude_dll}
+                                  #'bundle_files': 1,
+                                  #'compressed': True,
+                                  #'excludes': self.exclude_modules,
+                                  #'packages': self.extra_modules,
+                                  #'dll_excludes': self.exclude_dll,
+                                  'skip_archive' : True}
                       },
             zipfile = self.zipfile_name,
             data_files = self.data_files,
diff --git a/src/minwii/start_win.py b/src/minwii/start_win.py
index 6eb8d18..0e6e61a 100755
--- a/src/minwii/start_win.py
+++ b/src/minwii/start_win.py
@@ -18,4 +18,4 @@ def main(wiimoteSupport) :
     pygame.quit()   
 
 if __name__ == "__main__" :
-    main(True)
+    main(False)
-- 
2.20.1