X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=setup.py;h=374f7308ca84427002c8fc5393e3d62eda071dc9;hb=7ef2b87d40b1d0c4f58777297e404c7dfba99e6f;hp=cb51961ed3c8eeefd9da47b004742867f376f59c;hpb=67277f6f3dd5978501a2343e73e145adcdc5a5aa;p=odoo%2Fodoo.git

diff --git a/setup.py b/setup.py
index cb51961..374f7308 100755
--- a/setup.py
+++ b/setup.py
@@ -20,176 +20,52 @@
 #
 ##############################################################################
 
-# setup from TinERP
-#   taken from straw http://www.nongnu.org/straw/index.html
-#   taken from gnomolicious http://www.nongnu.org/gnomolicious/
-#   adapted by Nicolas Évrard <nicoe@altern.org>
-#
-
-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
-
-has_py2exe = False
-if os.name == 'nt':
-    import py2exe
-    has_py2exe = True
-
-sys.path.append(join(os.path.abspath(os.path.dirname(__file__)), "bin"))
-
-execfile(join('bin', 'release.py'))
-
-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'),
-    ('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'),
-    ('pywebdav', 'PyWebDAV is a standards compliant WebDAV server and library written in Python'),
-]
-
-def check_modules():
-    errors = []
-    for modname, desc in required_modules:
-        try:
-            imp.find_module(modname)
-        except ImportError:
-            errors.append(
-                'Error: python module %s (%s) is required' % (modname, desc))
-
-    if errors:
-        print '\n'.join(errors)
-        sys.exit(1)
-
-def find_addons():
-    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')):
-            mname = mname.strip()
-            if not mname:
-                continue
-
-            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:
-        pass
+import glob, os, re, setuptools, sys
+from os.path import join, isfile
 
-def data_files():
-    '''Build list of data files to be installed'''
+# List all data files
+def data():
     files = []
+    for root, dirnames, filenames in os.walk('openerp'):
+        for filename in filenames:
+            if not re.match(r'.*(\.pyc|\.pyo|\~)$',filename):
+                files.append(os.path.join(root, filename))
+    d = {}
+    for v in files:
+        k=os.path.dirname(v)
+        if k in d:
+            d[k].append(v)
+        else:
+            d[k]=[v]
+    r = d.items()
+    return r
+
+def gen_manifest():
+    file_list="\n".join(data())
+    open('MANIFEST','w').write(file_list)
+
+def py2exe_options():
     if os.name == 'nt':
-        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')]))
+        import py2exe
+        return {
+            "console" : [ { "script": "openerp-server", "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))], }],
+            'options' : {
+                "py2exe": {
+                    "skip_archive": 1,
+                    "optimize": 2,
+                    "dist_dir": 'dist',
+                    "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber" "vobject", "xml", "xml", "xml.dom", "xml.xpath", "yaml", ],
+                    "excludes" : ["Tkconstants","Tkinter","tcl"],
+                }
+            }
+        }
     else:
-        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']))
+        return {}
 
-        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/*'))))
+execfile(join(os.path.dirname(__file__), 'openerp', 'release.py'))
 
-        openerp_site_packages = join('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server')
-
-        files.append((openerp_site_packages, [join('bin', 'import_xml.rng'),
-                                              join('bin', 'server.pkey'),
-                                              join('bin', 'server.cert')]))
-
-        if sys.version_info[0:2] == (2,5):
-            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 = join('lib', 'python%s' % py_short_version, 'site-packages', '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(join(addon_path, root.replace(join(add_path), '.')))
-                    files.extend(((res, map(lambda fil: join(root, fil),
-                                            innerfiles)),))
-
-    return files
-
-if not os.getenv('NO_CHECK_MODULES') :
-    check_modules()
-
-f = file('openerp-server','w')
-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():
-    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"\
-            % (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", "xml.dom", "xml.xpath",
-                 "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing",
-                 "pydot", "asyncore","asynchat", "reportlab", "vobject",
-                 "HTMLParser", "select", "mako", "poplib",
-                 "imaplib", "smtplib", "email", "yaml","pywebdav",
-                 ],
-        "excludes" : ["Tkconstants","Tkinter","tcl"],
-    }
-}
-
-setup(name             = name,
+setuptools.setup(
+      name             = 'openerp',
       version          = version,
       description      = description,
       long_description = long_desc,
@@ -198,64 +74,40 @@ setup(name             = name,
       author_email     = author_email,
       classifiers      = filter(None, classifiers.split("\n")),
       license          = license,
-      data_files       = data_files(),
-      cmdclass         = {
-            'install' : openerp_server_install,
-      },
       scripts          = ['openerp-server'],
-      packages         = ['openerp-server',
-                          'openerp-server.addons',
-                          'openerp-server.ir',
-                          'openerp-server.osv',
-                          'openerp-server.pychart',
-                          'openerp-server.pychart.afm',
-                          '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'] + \
-                          [('openerp-server.addons.' + name)
-                           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"))]
-                  }],
-      options = options,
-      )
-
-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 = join(os.path.dirname(pytz.__file__), 'zoneinfo')
-  # '..\\Lib\\pytz\\__init__.py' -> '..\\Lib'
-  disk_basedir = os.path.dirname(os.path.dirname(pytz.__file__))
-  zipfile_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(join(absdir, f), join(zip_dir, f))
-  z.close()
+      data_files       = data(),
+      packages         = setuptools.find_packages(),
+      #include_package_data = True,
+      install_requires = [
+        # TODO the pychart package we include in openerp corresponds to PyChart 1.37.
+        # It seems there is a single difference, which is a spurious print in generate_docs.py.
+        # It is probably safe to move to PyChart 1.39 (the latest one).
+        # (Let setup.py choose the latest one, and we should check we can remove pychart from
+        # our tree.) http://download.gna.org/pychart/
+        # TODO  'pychart',
+          'babel',
+          'feedparser',
+          'gdata',
+          'lxml',
+          'mako',
+          'psycopg2',
+          'pydot',
+          'python-dateutil',
+          'python-ldap',
+          'python-openid',
+          'pytz',
+          'pywebdav',
+          'pyyaml',
+          'reportlab',
+          'simplejson',
+          'vatnumber',
+          'vobject',
+          'werkzeug',
+          'zsi',
+      ],
+      extras_require = {
+          'SSL' : ['pyopenssl'],
+      },
+      **py2exe_options()
+)