From b027ff80a6a09a77e8369d403f11975b30ae02a0 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Thu, 13 May 2010 11:50:42 +0530 Subject: =?UTF-8?q?[FIX]=C2=A0setup.py:=C2=A0add=C2=A0the=C2=A0missing?= =?UTF-8?q?=C2=A0librairies=C2=A0for=C2=A0the=C2=A0windows=C2=A0packaging?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: jvo@tinyerp.com-20100513062042-wqvv4syxyzcg3nri --- setup.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2e004e713df..23b8babcec1 100755 --- a/setup.py +++ b/setup.py @@ -176,11 +176,14 @@ options = { "compressed": 1, "optimize": 2, "dist_dir": 'dist', - "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree", - "lxml.objectify", "decimal", "xml", "encodings", - "dateutil", "wizard", "pychart", "PIL", "pyparsing", - "pydot", "asyncore","asynchat", "reportlab", "vobject", - "HTMLParser", "select", "yaml"], + "packages": [ + "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree", + "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath", + "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing", + "pydot", "asyncore","asynchat", "reportlab", "vobject", + "HTMLParser", "select", "libxslt", "libxml2", "mako", "poplib", + "imaplib", "smtplib", "email", "yaml", + ], "excludes" : ["Tkconstants","Tkinter","tcl"], } } -- cgit v1.2.3 From d2ad2f4355965fc2bd38e9f75d2e62f38329d1bf Mon Sep 17 00:00:00 2001 From: "Anup (OpenERP)" Date: Thu, 13 May 2010 14:49:40 +0530 Subject: [FIX] Remove the libxml2 and libxslt dependencies for the packaging bzr revid: ach@tinyerp.com-20100513091940-kqftafi3slai91m9 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 23b8babcec1..9bb569ea7a1 100755 --- a/setup.py +++ b/setup.py @@ -181,7 +181,7 @@ options = { "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath", "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing", "pydot", "asyncore","asynchat", "reportlab", "vobject", - "HTMLParser", "select", "libxslt", "libxml2", "mako", "poplib", + "HTMLParser", "select", "mako", "poplib", "imaplib", "smtplib", "email", "yaml", ], "excludes" : ["Tkconstants","Tkinter","tcl"], -- cgit v1.2.3 From 97f5d3a781377ecb24ac7cbc4102ea61b8429558 Mon Sep 17 00:00:00 2001 From: "Anup (OpenERP)" Date: Thu, 13 May 2010 15:37:58 +0530 Subject: [FIX] In the case we want to generate the RPM package, we change the version bzr revid: ach@tinyerp.com-20100513100758-ev8l513snmgntk4a --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9bb569ea7a1..41f517f1689 100755 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ sys.path.append(join(os.path.abspath(os.path.dirname(__file__)), "bin")) execfile(join('bin', 'release.py')) -if sys.argv[1] == 'bdist_rpm': +if 'bdist_rpm' in sys.argv: version = version.split('-')[0] # get python short version -- cgit v1.2.3