Montée de version 1.2.

[minwii.git] / setup_win_exe.py

diff --git a/setup_win_exe.py b/setup_win_exe.py
index 1fa44dd..8410838 100755 (executable)
--- a/setup_win_exe.py
+++ b/setup_win_exe.py
@@ -26,33 +26,17 @@ def isSystemDLL(pathname):
     return origIsSystemDLL(pathname)
 py2exe.build_exe.isSystemDLL = isSystemDLL
 
     return origIsSystemDLL(pathname)
 py2exe.build_exe.isSystemDLL = isSystemDLL
 

-def findPguThemesDir() :
-    import pgu.gui.theme
-    theme_file = pgu.gui.theme.__file__
-    dnames = []
-    dnames.append(os.path.join(os.path.dirname(theme_file),"..","..","data","themes"))
-    
-    #if the package is installed, and the package is installed
-    #in /usr/lib/python2.3/site-packages/pgu/
-    #or c:\python23\lib\site-packages\pgu\
-    #the data is in ... lib/../share/ ...
-    dnames.append(os.path.join(os.path.dirname(theme_file),"..","..","..","..","share","pgu","themes"))
-    dnames.append(os.path.join(os.path.dirname(theme_file),"..","..","..","..","..","share","pgu","themes"))
-    dnames.append(os.path.join(os.path.dirname(theme_file),"..","..","share","pgu","themes")) 
-    for dname in dnames:
-        if os.path.isdir(dname):
-            return dname
-    raise IOError('pgu themes folder not found')
-    
+def findMinwiiDir() :
+    import minwii
+    return os.path.dirname(minwii.__file__)

 
 class MinWii2exe(py2exe.build_exe.py2exe) :
     def copy_extensions(self, extensions) :
         py2exe.build_exe.py2exe.copy_extensions(self, extensions)
 
 class MinWii2exe(py2exe.build_exe.py2exe) :
     def copy_extensions(self, extensions) :
         py2exe.build_exe.py2exe.copy_extensions(self, extensions)

-        
-        self.copyDataFiles('src/minwii/fonts', 'minwii/fonts')
-        self.copyDataFiles('src/minwii/soundfonts', 'minwii/soundfonts')
-        self.copyDataFiles('src/minwii/widgets/data', 'minwii/widgets/data')
-        self.copyDataFiles(findPguThemesDir(), 'data/themes')
+        minwiiDir = findMinwiiDir()
+        self.copyDataFiles(os.path.join(minwiiDir, 'fonts'), 'minwii/fonts')
+        self.copyDataFiles(os.path.join(minwiiDir, 'soundfonts'), 'minwii/soundfonts')
+        self.copyDataFiles(os.path.join(minwiiDir, 'widgets', 'data'), 'minwii/widgets/data')

 
         pygamedir = os.path.dirname(pygame.base.__file__)
         pygame_default_font = os.path.join(pygamedir, pygame.font.get_default_font())
 
         pygamedir = os.path.dirname(pygame.base.__file__)
         pygame_default_font = os.path.join(pygamedir, pygame.font.get_default_font())


@@ -85,7 +69,7 @@ class MinWii2exe(py2exe.build_exe.py2exe) :
 class BuildExe:
     def __init__(self):
         #Name of starting .py
 class BuildExe:
     def __init__(self):
         #Name of starting .py

-        self.script = "src/minwii/runminwii.py"
+        #self.script = "src/minwii/runminwii.py"

 
         #Name of program
         self.project_name = "MINWii"
 
         #Name of program
         self.project_name = "MINWii"


@@ -152,12 +136,18 @@ class BuildExe:
 
             # targets to build
             windows = [{
 
             # targets to build
             windows = [{

-                'script': self.script,
+                'script': "src/minwii/runminwii.py",

                 'icon_resources': [(0, self.icon_file)],
                 'copyright': self.copyright
                 'icon_resources': [(0, self.icon_file)],
                 'copyright': self.copyright

-            }],
-            #console = [self.script],
-            options = {'py2exe': {'optimize': 2,
+                },
+                {
+                'script' : "src/minwii/logapp.py",
+                'icon_resources': [(0, 'logapp.ico')],
+                'copyright' : self.copyright
+                }
+                ],
+            #console = ["src/minwii/logapp.py"],
+            options = {'py2exe': {'optimize': 1,

                                   'bundle_files': 3,
                                   #'compressed': True,
                                   #'excludes': self.exclude_modules,
                                   'bundle_files': 3,
                                   #'compressed': True,
                                   #'excludes': self.exclude_modules,