[IMP] english improvement for modules where strings were wrong

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 5881b5f..bac7200 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,23 +1,22 @@
 #!/usr/bin/env python
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
-#
+#    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
 
@@ -35,8 +34,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 +45,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]
@@ -131,6 +132,11 @@ def data_files():
                                               opj('bin', 'server.pkey'),
                                               opj('bin', 'server.cert')]))
 
+        if sys.version_info[0:2] == (2,5):
+            files.append((openerp_site_packages, [ opj('python25-compat','BaseHTTPServer.py'),
+                                                   opj('python25-compat','SimpleXMLRPCServer.py'),
+                                                   opj('python25-compat','SocketServer.py')]))
+
         for (addonname, add_path) in find_addons():
             addon_path = opj('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server','addons', addonname)
             pathfiles = []
@@ -174,6 +180,7 @@ options = {
     "py2exe": {
         "compressed": 1,
         "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",
@@ -220,7 +227,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()