[IMP] french translations

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 25a6ffa..be696bc 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -2,8 +2,8 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution  
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -44,6 +44,9 @@ opj = os.path.join
 
 execfile(opj('bin', 'release.py'))
 
+if sys.argv[1] != 'bdist_rpm':
+    version = version + '-' + release
+
 # get python short version
 py_short_version = '%s.%s' % sys.version_info[:2]
 
@@ -71,7 +74,7 @@ def check_modules():
 
 def find_addons():
     for (dp, dn, names) in os.walk(opj('bin', 'addons')):
-        if '__init__.py' in names:
+        if '__terp__.py' in names:
             modname = dp.replace(os.path.sep, '.').replace('bin', 'openerp-server', 1)
             yield modname
 
@@ -86,7 +89,7 @@ def data_files():
         for (dp,dn,names) in os.walk('doc'):
             files.append((dp, map(lambda x: opj(dp, x), names)))
         files.append(('.', [opj('bin', 'import_xml.rng'),
-                            opj('bin', 'server.pkey'), 
+                            opj('bin', 'server.pkey'),
                             opj('bin', 'server.cert')]))
     else:
         man_directory = opj('share', 'man')
@@ -105,14 +108,17 @@ def data_files():
                                               opj('bin', 'server.cert')]))
 
         for addon in find_addons():
+            addonname = addon.split('.')[-1]
             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 = []
             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)
+                innerfiles = filter(lambda file: os.path.splitext(file)[1] not in ('.pyc', '.pyd', '.pyo'), innerfiles)
                 if innerfiles:
-                    pathfiles.extend(((opj(addon_path, root.replace('bin/addons/', '')), map(lambda file: opj(root, file), innerfiles)),))
+                    res = os.path.normpath(opj(addon_path, root.replace(opj('bin','addons', addonname), '.')))
+                    pathfiles.extend(((res, map(lambda file: opj(root, file), innerfiles)),))
             files.extend(pathfiles)
+
     return files
 
 check_modules()
@@ -135,12 +141,12 @@ class openerp_server_install(install):
 options = {
     "py2exe": {
         "compressed": 1,
-        "optimize": 2, 
-        "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree", 
-                     "lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath", 
-                     "encodings","mx.DateTime","wizard","pychart","PIL", "pyparsing", 
+        "optimize": 2,
+        "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
+                     "lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath",
+                     "encodings","mx.DateTime","wizard","pychart","PIL", "pyparsing",
                      "pydot","asyncore","asynchat", "reportlab", "vobject",
-                     "HTMLParser", "OpenSSL", "select"],
+                     "HTMLParser", "select"],
         "excludes" : ["Tkconstants","Tkinter","tcl"],
     }
 }
@@ -155,22 +161,25 @@ setup(name             = name,
       classifiers      = filter(None, classifiers.split("\n")),
       license          = license,
       data_files       = data_files(),
-      cmdclass         = { 
+      cmdclass         = {
             'install' : openerp_server_install,
       },
       scripts          = ['openerp-server'],
-      packages         = ['openerp-server', 
+      packages         = ['openerp-server',
                           'openerp-server.addons',
                           'openerp-server.ir',
                           'openerp-server.osv',
-                          'openerp-server.service', 
+                          'openerp-server.service',
                           'openerp-server.tools',
                           'openerp-server.report',
                           'openerp-server.report.printscreen',
+                          'openerp-server.report.pyPdf',
                           'openerp-server.report.render',
                           'openerp-server.report.render.rml2pdf',
                           'openerp-server.report.render.rml2html',
-                          'openerp-server.wizard', 
+                          'openerp-server.wizard',
+                          'openerp-server.report.render.odt2odt',
+                          'openerp-server.report.render.html2html',
                           'openerp-server.workflow'] + \
                          list(find_addons()),
       package_dir      = {'openerp-server': 'bin'},