From: phasefx Date: Tue, 19 Apr 2011 14:37:24 +0000 (+0000) Subject: More Installer Fun X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=92c0824aba26da1eb1f8b082eeb985982bbfc5ae;p=evergreen%2Fbjwebb.git More Installer Fun Define an Install Tag, defaulting to the product tag. This will be used in the install location and registry setting for where we installed to. Different install tags will mean different installs, so Trunk won't (by default) install over 2.1 (for example) Plus, include riggings for Mike Peter's new install images. Author: Thomas Berezansky Signed-off-by: Thomas Berezansky Signed-off-by: Jason Etheridge git-svn-id: svn://svn.open-ils.org/ILS/trunk@20199 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/xul/staff_client/custom_images/Beta Header.png b/Open-ILS/xul/staff_client/custom_images/Beta Header.png new file mode 100644 index 000000000..c37427df2 Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/Beta Header.png differ diff --git a/Open-ILS/xul/staff_client/custom_images/Beta Wizard - Install.png b/Open-ILS/xul/staff_client/custom_images/Beta Wizard - Install.png new file mode 100644 index 000000000..ac3840170 Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/Beta Wizard - Install.png differ diff --git a/Open-ILS/xul/staff_client/custom_images/Beta Wizard - Uninstall.png b/Open-ILS/xul/staff_client/custom_images/Beta Wizard - Uninstall.png new file mode 100644 index 000000000..a6277e886 Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/Beta Wizard - Uninstall.png differ diff --git a/Open-ILS/xul/staff_client/custom_images/DCO b/Open-ILS/xul/staff_client/custom_images/DCO new file mode 100644 index 000000000..67e70e6f5 --- /dev/null +++ b/Open-ILS/xul/staff_client/custom_images/DCO @@ -0,0 +1,27 @@ +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. + +Signed-off-by: Michael Peters \ No newline at end of file diff --git a/Open-ILS/xul/staff_client/custom_images/Header.png b/Open-ILS/xul/staff_client/custom_images/Header.png new file mode 100644 index 000000000..2b53de17d Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/Header.png differ diff --git a/Open-ILS/xul/staff_client/custom_images/README b/Open-ILS/xul/staff_client/custom_images/README new file mode 100644 index 000000000..ec1b5eaeb --- /dev/null +++ b/Open-ILS/xul/staff_client/custom_images/README @@ -0,0 +1,15 @@ +Evergreen Installer Graphics +Adapted by Mike Peters (Evergreen Indiana) + +Sourced from NSIS "Orange" Modern UI Theme +The NSIS "Orange Modern UI Theme" was created by MoNKi. You can freely use it in your NSIS scritps. (from http://nsis.sourceforge.net/%22Orange%22_Modern_UI_Theme) + +Includes: +Wizard - Install +Wizard - Uninstall +Header - Left, fade to white +Beta Wizard - Install +Beta Wizard - Uninstall +Beta Header - Left, fade to white + +Thomas Berezansky then took them, saved them as BMP files (as makensis, on linux at least, won't read PNG files), and put them in beta/release folders with basic names. diff --git a/Open-ILS/xul/staff_client/custom_images/Wizard - Install.png b/Open-ILS/xul/staff_client/custom_images/Wizard - Install.png new file mode 100644 index 000000000..6b4085a19 Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/Wizard - Install.png differ diff --git a/Open-ILS/xul/staff_client/custom_images/Wizard - Uninstall.png b/Open-ILS/xul/staff_client/custom_images/Wizard - Uninstall.png new file mode 100644 index 000000000..797b04409 Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/Wizard - Uninstall.png differ diff --git a/Open-ILS/xul/staff_client/custom_images/beta/header.bmp b/Open-ILS/xul/staff_client/custom_images/beta/header.bmp new file mode 100644 index 000000000..8d62b8d83 Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/beta/header.bmp differ diff --git a/Open-ILS/xul/staff_client/custom_images/beta/install.bmp b/Open-ILS/xul/staff_client/custom_images/beta/install.bmp new file mode 100644 index 000000000..6cdcf927c Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/beta/install.bmp differ diff --git a/Open-ILS/xul/staff_client/custom_images/beta/uninstall.bmp b/Open-ILS/xul/staff_client/custom_images/beta/uninstall.bmp new file mode 100644 index 000000000..d7173aaca Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/beta/uninstall.bmp differ diff --git a/Open-ILS/xul/staff_client/custom_images/release/header.bmp b/Open-ILS/xul/staff_client/custom_images/release/header.bmp new file mode 100644 index 000000000..d80b85f4d Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/release/header.bmp differ diff --git a/Open-ILS/xul/staff_client/custom_images/release/install.bmp b/Open-ILS/xul/staff_client/custom_images/release/install.bmp new file mode 100644 index 000000000..8fbac8983 Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/release/install.bmp differ diff --git a/Open-ILS/xul/staff_client/custom_images/release/uninstall.bmp b/Open-ILS/xul/staff_client/custom_images/release/uninstall.bmp new file mode 100644 index 000000000..fc68313e8 Binary files /dev/null and b/Open-ILS/xul/staff_client/custom_images/release/uninstall.bmp differ diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi index a613dbf8f..f2b3164c0 100644 --- a/Open-ILS/xul/staff_client/windowssetup.nsi +++ b/Open-ILS/xul/staff_client/windowssetup.nsi @@ -4,6 +4,9 @@ ; Old versions of makensis don't like this, moved to Makefile ;!define /file PRODUCT_VERSION "client/VERSION" !define PRODUCT_TAG "Trunk" +!define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}" +!define UI_IMAGESET "beta" +;!define UI_IMAGESET "release" !define PRODUCT_NAME "Evergreen Staff Client ${PRODUCT_TAG}" !define PRODUCT_PUBLISHER "Evergreen Community" !define PRODUCT_WEB_SITE "http://evergreen-ils.org/" @@ -15,6 +18,11 @@ !define PRODUCT_LICENSE !endif +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP "custom_images\${UI_IMAGESET}\header.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP "custom_images\${UI_IMAGESET}\install.bmp" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "custom_images\${UI_IMAGESET}\uninstall.bmp" + ; MUI 1.67 compatible ------ !include "MUI.nsh" @@ -69,8 +77,8 @@ var ICONS_GROUP Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" OutFile "evergreen_staff_client_setup.exe" -InstallDir "$PROGRAMFILES\Evergreen Staff Client ${PRODUCT_TAG}" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" +InstallDir "$PROGRAMFILES\Evergreen Staff Client ${PRODUCT_INSTALL_TAG}" +InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "${PRODUCT_INSTALL_TAG}" ShowInstDetails show ShowUnInstDetails show RequestExecutionLevel admin