merge

bzr revid: nel@silver-20081215102444-wvd1xwbxjejai1q5

MANIFEST.in

@@ -1,3 +1,6 @@
+include README
 recursive-include doc *
 recursive-include man *
-recursive-include bin *xml *xsl *sql *rml *sxw *csv
+recursive-include bin *xml *xsl *sql *rml *sxw *csv *rng
+graft bin/addons/
+global-exclude *pyc *~

bin/netsvc.py

@@ -263,7 +263,6 @@ class xmlrpc(object):
 
 class GenericXMLRPCRequestHandler:
     def _dispatch(self, method, params):
-        #print 'TERP-CALL : ',method, params
         import traceback
         try:
             n = self.path.split("/")[-1]
@@ -398,8 +397,6 @@ class TinySocketClientThread(threading.Thread):
                 ts.mysend(r)
             except Exception, e:
                 tb_s = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
-                print e
-                print tb_s
                 import tools
                 if tools.config['debug_mode']:
                     import pdb

bin/release.py

@@ -22,8 +22,8 @@
 ##############################################################################
 
 name = 'openerp-server'
-version = '5.0.0-rc1'
-major_version = version.rsplit('.', 1)[0]
+version = '5.0.0_rc1'
+major_version = '5.0'
 description = 'OpenERP Server'
 long_desc = '''\
 OpenERP is a complete ERP and CRM. The main features are accounting (analytic

doc/README.pychart

@@ -1,68 +0,0 @@
-* What is this package?
-
-PyChart is a Python library for creating professional quality PS, PDF,
-PNG, or SVG charts.  It supports line plots, bar plots, range-fill
-plots, and pie charts.  Because it is based on Python, you can make
-the full use of Python's scripting power.
-
-The PyChart home page is at 
-http://www.hpl.hp.com/personal/Yasushi_Saito/pychart
-
-* What you need
-
-You need Python (http://www.python.org) version 2.2 or later (on
-Debian GNU/Linux, you need, python-xml package as well). You also need
-Ghostscript (http://www.cs.wisc.edu/~ghost/) to produce PNG
-files. 
-
-	Pychart used to require Ghostscript during PS and PDF
-	generation to obtain font metric information, but that's no
-	longer the case.
-
-* Platforms supported
-
-In theory, PyChart works on any platform with Python.  In practice,
-I've run PyChart on Linux and Win2000.
-
-* Installation
-
-Become a root and do:
-
-	# python setup.py install
-
-Or, you can set PYTHONPATH environment variable before you start
-Python. For example (in bash):
-
-% PYTHONPATH=~/PyChart-1.33/pychart python mumbo.py
-
-* Documentation
-
-A detailed documentation is found in doc/pychart.
-
-* Examples
-
-All the *.py files in the demos/ directory can be run directly. For
-example,
-
-    setenv PYTHONPATH ..
-    python linetest.py >foo.eps
-    gs foo.eps
-
-or
-
-    setenv PYTHONPATH ..
-    setenv PYCHART_OPTIONS="format=pdf"
-    python linetest.py >foo.pdf
-    acroread foo.pdf
-
-* About the author
-
-Yasushi Saito (ysaito@hpl.hp.com), a full-time researcher and
-part-time hacker. This program is created mainly to serve my personal
-needs to write pretty charts for research papers. As such, it is
-updated only when I'm writing a paper, which happens about once every
-half year or so.
-
-Anyway, if you have comments, requests, or (even better)
-fixes/enhancements, feel free to email me.
-

setup.py

@@ -36,10 +36,6 @@ from stat import ST_MODE
 
 from distutils.core import setup, Command
 from distutils.command.install import install
-from distutils.command.build import build
-from distutils.command.build_scripts import build_scripts
-from distutils.command.install_scripts import install_scripts
-from distutils.file_util import copy_file
 
 if os.name == 'nt':
     import py2exe
@@ -91,7 +87,6 @@ def data_files():
         os.chdir('..')
         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'))]))
     else:
         man_directory = opj('share', 'man')
         files.append((opj(man_directory, 'man1'), ['man/openerp-server.1']))
@@ -104,12 +99,9 @@ def data_files():
 
         openerp_site_packages = opj('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server')
 
-        files.append((openerp_site_packages, [('bin/import_xml.rng')]))
-
         for addon in find_addons():
             add_path = addon.replace('.', os.path.sep).replace('openerp-server', 'bin', 1)
             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)
@@ -121,7 +113,7 @@ def data_files():
 check_modules()
 
 f = file('openerp-server','w')
-start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage" """
+start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage\n" """
 f.write(start_script)
 f.close()
 
@@ -177,13 +169,7 @@ setup(name             = name,
                           'openerp-server.workflow'] + \
                          list(find_addons()),
       package_dir      = {'openerp-server': 'bin'},
-      console = [ 
-          { "script" : "bin\\openerp-server.py", 
-            "icon_resources" : [
-                (1,"pixmaps\\openerp-icon.ico")
-            ]
-          }
-      ],
+      console = [ { "script" : "bin\\openerp-server.py", "icon_resources" : [ (1,"pixmaps\\openerp-icon.ico") ] } ],
       options = options,
       )