summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorced <>2007-06-12 06:17:48 +0000
committerced <>2007-06-12 06:17:48 +0000
commit7f7ef8f3d1d86dffc6c33faa2131c0beabc43db7 (patch)
treedb6f830b466927d2f9578c0c261b5d663c465127
parent6927720a9e5e52db16a61d9234f69c09749cb0e0 (diff)
SERVER: improve win32 installer
bzr revid: ced-ecbc91661cc1c28373db5d9769a4b36c4f23b79b
-rw-r--r--pixmaps/tinyerp-header.bmpbin0 -> 25818 bytes
-rw-r--r--pixmaps/tinyerp-intro.bmpbin0 -> 154542 bytes
-rw-r--r--pixmaps/tinyerp.ico (renamed from tinyerp-icon.ico)bin4286 -> 4286 bytes
-rw-r--r--setup_py2exe.py (renamed from setup_win32.py)2
-rw-r--r--tinyerp-server-installer.nsi (renamed from setup.nsi)6
5 files changed, 7 insertions, 1 deletions
diff --git a/pixmaps/tinyerp-header.bmp b/pixmaps/tinyerp-header.bmp
new file mode 100644
index 00000000000..c22ca74328e
--- /dev/null
+++ b/pixmaps/tinyerp-header.bmp
Binary files differ
diff --git a/pixmaps/tinyerp-intro.bmp b/pixmaps/tinyerp-intro.bmp
new file mode 100644
index 00000000000..efff657a3f5
--- /dev/null
+++ b/pixmaps/tinyerp-intro.bmp
Binary files differ
diff --git a/tinyerp-icon.ico b/pixmaps/tinyerp.ico
index cde3e961e79..cde3e961e79 100644
--- a/tinyerp-icon.ico
+++ b/pixmaps/tinyerp.ico
Binary files differ
diff --git a/setup_win32.py b/setup_py2exe.py
index 223a9dd537e..46deeb415c4 100644
--- a/setup_win32.py
+++ b/setup_py2exe.py
@@ -24,7 +24,7 @@ os.chdir('..')
setup(
name="tinyerp-server",
- console = [{"script":"bin\\tinyerp-server.py", "icon_resources":[(1,"tinyerp-icon.ico")]}],
+ console = [{"script":"bin\\tinyerp-server.py", "icon_resources":[(1,"pixmaps\\tinyerp.ico")]}],
data_files = data_files,
options = options
)
diff --git a/setup.nsi b/tinyerp-server-installer.nsi
index 756a3a191d2..ce0324003b1 100644
--- a/setup.nsi
+++ b/tinyerp-server-installer.nsi
@@ -37,6 +37,12 @@
;--------------------------------
;Pages
+ !define MUI_ICON ".\pixmaps\tinyerp.ico"
+ !define MUI_UNICON ".\pixmaps\tinyerp.ico"
+ !define MUI_WELCOMEFINISHPAGE_BITMAP ".\pixmaps\tinyerp-intro.bmp"
+ !define MUI_HEADERIMAGE
+ !define MUI_HEADERIMAGE_BITMAP ".\pixmaps\tinyerp-header.bmp"
+
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "doc\\License.rtf"
# !insertmacro MUI_PAGE_COMPONENTS