Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/6.1-opw-573086-xal into lp:openobject-server/6.1

  1. 6.1-opw-573086-xal
  2. Merge into 6.1
Proposed by Xavier ALT
Status: Merged
Merged at revision: 4158
Proposed branch: lp:~openerp-dev/openobject-server/6.1-opw-573086-xal
Merge into: lp:openobject-server/6.1
Diff against target: 30 lines (+9/-1)
1 file modified
win32/setup.py (+9/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.1-opw-573086-xal
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+103640@code.launchpad.net

Description of the change

Hi,

VS2008 runtime is not packaged under "service" directory this prevent OpenERP-server service to start after installation if system doesn't have VS2008 runtime installed (like WinXP SP3 - which only have VS2003 by default).

Regards,
Xavier

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'win32/setup.py'
2--- win32/setup.py 2011-12-21 17:38:33 +0000
3+++ win32/setup.py 2012-04-26 09:39:30 +0000
4@@ -19,9 +19,16 @@
5 #
6 ##############################################################################
7
8+import os
9+import glob
10 from distutils.core import setup
11 import py2exe
12
13+def datas():
14+ r = []
15+ if os.name == 'nt':
16+ r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
17+ return r
18
19 setup(service=["OpenERPServerService"],
20 options={"py2exe":{"excludes":["Tkconstants","Tkinter","tcl",
21@@ -29,7 +36,8 @@
22 "ImageTk", "PIL.ImageTk",
23 "FixTk"],
24 "skip_archive": 1,
25- "optimize": 2,}}
26+ "optimize": 2,}},
27+ data_files=datas(),
28 )
29
30 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: