X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/d4b591abe110f8c546838449dad36351d223ee6c..ad467d05bb27ae61dd90f03577193752d60c5a45:/setup_win_exe.py?ds=inline

diff --git a/setup_win_exe.py b/setup_win_exe.py
index 1aa2fb0..8410838 100755
--- a/setup_win_exe.py
+++ b/setup_win_exe.py
@@ -26,24 +26,6 @@ def isSystemDLL(pathname):
     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__)
@@ -55,7 +37,6 @@ class MinWii2exe(py2exe.build_exe.py2exe) :
         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')
-        self.copyDataFiles(findPguThemesDir(), 'data/themes')
 
         pygamedir = os.path.dirname(pygame.base.__file__)
         pygame_default_font = os.path.join(pygamedir, pygame.font.get_default_font())
@@ -155,18 +136,18 @@ class BuildExe:
 
             # targets to build
             windows = [{
-                'script': self.script,
+                'script': "src/minwii/runminwii.py",
                 'icon_resources': [(0, self.icon_file)],
                 'copyright': self.copyright
                 },
                 {
                 'script' : "src/minwii/logapp.py",
-                'icon_resources': [(0, self.icon_file)]
+                'icon_resources': [(0, 'logapp.ico')],
                 'copyright' : self.copyright
                 }
-                ]
-            #console = [self.script],
-            options = {'py2exe': {'optimize': 2,
+                ],
+            #console = ["src/minwii/logapp.py"],
+            options = {'py2exe': {'optimize': 1,
                                   'bundle_files': 3,
                                   #'compressed': True,
                                   #'excludes': self.exclude_modules,