[IMP] Account: Add extended groups to menus

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 9571c90..2e004e7 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,12 +52,14 @@ 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'),
     ('pytz', 'Timezone handling library for Python'),
     ('reportlab', 'reportlab module'),
+    ('yaml', 'YAML parser and emitter for Python'),
 ]
 
 def check_modules():
@@ -75,7 +77,7 @@ def check_modules():
 
 def find_addons():
     for root, _, names in os.walk(join('bin', 'addons')):
-        if '__terp__.py' in names:
+        if '__openerp__.py' in names or '__terp__.py' in names:
             yield basename(root), root
     #look for extra modules
     try:
@@ -84,7 +86,12 @@ def find_addons():
             mname = mname.strip()
             if not mname:
                 continue
-            if os.path.exists(join(empath, mname, '__terp__.py')):
+
+            terp = join(empath, mname, '__openerp__.py')
+            if not os.path.exists(terp):
+                terp = join(empath, mname, '__terp__.py')
+
+            if os.path.exists(terp):
                 yield mname, join(empath, mname)
             else:
                 print "Module %s specified, but no valid path." % mname
@@ -162,7 +169,7 @@ class openerp_server_install(install):
         f = open('openerp-server', 'w')
         f.write(start_script)
         f.close()
-        super(openerp_server_install, self).run()
+        install.run(self)
 
 options = {
     "py2exe": {
@@ -170,10 +177,10 @@ 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", "HTMLParser", "select"],
+                     "lxml.objectify", "decimal", "xml", "encodings",
+                     "dateutil", "wizard", "pychart", "PIL", "pyparsing",
+                     "pydot", "asyncore","asynchat", "reportlab", "vobject",
+                     "HTMLParser", "select", "yaml"],
         "excludes" : ["Tkconstants","Tkinter","tcl"],
     }
 }
@@ -195,9 +202,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',
@@ -213,7 +220,7 @@ setup(name             = name,
                           'openerp-server.wizard',
                           'openerp-server.workflow'] + \
                           [('openerp-server.addons.' + name)
-                           for name, _ in find_addons()]
+                           for name, _ in find_addons()],
       package_dir      = find_package_dirs(),
       console = [{"script": join("bin", "openerp-server.py"),
                   "icon_resources": [(1,join("pixmaps","openerp-icon.ico"))]