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

[Xavier ALT]

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

=== modified file 'win32/setup.py'
--- win32/setup.py	2011-12-21 17:38:33 +0000
+++ win32/setup.py	2012-04-26 09:39:30 +0000
@@ -19,9 +19,16 @@
 #
 ##############################################################################
 
+import os
+import glob
 from distutils.core import setup
 import py2exe
 
+def datas():
+    r = []
+    if os.name == 'nt':
+        r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
+    return r
 
 setup(service=["OpenERPServerService"],
       options={"py2exe":{"excludes":["Tkconstants","Tkinter","tcl",
@@ -29,7 +36,8 @@
                                      "ImageTk", "PIL.ImageTk",
                                      "FixTk"],
                          "skip_archive": 1,
-                         "optimize": 2,}}
+                         "optimize": 2,}},
+      data_files=datas(),
       )
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: