X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=setup.py;h=2e004e713dfc2e08f71a540bacd1885ee3e7b2c5;hb=54fd2af11b846cc3ba3c9f6a2078a10676686700;hp=e653e97a9ba64643215c94b427b3e7383160f853;hpb=f95956aaa3df89fed985db2a4b8d76f03759ff3e;p=odoo%2Fodoo.git diff --git a/setup.py b/setup.py index e653e97..2e004e7 100755 --- 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 (). +# Copyright (C) 2004-2010 Tiny SPRL (). # # 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 . +# along with this program. If not, see . # ############################################################################## @@ -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(): @@ -74,18 +76,23 @@ def check_modules(): sys.exit(1) def find_addons(): - for dp, dn, names in os.walk(join('bin', 'addons')): - if '__terp__.py' in names: - yield basename(dp), dp + for root, _, names in os.walk(join('bin', 'addons')): + if '__openerp__.py' in names or '__terp__.py' in names: + 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) + + 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 except: @@ -95,10 +102,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')])) @@ -141,21 +148,23 @@ if not os.getenv('NO_CHECK_MODULES') : f = file('openerp-server','w') f.write("""#!/bin/sh -echo "OpenERP Setup - The content of this file is generated at the install stage\n" +echo "Error: the content of this file should have been replaced during " +echo "installation\n" +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) @@ -168,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"], } } @@ -193,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', @@ -210,9 +219,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, )