[FIX] packaging: some changes for windows packaging.

bzr revid: vmt@openerp.com-20111219144437-mq6t8xj4ush2bxn8

4 files changed, 10 insertions, 5 deletions

diff --git a/install/openerp-intro.bmp b/install/openerp-intro.bmp
new file mode 100644
index 00000000000..8d3c9340c9b
--- /dev/null
+++ b/install/openerp-intro.bmp
diff --git a/install/openerp-slogan.bmp b/install/openerp-slogan.bmp
new file mode 100644
index 00000000000..a3cffd104f2
--- /dev/null
+++ b/install/openerp-slogan.bmp
diff --git a/setup.nsi b/setup.nsi
index 0ea37b0f9e6..532d7e4da55 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -104,12 +104,12 @@ Var MUI_TEMP
 Var STARTMENU_FOLDER

 

 !define MUI_ABORTWARNING

-!define MUI_ICON ".\pixmaps\openerp-icon.ico"

+!define MUI_ICON ".\install\openerp-icon.ico"

 

-!define MUI_WELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"

-!define MUI_UNWELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"

+!define MUI_WELCOMEFINISHPAGE_BITMAP ".\install\openerp-intro.bmp"

+!define MUI_UNWELCOMEFINISHPAGE_BITMAP ".\install\openerp-intro.bmp"

 !define MUI_HEADERIMAGE

-!define MUI_HEADERIMAGE_BITMAP ".\pixmaps\openerp-slogan.bmp"

+!define MUI_HEADERIMAGE_BITMAP ".\install\openerp-slogan.bmp"

 !define MUI_HEADERIMAGE_BITMAP_NOSTRETCH

 !define MUI_HEADER_TRANSPARENT_TEXT ""

 

diff --git a/setup.py b/setup.py
index ac02cf43e72..10c98d726f1 100755
--- a/setup.py
+++ b/setup.py
@@ -38,12 +38,17 @@ def data():
         else:
             d[k]=[v]
     r = d.items()
+    if os.name == 'nt':
+        r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
     return r
 
 def gen_manifest():
     file_list="\n".join(data())
     open('MANIFEST','w').write(file_list)
 
+if os.name == 'nt':
+    sys.path.append("C:\Microsoft.VC90.CRT")
+
 def py2exe_options():
     if os.name == 'nt':
         import py2exe
@@ -54,7 +59,7 @@ def py2exe_options():
                     "skip_archive": 1,
                     "optimize": 2,
                     "dist_dir": 'dist',
-                    "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "xml.xpath", "yaml", ],
+                    "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
                     "excludes" : ["Tkconstants","Tkinter","tcl"],
                 }
             }