[MERGE] packaging part1 tgz

bzr revid: al@openerp.com-20111001173741-otvj0oqmsd77kag7

1 files changed, 36 insertions, 43 deletions

diff --git a/setup.py b/setup.py
index 9595c1a9257..b42c99795b6 100755
--- a/setup.py
+++ b/setup.py
@@ -23,33 +23,6 @@
 import glob, os, re, setuptools, sys
 from os.path import join, isfile
 
-execfile(join('openerp', 'release.py'))
-
-py2exe_keywords = {}
-if os.name == 'nt':
-    import py2exe
-    py2exe_keywords['console'] = [
-        { "script": "openerp-server",
-          "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))],
-        }]
-    py2exe_keywords['options'] = {
-        "py2exe": {
-            "skip_archive": 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", "pychart", "PIL", "pyparsing",
-                "pydot", "asyncore","asynchat", "reportlab", "vobject",
-                "HTMLParser", "select", "mako", "poplib",
-                "imaplib", "smtplib", "email", "yaml", "DAV",
-                "uuid", "commands", "openerp", "simplejson", "vatnumber"
-            ],
-            "excludes" : ["Tkconstants","Tkinter","tcl"],
-        }
-    }
-
 # List all data files
 def data():
     files = []
@@ -71,8 +44,30 @@ def gen_manifest():
     file_list="\n".join(data())
     open('MANIFEST','w').write(file_list)
 
+def py2exe_options():
+    if os.name == 'nt':
+        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:
+        return {}
+
+execfile(join(os.path.dirname(__file__), 'openerp', 'release.py'))
+if timestamp:
+    version = version + "-" + timestamp
+
 setuptools.setup(
-      name             = name,
+      name             = 'openerp',
       version          = version,
       description      = description,
       long_description = long_desc,
@@ -86,31 +81,29 @@ setuptools.setup(
       packages         = setuptools.find_packages(),
       #include_package_data = True,
       install_requires = [
-       # We require the same version as caldav for lxml.
-          'lxml==2.1.5',
-          'mako',
-          'python-dateutil',
-          'psycopg2',
         # 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/
-          'pychart',
+        # our tree.) http://download.gna.org/pychart/
+        # TODO  'pychart',
+          'feedparser',
+          'lxml',
+          'mako',
+          'psycopg2',
           'pydot',
+          'python-dateutil',
           'pytz',
-          'reportlab',
-          'caldav',
-          'pyyaml',
           'pywebdav',
-          'feedparser',
-          'simplejson >= 2.0',
-          'vatnumber', # required by base_vat module
+          'pyyaml',
+          'reportlab',
+          'simplejson',
+          'vatnumber', # recommended by base_vat
+          'werkzeug',
       ],
       extras_require = {
           'SSL' : ['pyopenssl'],
       },
-      **py2exe_keywords
+      **py2exe_options()
 )