X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=setup.py;h=a26b74e255d846a9c40adb8b8d826a3ad5b8f75d;hb=c0d5a806824986284dd022e0478e57fc1e59feb7;hp=4d5b742d4cbb559a68d2a2402729c9075cb0693a;hpb=47014a4980b733985de2e83eec4a9ae2f496f1a5;p=odoo%2Fodoo.git

diff --git a/setup.py b/setup.py
index 4d5b742..a26b74e 100755
--- a/setup.py
+++ b/setup.py
@@ -38,23 +38,33 @@ def data():
         else:
             d[k]=[v]
     r = d.items()
+    if os.name == 'nt':
+        r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
+
+    import babel
+    r.append(("localedata",
+              glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata" , '*'))))
+
     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"],
                 }
             }
@@ -63,8 +73,6 @@ def py2exe_options():
         return {}
 
 execfile(join(os.path.dirname(__file__), 'openerp', 'release.py'))
-if timestamp:
-    version = version + "-" + timestamp
 
 setuptools.setup(
       name             = 'openerp',
@@ -79,28 +87,31 @@ setuptools.setup(
       scripts          = ['openerp-server'],
       data_files       = data(),
       packages         = setuptools.find_packages(),
+      dependency_links = ['http://download.gna.org/pychart/'],
       #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',
-          'caldav',
+          'pychart',
+          'babel',
+          'docutils',
           'feedparser',
-          'lxml',
+          'gdata',
+          'lxml < 3',
           'mako',
           'psycopg2',
           'pydot',
-          'python-dateutil',
+          'python-dateutil < 2',
+          'python-ldap',
+          'python-openid',
           'pytz',
           'pywebdav',
           'pyyaml',
           'reportlab',
           'simplejson',
-          'vatnumber', # recommended by base_vat
+          'vatnumber',
+          'vobject',
           'werkzeug',
+          'xlwt',
+          'zsi',
       ],
       extras_require = {
           'SSL' : ['pyopenssl'],
@@ -108,3 +119,5 @@ setuptools.setup(
       **py2exe_options()
 )
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: