[FIX]

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 17c2b94..64a5361 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution  
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    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
@@ -32,14 +32,8 @@ import sys
 import os
 import glob
 
-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.build_scripts import build_scripts
-from distutils.command.install_scripts import install_scripts
-from distutils.file_util import copy_file
 
 if os.name == 'nt':
     import py2exe
@@ -50,11 +44,14 @@ 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]
 
 required_modules = [
-    ('psycopg', 'PostgreSQL module'),
+    ('psycopg2', 'PostgreSQL module'),
     ('xml', 'XML Tools for python'),
     ('libxml2', 'libxml2 python bindings'),
     ('libxslt', 'libxslt python bindings'),
@@ -77,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
 
@@ -91,7 +88,9 @@ def data_files():
         os.chdir('..')
         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'))]))
+        files.append(('.', [opj('bin', 'import_xml.rng'),
+                            opj('bin', 'server.pkey'), 
+                            opj('bin', 'server.cert')]))
     else:
         man_directory = opj('share', 'man')
         files.append((opj(man_directory, 'man1'), ['man/openerp-server.1']))
@@ -104,24 +103,28 @@ def data_files():
 
         openerp_site_packages = opj('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server')
 
-        files.append((openerp_site_packages, [('bin/import_xml.rng')]))
+        files.append((openerp_site_packages, [opj('bin', 'import_xml.rng'),
+                                              opj('bin', 'server.pkey'),
+                                              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()
 
 f = file('openerp-server','w')
-start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage" """
+start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage\n" """
 f.write(start_script)
 f.close()
 
@@ -142,7 +145,8 @@ options = {
         "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"],
+                     "pydot","asyncore","asynchat", "reportlab", "vobject",
+                     "HTMLParser", "select"],
         "excludes" : ["Tkconstants","Tkinter","tcl"],
     }
 }
@@ -165,7 +169,6 @@ setup(name             = name,
                           'openerp-server.addons',
                           'openerp-server.ir',
                           'openerp-server.osv',
-                          'openerp-server.ssl',
                           'openerp-server.service', 
                           'openerp-server.tools',
                           'openerp-server.report',
@@ -177,13 +180,7 @@ setup(name             = name,
                           'openerp-server.workflow'] + \
                          list(find_addons()),
       package_dir      = {'openerp-server': 'bin'},
-      console = [ 
-          { "script" : "bin\\openerp-server.py", 
-            "icon_resources" : [
-                (1,"pixmaps\\openerp-icon.ico")
-            ]
-          }
-      ],
+      console = [ { "script" : "bin\\openerp-server.py", "icon_resources" : [ (1,"pixmaps\\openerp-icon.ico") ] } ],
       options = options,
       )