[REF] Account : Invoice view(mainor edit)

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 439d6df..47ea152 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution  
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -35,8 +35,10 @@ import glob
 from distutils.core import setup, Command
 from distutils.command.install import install
 
+has_py2exe = False
 if os.name == 'nt':
     import py2exe
+    has_py2exe = True
 
 sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), "bin"))
 
@@ -44,8 +46,8 @@ opj = os.path.join
 
 execfile(opj('bin', 'release.py'))
 
-if sys.argv[1] != 'bdist_rpm':
-    version = version + '-' + release
+if sys.argv[1] == 'bdist_rpm':
+    version = version.split('-')[0]
 
 # get python short version
 py_short_version = '%s.%s' % sys.version_info[:2]
@@ -89,7 +91,7 @@ def data_files():
         for (dp,dn,names) in os.walk('doc'):
             files.append((dp, map(lambda x: opj(dp, x), names)))
         files.append(('.', [opj('bin', 'import_xml.rng'),
-                            opj('bin', 'server.pkey'), 
+                            opj('bin', 'server.pkey'),
                             opj('bin', 'server.cert')]))
     else:
         man_directory = opj('share', 'man')
@@ -113,7 +115,7 @@ def data_files():
             addon_path = opj('lib', 'python%s' % py_short_version, 'site-packages', add_path.replace('bin', 'openerp-server', 1))
             pathfiles = []
             for root, dirs, innerfiles in os.walk(add_path):
-                innerfiles = filter(lambda file: os.path.splitext(file)[1] not in ('.pyc', '.py', '.pyd', '.pyo'), innerfiles)
+                innerfiles = filter(lambda file: os.path.splitext(file)[1] not in ('.pyc', '.pyd', '.pyo'), innerfiles)
                 if innerfiles:
                     res = os.path.normpath(opj(addon_path, root.replace(opj('bin','addons', addonname), '.')))
                     pathfiles.extend(((res, map(lambda file: opj(root, file), innerfiles)),))
@@ -141,10 +143,11 @@ class openerp_server_install(install):
 options = {
     "py2exe": {
         "compressed": 1,
-        "optimize": 2, 
-        "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree", 
-                     "lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath", 
-                     "encodings","mx.DateTime","wizard","pychart","PIL", "pyparsing", 
+        "optimize": 2,
+        "dist_dir": 'dist',
+        "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
+                     "lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath",
+                     "encodings","mx.DateTime","wizard","pychart","PIL", "pyparsing",
                      "pydot","asyncore","asynchat", "reportlab", "vobject",
                      "HTMLParser", "select"],
         "excludes" : ["Tkconstants","Tkinter","tcl"],
@@ -161,22 +164,25 @@ setup(name             = name,
       classifiers      = filter(None, classifiers.split("\n")),
       license          = license,
       data_files       = data_files(),
-      cmdclass         = { 
+      cmdclass         = {
             'install' : openerp_server_install,
       },
       scripts          = ['openerp-server'],
-      packages         = ['openerp-server', 
+      packages         = ['openerp-server',
                           'openerp-server.addons',
                           'openerp-server.ir',
                           'openerp-server.osv',
-                          'openerp-server.service', 
+                          'openerp-server.service',
                           'openerp-server.tools',
                           'openerp-server.report',
                           'openerp-server.report.printscreen',
+                          'openerp-server.report.pyPdf',
                           'openerp-server.report.render',
                           'openerp-server.report.render.rml2pdf',
                           'openerp-server.report.render.rml2html',
-                          'openerp-server.wizard', 
+                          'openerp-server.wizard',
+                          'openerp-server.report.render.odt2odt',
+                          'openerp-server.report.render.html2html',
                           'openerp-server.workflow'] + \
                          list(find_addons()),
       package_dir      = {'openerp-server': 'bin'},
@@ -184,6 +190,30 @@ setup(name             = name,
       options = options,
       )
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+if has_py2exe:
+  # Sometime between pytz-2008a and pytz-2008i common_timezones started to
+  # include only names of zones with a corresponding data file in zoneinfo.
+  # pytz installs the zoneinfo directory tree in the same directory
+  # as the pytz/__init__.py file. These data files are loaded using
+  # pkg_resources.resource_stream. py2exe does not copy this to library.zip so
+  # resource_stream can't find the files and common_timezones is empty when
+  # read in the py2exe executable.
+  # This manually copies zoneinfo into the zip. See also
+  # http://code.google.com/p/googletransitdatafeed/issues/detail?id=121
+  import pytz
+  import zipfile
+  # Make sure the layout of pytz hasn't changed
+  assert (pytz.__file__.endswith('__init__.pyc') or
+          pytz.__file__.endswith('__init__.py')), pytz.__file__
+  zoneinfo_dir = os.path.join(os.path.dirname(pytz.__file__), 'zoneinfo')
+  # '..\\Lib\\pytz\\__init__.py' -> '..\\Lib'
+  disk_basedir = os.path.dirname(os.path.dirname(pytz.__file__))
+  zipfile_path = os.path.join(options['py2exe']['dist_dir'], 'library.zip')
+  z = zipfile.ZipFile(zipfile_path, 'a')
+  for absdir, directories, filenames in os.walk(zoneinfo_dir):
+    assert absdir.startswith(disk_basedir), (absdir, disk_basedir)
+    zip_dir = absdir[len(disk_basedir):]
+    for f in filenames:
+      z.write(os.path.join(absdir, f), os.path.join(zip_dir, f))
+  z.close()