From: benoit.pin <benoit.pin@fe552daf-6dbe-4428-90eb-1537e0879342>
Date: Tue, 23 Nov 2010 13:52:23 +0000 (+0000)
Subject: Ajout du thème pgu spécifique à minwii dans l'installateur.
X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/commitdiff_plain/004dc10b1148278e38ba86cfdfaf2a957dfe41eb?ds=sidebyside

Ajout du thème pgu spécifique à minwii dans l'installateur.


git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@321 fe552daf-6dbe-4428-90eb-1537e0879342
---

diff --git a/setup.py b/setup.py
index f07d47f..c304f45 100755
--- a/setup.py
+++ b/setup.py
@@ -20,5 +20,6 @@ setup(name='MINWii',
                     'minwii.widgets' : ['data/*.png',
                                         'data/cursor/black/*',
                                         'data/cursor/black-perforated/*',
-                                        'data/instruments/*.jpg']}
+                                        'data/instruments/*.jpg',
+                                        'data/minwii_theme/*']}
       )
\ No newline at end of file
diff --git a/setup_win_exe.py b/setup_win_exe.py
index e122fef..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())