[MERGE] forward port of branch 7.0 up to revid 5270 chs@openerp.com-20140403084524...

[odoo/odoo.git] / win32 / setup.py

diff --git a/win32/setup.py b/win32/setup.py
index 0d8f504..b0b36b5 100644 (file)
--- a/win32/setup.py
+++ b/win32/setup.py
@@ -19,10 +19,12 @@
 #
 ##############################################################################
 
-from distutils.core import setup
 import os
+import glob
+from distutils.core import setup
 import py2exe
 
+
 meta = {}
 execfile(os.path.join(os.path.dirname(__file__), '..', 'openerp', 'release.py'), meta)
 
@@ -33,18 +35,20 @@ def generate_files():
     }
 
     files = []
+    if os.name == 'nt':
+        files.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
     for action, steps in actions.items():
         fname = action + '.bat'
         files.append(fname)
         with open(fname, 'w') as fp:
-            fp.write('@PATH=%WINDIR%\system32;%WINDIR%;%WINDIR%\System32\Wbem;.')
+            fp.write('@PATH=%WINDIR%\system32;%WINDIR%;%WINDIR%\System32\Wbem;.\n')
             for step in steps:
-                fp.write('@net %s %s' % (step, meta['nt_service_name']))
+                fp.write('@net %s %s\n' % (step, meta['nt_service_name']))
 
     files.append('meta.py')
     with open('meta.py', 'w') as fp:
         for m in 'description serie nt_service_name'.split():
-            fp.write("%s = %r" % (m, meta[m],))
+            fp.write("%s = %r\n" % (m, meta[m],))
 
     return files
 
@@ -61,7 +65,7 @@ setup(service      = ["OpenERPServerService"],
                         "excludes": excludes,
                         "skip_archive": 1,
                         "optimize": 2,
-                     }}
+                     }},
       )
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: