[MERGE] merged trunk.

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 40695bd..10c98d7 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -38,23 +38,28 @@ def data():
         else:
             d[k]=[v]
     r = d.items()
+    if os.name == 'nt':
+        r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
     return r
 
 def gen_manifest():
     file_list="\n".join(data())
     open('MANIFEST','w').write(file_list)
 
+if os.name == 'nt':
+    sys.path.append("C:\Microsoft.VC90.CRT")
+
 def py2exe_options():
     if os.name == 'nt':
         import py2exe
         return {
-            "console" : [ { "script": "openerp-server", "icon_resources": [(1, join("pixmaps","openerp-icon.ico"))], }],
+            "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", "xml.dom", "xml.xpath", "yaml", ],
+                    "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"],
                 }
             }
@@ -92,7 +97,7 @@ setuptools.setup(
           'mako',
           'psycopg2',
           'pydot',
-          'python-dateutil',
+          'python-dateutil < 2',
           'python-ldap',
           'python-openid',
           'pytz',