X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=setup.py;h=00bfa571d2c6b07f26f8154c7f6f31918ab4435b;hb=e6249680c1af650e80a2951a0713835cb9884aa7;hp=e4e6001d3023c5c16f7b9b8a99fb4f950c3848e5;hpb=7e1a76cdd846a8c455d402fcd76d8baa58a9b2f8;p=odoo%2Fodoo.git

diff --git a/setup.py b/setup.py
index e4e6001..00bfa57 100755
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,15 @@ def data():
         r["Microsoft.VC90.CRT"] = glob.glob('C:\Microsoft.VC90.CRT\*.*')
 
         import babel
-        r["localedata"] = glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata", '*'))
+        # Add data, but also some .py files py2exe won't include automatically.
+        # TODO This should probably go under `packages`, instead of `data`,
+        # but this will work fine (especially since we don't use the ZIP file
+        # approach).
+        r["babel/localedata"] = glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata", '*'))
+        others = ['global.dat', 'numbers.py', 'support.py']
+        r["babel"] = map(lambda f: os.path.join(os.path.dirname(babel.__file__), f), others)
+        others = ['frontend.py', 'mofile.py']
+        r["babel/messages"] = map(lambda f: os.path.join(os.path.dirname(babel.__file__), "messages", f), others)
 
         import pytz
         tzdir = os.path.dirname(pytz.__file__)
@@ -66,7 +74,7 @@ def py2exe_options():
             'options' : {
                 "py2exe": {
                     "skip_archive": 1,
-                    "optimize": 2,
+                    "optimize": 0, # keep the assert running, because the integrated tests rely on them.
                     "dist_dir": 'dist',
                     "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "docutils", "email", "encodings", "imaplib", "jinja2", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "pytz", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
                     "excludes" : ["Tkconstants","Tkinter","tcl"],
@@ -118,8 +126,9 @@ setuptools.setup(
           'mock',
           'PIL', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
           'psutil', # windows binary code.google.com/p/psutil/downloads/list
-          'psycopg2',
+          'psycopg2 >= 2.2',
           'pydot',
+          'pyparsing < 2',
           'python-dateutil < 2',
           'python-ldap', # optional
           'python-openid',