merge

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 7dd689f..c0459d0 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,8 @@ from stat import ST_MODE
 from distutils.core import setup, Command
 from distutils.command.install import install
 from distutils.command.build import build
-#from distutils.command.install_scripts import install_scripts
+from distutils.command.build_scripts import build_scripts
+from distutils.command.install_scripts import install_scripts
 from distutils.file_util import copy_file
 
 if os.name == 'nt':
@@ -53,7 +54,7 @@ execfile(opj('bin', 'release.py'))
 py_short_version = '%s.%s' % sys.version_info[:2]
 
 required_modules = [
-    ('psycopg', 'PostgreSQL module'),
+    ('psycopg2', 'PostgreSQL module'),
     ('xml', 'XML Tools for python'),
     ('libxml2', 'libxml2 python bindings'),
     ('libxslt', 'libxslt python bindings'),
@@ -76,10 +77,9 @@ def check_modules():
 
 def find_addons():
     for (dp, dn, names) in os.walk(opj('bin', 'addons')):
-        for dirpath, dirnames, filenames in os.walk(dp):
-            if '__init__.py' in filenames:
-                modname = dirpath.replace(os.path.sep, '.')
-                yield modname.replace('bin', 'openerp-server', 1)
+        if '__init__.py' in names:
+            modname = dp.replace(os.path.sep, '.').replace('bin', 'openerp-server', 1)
+            yield modname
 
 def data_files():
     '''Build list of data files to be installed'''
@@ -88,12 +88,10 @@ def data_files():
         os.chdir('bin')
         for (dp,dn,names) in os.walk('addons'):
             files.append((dp, map(lambda x: opj('bin', dp, x), names)))
-        for (dp,dn,names) in os.walk('i18n'):
-            files.append((dp, map(lambda x: opj('bin', dp, x), names)))
         os.chdir('..')
         for (dp,dn,names) in os.walk('doc'):
             files.append((dp, map(lambda x: opj(dp, x), names)))
-        files.append(('.', [('bin/import_xml.rng')]))
+        files.append(('.', [(opj('bin', 'import_xml.rng'))]))
     else:
         man_directory = opj('share', 'man')
         files.append((opj(man_directory, 'man1'), ['man/openerp-server.1']))
@@ -106,55 +104,26 @@ def data_files():
 
         openerp_site_packages = opj('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server')
 
-        files.append((opj(openerp_site_packages, 'i18n'), glob.glob('bin/i18n/*')))
-        files.append((opj(openerp_site_packages, 'addons', 'custom'),
-            glob.glob('bin/addons/custom/*xml') + glob.glob('bin/addons/custom/*rml') + glob.glob('bin/addons/custom/*xsl')))
-
         files.append((openerp_site_packages, [('bin/import_xml.rng')]))
 
         for addon in find_addons():
             add_path = addon.replace('.', os.path.sep).replace('openerp-server', 'bin', 1)
             addon_path = opj('lib', 'python%s' % py_short_version, 'site-packages', add_path.replace('bin', 'openerp-server', 1))
 
-            pathfiles = [
-                (
-                    addon_path, 
-                    glob.glob(opj(add_path, '*xml')) + 
-                    glob.glob(opj(add_path, '*csv')) + 
-                    glob.glob(opj(add_path, '*sql'))
-                ),
-                (
-                    opj(addon_path, 'data'), 
-                    glob.glob(opj(add_path, 'data', '*xml'))
-                ), 
-                (
-                    opj(addon_path, 'report'),
-                    glob.glob(opj(add_path, 'report', '*xml')) +
-                    glob.glob(opj(add_path, 'report', '*rml')) +
-                    glob.glob(opj(add_path, 'report', '*sxw')) +
-                    glob.glob(opj(add_path, 'report', '*xsl'))
-                ),
-                (   
-                    opj(addon_path, 'security'),
-                    glob.glob(opj(add_path, 'security', '*csv')) +
-                    glob.glob(opj(add_path, 'security', '*xml'))
-                ),
-                (   
-                    opj(addon_path, 'rng'), 
-                    glob.glob(opj(add_path, 'rng', '*rng'))
-                )
-            ]
+            pathfiles = []
+            for root, dirs, innerfiles in os.walk(add_path):
+                innerfiles = filter(lambda file: os.path.splitext(file)[1] not in ('.pyc', '.py', '.pyd', '.pyo'), innerfiles)
+                if innerfiles:
+                    pathfiles.extend(((opj(addon_path, root.replace('bin/addons/', '')), map(lambda file: opj(root, file), innerfiles)),))
             files.extend(pathfiles)
     return files
 
 check_modules()
 
-
-class openerp_server_build(build):
-    def run(self):
-        open('openerp-server', 'w').close()
-
-        build.run(self)
+f = file('openerp-server','w')
+start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage" """
+f.write(start_script)
+f.close()
 
 class openerp_server_install(install):
     def run(self):
@@ -164,7 +133,6 @@ class openerp_server_install(install):
         f = open('openerp-server', 'w')
         f.write(start_script)
         f.close()
-
         install.run(self)
 
 options = {
@@ -189,7 +157,9 @@ setup(name             = name,
       classifiers      = filter(None, classifiers.split("\n")),
       license          = license,
       data_files       = data_files(),
-      cmdclass         = { 'install' : openerp_server_install, 'build' : openerp_server_build },
+      cmdclass         = { 
+            'install' : openerp_server_install,
+      },
       scripts          = ['openerp-server'],
       packages         = ['openerp-server', 
                           'openerp-server.addons',