setup fix

FabriceSalvaire · FabriceSalvaire · commit fc849b384e9b · 2015-08-06T17:45:20.000+02:00
diff --git a/CodeReview/Config/ConfigInstall.py b/CodeReview/Config/ConfigInstall.py
@@ -1,12 +1,7 @@
-####################################################################################################
-#
-# This file is Autogenerated by make-ConfigInstall
-#
-####################################################################################################
-
 ####################################################################################################
 
 import os
+import sys
 
 ####################################################################################################
 
@@ -20,7 +15,17 @@ class Path(object):
 
     CodeReview_module_directory = PathTools.parent_directory_of(_this_file, step=2)
     config_directory = os.path.dirname(_this_file)
-    share_directory = os.path.realpath(os.path.join(config_directory, '..', '..', 'share'))
+
+    ##############################################
+
+    @staticmethod
+    def share_directory():
+
+        path = os.path.dirname(Path.CodeReview_module_directory)
+        if path.startswith(sys.exec_prefix):
+            return os.path.join(sys.exec_prefix, 'share', 'CodeReview')
+        else:
+            return os.path.join(path, 'share')
 
 ####################################################################################################
 
@@ -40,7 +45,7 @@ def find(config_file):
 
 class Icon(object):
 
-    icon_directory = os.path.join(Path.share_directory, 'icons')
+    icon_directory = os.path.join(Path.share_directory(), 'icons')
 
     ##############################################
 
diff --git a/setup_data.py b/setup_data.py
@@ -20,6 +20,7 @@
 
 ####################################################################################################
 
+import glob
 import os
 
 from distutils.core import Extension
@@ -97,14 +98,18 @@ def read(file_name):
               'CodeReview.Logging',
               'CodeReview.Math',
               'CodeReview.PatienceDiff',
+              'CodeReview.Repository',
               'CodeReview.Tools',
           ],
     ext_modules=[Extension('CodeReview.PatienceDiff._patiencediff_c',
                            ['CodeReview/PatienceDiff/_patiencediff_c.c'])],
     # package_dir = {'CodeReview': 'CodeReview'},
     data_files=[
-        (os.path.join(CodeReview_path, 'Config'),
-         [os.path.join('CodeReview', 'Config', 'logging.yml')]),
+        (os.path.join(CodeReview_path, 'Config'), [os.path.join('CodeReview', 'Config', 'logging.yml')]),
+        ('share/CodeReview/icons', glob.glob('share/icons/*.png')),
+        ('share/CodeReview/icons/32x32', glob.glob('share/icons/32x32/*.png')),
+        ('share/CodeReview/icons/48x48', glob.glob('share/icons/48x48/*.png')),
+        ('share/CodeReview/icons/svg', glob.glob('share/icons/svg/*.svg')),
     ],
     long_description=long_description,
     # cf. http://pypi.python.org/pypi?%3Aaction=list_classifiers
