X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=setup.py;h=28badaff8f87f1349b47e33f8b8989ed8ef486e5;hb=a3df91c53c42eb3b591525ccdca2be56b0205b3b;hp=06229aacac54f238d30cc5e766f954e8ba9e6822;hpb=0a03e0495d6d430d7a312d0b78a9f49ee230cedc;p=odoo%2Fodoo.git diff --git a/setup.py b/setup.py index 06229aa..28badaf 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 . # ############################################################################## @@ -26,167 +26,183 @@ # adapted by Nicolas Évrard # -import imp import sys import os +from os.path import join, isfile, basename import glob -from distutils.core import setup, Command -from distutils.command.install import install +from pprint import pprint as pp + +from setuptools import setup, find_packages +from setuptools.command.install import install +from distutils.sysconfig import get_python_lib has_py2exe = False +py2exe_keywords = {} if os.name == 'nt': import py2exe has_py2exe = True + py2exe_keywords['console'] = [ + { "script": join("bin", "openerp-server.py"), + "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))] + }] + py2exe_keywords['options'] = { + "py2exe": { + "compressed": 1, + "optimize": 2, + "dist_dir": 'dist', + "packages": [ + "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree", + "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath", + "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing", + "pydot", "asyncore","asynchat", "reportlab", "vobject", + "HTMLParser", "select", "mako", "poplib", + "imaplib", "smtplib", "email", "yaml", "DAV", + "uuid", "commands", + ], + "excludes" : ["Tkconstants","Tkinter","tcl"], + } + } -sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), "bin")) - -opj = os.path.join +sys.path.append(join(os.path.abspath(os.path.dirname(__file__)), "bin")) -execfile(opj('bin', 'release.py')) +execfile(join('bin', 'release.py')) -if sys.argv[1] == 'bdist_rpm': +if 'bdist_rpm' in sys.argv: version = version.split('-')[0] # get python short version py_short_version = '%s.%s' % sys.version_info[:2] -required_modules = [ - ('lxml', 'lxml module: pythonic libxml2 and libxslt bindings'), - ('psycopg2', 'PostgreSQL module'), - ('pychart', 'pychart module'), - ('pydot', 'pydot module'), - ('reportlab', 'reportlab module'), -] - -def check_modules(): - ok = True - for modname, desc in required_modules: - try: - exec('import %s' % modname) - except ImportError: - ok = False - print 'Error: python module %s (%s) is required' % (modname, desc) - - if not ok: - sys.exit(1) - -def _find_addons(): - for (dp, dn, names) in os.walk(opj('bin', 'addons')): - if '__terp__.py' in names: - modname = os.path.basename(dp) - yield (modname, dp) +# backports os.walk with followlinks from python 2.6 +def walk_followlinks(top, topdown=True, onerror=None, followlinks=False): + from os.path import join, isdir, islink + from os import listdir, error + + try: + names = listdir(top) + except error, err: + if onerror is not None: + onerror(err) + return + + dirs, nondirs = [], [] + for name in names: + if isdir(join(top, name)): + dirs.append(name) + else: + nondirs.append(name) + + if topdown: + yield top, dirs, nondirs + for name in dirs: + path = join(top, name) + if followlinks or not islink(path): + for x in walk_followlinks(path, topdown, onerror, followlinks): + yield x + if not topdown: + yield top, dirs, nondirs + +if sys.version_info < (2, 6): + os.walk = walk_followlinks + +def find_addons(): + for root, _, names in os.walk(join('bin', 'addons'), followlinks=True): + 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/') - f = open(opj(empath,'server_modules.list'),'r') - # print 'Getting modules from:' , opj(empath,'server_modules.list') - mods = f.readlines() - for mname in mods: + 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(opj(empath,mname,'__terp__.py')): - yield ( mname, opj(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: + except Exception: pass -__found_addons = None - -# Cache the results of _find_addons() and return them -def find_addons(found_addons = None): - if not found_addons: - found_addons = _find_addons() - return found_addons - def data_files(): '''Build list of data files to be installed''' files = [] if os.name == 'nt': os.chdir('bin') - for (dp,dn,names) in os.walk('addons'): - files.append((dp, map(lambda x: opj('bin', dp, x), names))) + for (dp, dn, names) in os.walk('addons'): + files.append((dp, map(lambda x: join('bin', dp, x), names))) 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'), - opj('bin', 'server.pkey'), - opj('bin', 'server.cert')])) + #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])) + #for root, _, names in os.walk('pixmaps'): + # files.append((root, [join(root, name) for name in names])) + files.append(('.', [join('bin', 'import_xml.rng'),])) else: - man_directory = opj('share', 'man') - files.append((opj(man_directory, 'man1'), ['man/openerp-server.1'])) - files.append((opj(man_directory, 'man5'), ['man/openerp_serverrc.5'])) + man_directory = join('share', 'man') + files.append((join(man_directory, 'man1'), ['man/openerp-server.1'])) + files.append((join(man_directory, 'man5'), ['man/openerp_serverrc.5'])) - doc_directory = opj('share', 'doc', 'openerp-server-%s' % version) - files.append((doc_directory, [f for f in glob.glob('doc/*') if os.path.isfile(f)])) - files.append((opj(doc_directory, 'migrate', '3.3.0-3.4.0'), [f for f in glob.glob('doc/migrate/3.3.0-3.4.0/*') if os.path.isfile(f)])) - files.append((opj(doc_directory, 'migrate', '3.4.0-4.0.0'), [f for f in glob.glob('doc/migrate/3.4.0-4.0.0/*') if os.path.isfile(f)])) + doc_directory = join('share', 'doc', 'openerp-server-%s' % version) + files.append((doc_directory, filter(isfile, glob.glob('doc/*')))) + files.append((join(doc_directory, 'migrate', '3.3.0-3.4.0'), + filter(isfile, glob.glob('doc/migrate/3.3.0-3.4.0/*')))) + files.append((join(doc_directory, 'migrate', '3.4.0-4.0.0'), + filter(isfile, glob.glob('doc/migrate/3.4.0-4.0.0/*')))) - openerp_site_packages = opj('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server') + openerp_site_packages = join(get_python_lib(prefix=''), 'openerp-server') - files.append((openerp_site_packages, [opj('bin', 'import_xml.rng'), - opj('bin', 'server.pkey'), - opj('bin', 'server.cert')])) + files.append((openerp_site_packages, [join('bin', 'import_xml.rng'),])) if sys.version_info[0:2] == (2,5): - files.append((openerp_site_packages, [ opj('python25-compat','BaseHTTPServer.py'), - opj('python25-compat','SimpleXMLRPCServer.py'), - opj('python25-compat','SocketServer.py')])) + files.append((openerp_site_packages, [ join('python25-compat','BaseHTTPServer.py'), + join('python25-compat','SimpleXMLRPCServer.py'), + join('python25-compat','SocketServer.py')])) - for (addonname, add_path) in find_addons(): - addon_path = opj('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server','addons', addonname) - pathfiles = [] + for addonname, add_path in find_addons(): + addon_path = join(get_python_lib(prefix=''), 'openerp-server','addons', addonname) for root, dirs, innerfiles in os.walk(add_path): innerfiles = filter(lambda fil: os.path.splitext(fil)[1] not in ('.pyc', '.pyd', '.pyo'), innerfiles) if innerfiles: - res = os.path.normpath(opj(addon_path, root.replace(opj(add_path), '.'))) - pathfiles.extend(((res, map(lambda fil: opj(root, fil), innerfiles)),)) - files.extend(pathfiles) + res = os.path.normpath(join(addon_path, root.replace(join(add_path), '.'))) + files.extend(((res, map(lambda fil: join(root, fil), + innerfiles)),)) - # for tup in files: - # print "Files:", tup[0], tup[1] return files -if not os.getenv('NO_CHECK_MODULES',False) : - 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\n" """ -f.write(start_script) +f.write("""#!/bin/sh +echo "Error: the content of this file should have been replaced during " +echo "installation\n" +exit 1 +""") f.close() def find_package_dirs(): - res = {} - for (mod, path) in find_addons(): - res ['openerp-server.addons.'+ mod ] = path - res ['openerp-server'] = 'bin' - return res + package_dirs = {'openerp-server': 'bin'} + for mod, path in find_addons(): + 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" % (opj(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) f.close() install.run(self) -options = { - "py2exe": { - "compressed": 1, - "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"], - "excludes" : ["Tkconstants","Tkinter","tcl"], - } -} + + setup(name = name, version = version, @@ -199,59 +215,63 @@ setup(name = name, license = license, data_files = data_files(), cmdclass = { - 'install' : openerp_server_install, + 'install' : openerp_server_install, }, scripts = ['openerp-server'], - packages = ['openerp-server', - 'openerp-server.addons', - 'openerp-server.ir', - 'openerp-server.mako', - 'openerp-server.osv', - 'openerp-server.pychart', - 'openerp-server.report', - 'openerp-server.report.printscreen', - 'openerp-server.report.pyPdf', - 'openerp-server.report.render', - 'openerp-server.report.render.html2html', - 'openerp-server.report.render.makohtml2html', - 'openerp-server.report.render.odt2odt', - 'openerp-server.report.render.rml2html', - 'openerp-server.report.render.rml2pdf', - 'openerp-server.report.render.rml2txt', - 'openerp-server.service', - 'openerp-server.tools', - 'openerp-server.wizard', - 'openerp-server.workflow'] + \ - list(map( lambda (a, p): 'openerp-server.addons.'+ a ,find_addons())), + packages = [ + '.'.join(['openerp-server'] + package.split('.')[1:]) + for package in find_packages() + ], + include_package_data = True, + package_data = { + '': ['*.yml', '*.xml', '*.po', '*.pot', '*.csv'], + }, package_dir = find_package_dirs(), - console = [ { "script" : "bin\\openerp-server.py", "icon_resources" : [ (1,"pixmaps\\openerp-icon.ico") ] } ], - options = options, - ) + install_requires = [ + 'lxml', + 'mako', + 'python-dateutil', + 'psycopg2', + 'pychart', + 'pydot', + 'pytz', + 'reportlab', + 'caldav', + 'pyyaml', + 'pywebdav', + 'feedparser', + ], + extras_require={ + 'SSL' : ['pyopenssl'], + }, + **py2exe_keywords +) if has_py2exe: - # Sometime between pytz-2008a and pytz-2008i common_timezones started to - # include only names of zones with a corresponding data file in zoneinfo. - # pytz installs the zoneinfo directory tree in the same directory - # as the pytz/__init__.py file. These data files are loaded using - # pkg_resources.resource_stream. py2exe does not copy this to library.zip so - # resource_stream can't find the files and common_timezones is empty when - # read in the py2exe executable. - # This manually copies zoneinfo into the zip. See also - # http://code.google.com/p/googletransitdatafeed/issues/detail?id=121 - import pytz - import zipfile - # Make sure the layout of pytz hasn't changed - assert (pytz.__file__.endswith('__init__.pyc') or - pytz.__file__.endswith('__init__.py')), pytz.__file__ - zoneinfo_dir = os.path.join(os.path.dirname(pytz.__file__), 'zoneinfo') - # '..\\Lib\\pytz\\__init__.py' -> '..\\Lib' - disk_basedir = os.path.dirname(os.path.dirname(pytz.__file__)) - zipfile_path = os.path.join(options['py2exe']['dist_dir'], 'library.zip') - z = zipfile.ZipFile(zipfile_path, 'a') - for absdir, directories, filenames in os.walk(zoneinfo_dir): - assert absdir.startswith(disk_basedir), (absdir, disk_basedir) - zip_dir = absdir[len(disk_basedir):] - for f in filenames: - z.write(os.path.join(absdir, f), os.path.join(zip_dir, f)) - z.close() + # Sometime between pytz-2008a and pytz-2008i common_timezones started to + # include only names of zones with a corresponding data file in zoneinfo. + # pytz installs the zoneinfo directory tree in the same directory + # as the pytz/__init__.py file. These data files are loaded using + # pkg_resources.resource_stream. py2exe does not copy this to library.zip so + # resource_stream can't find the files and common_timezones is empty when + # read in the py2exe executable. + # This manually copies zoneinfo into the zip. See also + # http://code.google.com/p/googletransitdatafeed/issues/detail?id=121 + import pytz + import zipfile + # Make sure the layout of pytz hasn't changed + assert (pytz.__file__.endswith('__init__.pyc') or + pytz.__file__.endswith('__init__.py')), pytz.__file__ + zoneinfo_dir = os.path.join(os.path.dirname(pytz.__file__), 'zoneinfo') + # '..\\Lib\\pytz\\__init__.py' -> '..\\Lib' + disk_basedir = os.path.dirname(os.path.dirname(pytz.__file__)) + zipfile_path = os.path.join(py2exe_keywords['options']['py2exe']['dist_dir'], 'library.zip') + z = zipfile.ZipFile(zipfile_path, 'a') + + for absdir, directories, filenames in os.walk(zoneinfo_dir): + assert absdir.startswith(disk_basedir), (absdir, disk_basedir) + zip_dir = absdir[len(disk_basedir):] + for f in filenames: + z.write(os.path.join(absdir, f), os.path.join(zip_dir, f)) + z.close()