X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=setup.py;h=be9e90bb08de3d7bfcb9c5ec4dd68719ac13e196;hb=6d9fbc1cfbfd052681a1c95c29f813b8624742ef;hp=c9008920fa99d7bf509188c143dec95ba7aa944b;hpb=44b392ef0996b2cb077b02cfec5ff21ead7476af;p=odoo%2Fodoo.git

diff --git a/setup.py b/setup.py
index c900892..be9e90b 100755
--- a/setup.py
+++ b/setup.py
@@ -20,166 +20,57 @@
 #
 ##############################################################################
 
-# 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 sys
-import os
-from os.path import join, isfile, basename
-import glob
-
-from pprint import pprint as pp
-
-from setuptools import setup, find_packages
-from distutils.sysconfig import get_python_lib
-
-has_py2exe = False
-if os.name == 'nt':
-    import py2exe
-    has_py2exe = True
-
-execfile(join('openerp', '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]
+import glob, os, re, setuptools, sys
+from os.path import join, isfile
 
-# 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)
+# 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:
-            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('openerp', '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/')
-        for mname in open(join(empath, 'server_modules.list')):
-            mname = mname.strip()
-            if not mname:
-                continue
+            d[k]=[v]
+    r = d.items()
+    if os.name == 'nt':
+        r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
+    return r
 
-            terp = join(empath, mname, '__openerp__.py')
-            if not os.path.exists(terp):
-                terp = join(empath, mname, '__terp__.py')
+def gen_manifest():
+    file_list="\n".join(data())
+    open('MANIFEST','w').write(file_list)
 
-            if os.path.exists(terp):
-                yield mname, join(empath, mname)
-            else:
-                print "Module %s specified, but no valid path." % mname
-    except Exception:
-        pass
+if os.name == 'nt':
+    sys.path.append("C:\Microsoft.VC90.CRT")
 
-def data_files():
-    '''Build list of data files to be installed'''
-    files = []
+def py2exe_options():
     if os.name == 'nt':
-        os.chdir('openerp')
-        for (dp, dn, names) in os.walk('addons'):
-            files.append((dp, map(lambda x: join('openerp', dp, x), names)))
-        os.chdir('..')
-        #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('openerp', 'import_xml.rng'),]))
+        import py2exe
+        return {
+            "console" : [ { "script": "openerp-server", "icon_resources": [(1, join("install","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.dom", "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(get_python_lib(prefix=''), 'openerp')
-
-        files.append((openerp_site_packages, [join('openerp', 'import_xml.rng'),]))
-
-        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(get_python_lib(prefix=''), 'openerp','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
-
-def find_package_dirs():
-    package_dirs = {'openerp': 'openerp'}
-    for mod, path in find_addons():
-        package_dirs['openerp.addons.' + mod] = path
-    return package_dirs
-
-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",
-        ],
-        "excludes" : ["Tkconstants","Tkinter","tcl"],
-    }
-}
-
-#import pprint
-#def setup(**args):
-#  pprint.pprint(args)
-
-setup(name             = name,
+setuptools.setup(
+      name             = 'openerp',
       version          = version,
       description      = description,
       long_description = long_desc,
@@ -188,31 +79,43 @@ setup(name             = name,
       author_email     = author_email,
       classifiers      = filter(None, classifiers.split("\n")),
       license          = license,
-      data_files       = data_files(),
-      scripts          = ['openerp-server.py'],
-      packages = find_packages(),
-      include_package_data = True,
-      package_data = {
-          '': ['*.yml', '*.xml', '*.po', '*.pot', '*.csv'],
-      },
-      package_dir      = find_package_dirs(),
-      options = options,
+      scripts          = ['openerp-server'],
+      data_files       = data(),
+      packages         = setuptools.find_packages(),
+      #include_package_data = True,
       install_requires = [
-          'lxml==2.1.5', # we require the same version as caldav
+        # 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',
-          'python-dateutil',
           'psycopg2',
-          'pychart',     # if not available from pypi, an alternate site is http://home.gna.org/pychart/
           'pydot',
+          'python-dateutil < 2',
+          'python-ldap',
+          'python-openid',
           'pytz',
-          'reportlab',
-          'caldav',
-          'pyyaml',
           'pywebdav',
-          'feedparser',
+          'pyyaml',
+          'reportlab',
+          'simplejson',
+          'vatnumber',
+          'vobject',
+          'werkzeug',
+          'xlwt',
+          'zsi',
       ],
-      extras_require={
+      extras_require = {
           'SSL' : ['pyopenssl'],
-      }
+      },
+      **py2exe_options()
 )
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: