document: fix regressions at storage and node_descriptor

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 764306b..d4fefa4 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -16,7 +16,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -52,7 +52,8 @@ py_short_version = '%s.%s' % sys.version_info[:2]
 
 required_modules = [
     ('lxml', 'lxml module: pythonic libxml2 and libxslt bindings'),
-    ('mx', "egenix's mx library for its extended DateTime module"),
+    ('mako', 'Mako template engine'),
+    ('dateutil', "Extensions to the standard datetime module"),
     ('psycopg2', 'PostgreSQL module'),
     ('pychart', 'pychart module'),
     ('pydot', 'pydot module'),
@@ -74,18 +75,18 @@ def check_modules():
         sys.exit(1)
 
 def find_addons():
-    for dp, dn, names in os.walk(join('bin', 'addons')):
+    for root, _, names in os.walk(join('bin', 'addons')):
         if '__terp__.py' in names:
-            yield basename(dp), dp
+            yield basename(root), root
     #look for extra modules
     try:
-        empath = os.getenv('EXTRA_MODULES_PATH','../addons/')
-        for mname in open(join(empath,'server_modules.list')):
+        empath = os.getenv('EXTRA_MODULES_PATH', '../addons/')
+        for mname in open(join(empath, 'server_modules.list')):
             mname = mname.strip()
             if not mname:
                 continue
-            if os.path.exists(join(empath,mname,'__terp__.py')):
-                yield mname, join(empath,mname)
+            if os.path.exists(join(empath, mname, '__terp__.py')):
+                yield mname, join(empath, mname)
             else:
                 print "Module %s specified, but no valid path." % mname
     except:
@@ -95,10 +96,10 @@ def data_files():
     '''Build list of data files to be installed'''
     files = []
     if os.name == 'nt':
-        for dp,dn,names in os.walk(join('bin','addons')):
-            files.append((dp, map(lambda x: join(dp, x), names)))
-        for dp,dn,names in os.walk('doc'):
-            files.append((dp, map(lambda x: join(dp, x), names)))
+        for root, _, names in os.walk(join('bin','addons')):
+            files.append((root, [join(root, name) for name in names]))
+        for root, _, names in os.walk('doc'):
+            files.append((root, [join(root, name) for name in names]))
         files.append(('.', [join('bin', 'import_xml.rng'),
                             join('bin', 'server.pkey'),
                             join('bin', 'server.cert')]))
@@ -148,16 +149,16 @@ exit 1
 f.close()
 
 def find_package_dirs():
-    res = {}
+    package_dirs = {'openerp-server': 'bin'}
     for mod, path in find_addons():
-        res ['openerp-server.addons.'+ mod ] = path
-    res ['openerp-server'] = 'bin'
-    return res
+        package_dirs['openerp-server.addons.' + mod] = path
+    return package_dirs
 
 class openerp_server_install(install):
     def run(self):
         # create startup script
-        start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n" % (join(self.install_libbase, "openerp-server"), sys.executable)
+        start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n"\
+            % (join(self.install_libbase, "openerp-server"), sys.executable)
         # write script
         f = open('openerp-server', 'w')
         f.write(start_script)
@@ -170,9 +171,9 @@ options = {
         "optimize": 2,
         "dist_dir": 'dist',
         "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",
+                     "lxml.objectify", "decimal", "xml", "encodings",
+                     "dateutil", "wizard", "pychart", "PIL", "pyparsing",
+                     "pydot", "asyncore","asynchat", "reportlab", "vobject",
                      "HTMLParser", "select"],
         "excludes" : ["Tkconstants","Tkinter","tcl"],
     }
@@ -195,9 +196,9 @@ setup(name             = name,
       packages         = ['openerp-server',
                           'openerp-server.addons',
                           'openerp-server.ir',
-                          'openerp-server.mako',
                           'openerp-server.osv',
                           'openerp-server.pychart',
+                          'openerp-server.pychart.afm',
                           'openerp-server.report',
                           'openerp-server.report.printscreen',
                           'openerp-server.report.pyPdf',
@@ -212,9 +213,12 @@ setup(name             = name,
                           'openerp-server.tools',
                           'openerp-server.wizard',
                           'openerp-server.workflow'] + \
-                          list(map( lambda (a, p): 'openerp-server.addons.'+ a ,find_addons())),
+                          [('openerp-server.addons.' + name)
+                           for name, _ in find_addons()],
       package_dir      = find_package_dirs(),
-      console = [ { "script" : "bin\\openerp-server.py", "icon_resources" : [ (1,"pixmaps\\openerp-icon.ico") ] } ],
+      console = [{"script": join("bin", "openerp-server.py"),
+                  "icon_resources": [(1,join("pixmaps","openerp-icon.ico"))]
+                  }],
       options = options,
       )