packaging fixes

__pkginfo__.py

@@ -14,5 +14,5 @@
 web = 'http://www.cubicweb.org/project/%s' % distname
 
 description = "commenting system for the CubicWeb framework"
-
+short_desc = description # XXX cw < 3.8 bw compat
 
@@ -18,5 +18,4 @@
 
-__depends__ = {'cubicweb': '>= 3.6.0'}
 classifiers = [
            'Environment :: Web Environment',
            'Framework :: CubicWeb',
@@ -24,4 +23,5 @@
            'Programming Language :: JavaScript',
 ]
 
+__depends__ = {'cubicweb': '>= 3.6.0'}
 
@@ -27,4 +27,3 @@
 
-from os import listdir
-from os.path import join
+# package ###
 
@@ -30,3 +29,7 @@
 
-CUBES_DIR = join('share', 'cubicweb', 'cubes')
+from os import listdir as _listdir
+from os.path import join, isdir, exists
+from glob import glob
+
+THIS_CUBE_DIR = join('share', 'cubicweb', 'cubes', modname)
 
@@ -32,16 +35,15 @@
 
-try:
-    data_files = [
-        [join(CUBES_DIR, 'comment'),
-         [fname for fname in listdir('.')
-          if fname.endswith('.py') and fname != 'setup.py']],
-        [join(CUBES_DIR, 'comment', 'data'),
-         [join('data', fname) for fname in listdir('data')]],
-        [join(CUBES_DIR, 'comment', 'i18n'),
-         [join('i18n', fname) for fname in listdir('i18n')]],
-        [join(CUBES_DIR, 'comment', 'migration'),
-         [join('migration', fname) for fname in listdir('migration')]],
-        ]
-except OSError:
-    # we are in an installed directory
-    pass
+def listdir(dirpath):
+    return [join(dirpath, fname) for fname in _listdir(dirpath)
+            if fname[0] != '.' and not fname.endswith('.pyc')
+            and not fname.endswith('~')
+            and not isdir(join(dirpath, fname))]
+
+data_files = [
+    # common files
+    [THIS_CUBE_DIR, [fname for fname in glob('*.py') if fname != 'setup.py']],
+    ]
+# check for possible extended cube layout
+for dname in ('entities', 'views', 'sobjects', 'hooks', 'schema', 'data', 'i18n', 'migration'):
+    if isdir(dname):
+        data_files.append([join(THIS_CUBE_DIR, dname), listdir(dname)])