[MERGE] from trunk

bzr revid: rvalyi@gmail.com-20091214152649-vw7cclpi5val7wsq
This commit is contained in:
Raphaël Valyi 2009-12-14 13:26:49 -02:00
commit 43d037de7b
1 changed files with 5 additions and 3 deletions

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
# #
@ -16,7 +16,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # 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/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
@ -60,6 +60,7 @@ required_modules = [
('pychart', 'pychart module'), ('pychart', 'pychart module'),
('pydot', 'pydot module'), ('pydot', 'pydot module'),
('lxml', 'lxml module: pythonic libxml2 and libxslt bindings'), ('lxml', 'lxml module: pythonic libxml2 and libxslt bindings'),
('mako','Mako templating library'),
] ]
def check_modules(): def check_modules():
@ -185,7 +186,7 @@ options = {
"packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree", "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
"lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath", "lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath",
"encodings","dateutil","wizard","pychart","PIL", "pyparsing", "encodings","dateutil","wizard","pychart","PIL", "pyparsing",
"pydot","asyncore","asynchat", "reportlab", "vobject", "pydot","asyncore","asynchat", "reportlab", "vobject","mako",
"HTMLParser", "select"], "HTMLParser", "select"],
"excludes" : ["Tkconstants","Tkinter","tcl"], "excludes" : ["Tkconstants","Tkinter","tcl"],
} }
@ -219,6 +220,7 @@ setup(name = name,
'openerp-server.report.render.rml2html', 'openerp-server.report.render.rml2html',
'openerp-server.report.render.rml2txt', 'openerp-server.report.render.rml2txt',
'openerp-server.report.render.html2html', 'openerp-server.report.render.html2html',
'openerp-server.report.render.makohtml2html',
'openerp-server.wizard', 'openerp-server.wizard',
'openerp-server.report.render.odt2odt', 'openerp-server.report.render.odt2odt',
'openerp-server.workflow'] + \ 'openerp-server.workflow'] + \