[Greater-commits] r3849 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-12-01 10:13:19 +0100 (Thu, 01 Dec 2011)
New Revision: 3849

Modified:
   trunk/packaging/greater-installer.nsi
   trunk/packaging/makeinstaller.py
Log:
- Change branding to 3.0
- Fix jump if greater instruction for all_users installation


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-12-01 09:09:29 UTC (rev 3848)
+++ trunk/packaging/greater-installer.nsi	2011-12-01 09:13:19 UTC (rev 3849)
@@ -59,9 +59,9 @@
 ;Interface Settings
 
   !define MUI_ABORTWARNING
-  BrandingText "GREAT-ER III - PostgreSQL"
+  BrandingText "GREAT-ER 3.0 - PostgreSQL"
   ; MUI Settings / Header
-  !define MUI_WELCOMEPAGE_TITLE "Welcome to the installation of GREAT-ER III - PostgreSQL"
+  !define MUI_WELCOMEPAGE_TITLE "Welcome to the installation of GREAT-ER 3.0 - PostgreSQL"
   !define MUI_WELCOMEPAGE_TEXT "This Installer will install \r\n\
   The Geo-referenced Regional Exposure Assesment Tool for European Rivers\r\n\
   Version ${version_number} using the Postges SQL Database backend."
@@ -227,7 +227,7 @@
   !insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
     "Field 4" "State"
   SetShellVarContext all
-  IntCmp $R0 0 just_current_user all_users
+  IntCmp $R0 0 just_current_user all_users all_users
   just_current_user:
       SetShellVarContext current
   all_users:
@@ -261,7 +261,7 @@
   !insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
     "Field 4" "State"
   SetShellVarContext all
-  IntCmp $R0 0 just_current_user all_users
+  IntCmp $R0 0 just_current_user all_users all_users
   just_current_user:
       SetShellVarContext current
   all_users:
@@ -305,7 +305,7 @@
   !insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
     "Field 4" "State"
   SetShellVarContext all
-  IntCmp $R0 0 just_current_user all_users
+  IntCmp $R0 0 just_current_user all_users all_users
   just_current_user:
       SetShellVarContext current
   all_users:
@@ -369,7 +369,7 @@
   !insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
     "Field 4" "State"
   SetShellVarContext all
-  IntCmp $R0 0 just_current_user all_users
+  IntCmp $R0 0 just_current_user all_users all_users
   just_current_user:
       SetShellVarContext current
   all_users:

Modified: trunk/packaging/makeinstaller.py
===================================================================
--- trunk/packaging/makeinstaller.py	2011-12-01 09:09:29 UTC (rev 3848)
+++ trunk/packaging/makeinstaller.py	2011-12-01 09:13:19 UTC (rev 3849)
@@ -41,7 +41,7 @@
         "productname_short" : "GREAT-ER",
         "description" : ("Geo-referenced Regional Exposure "
                          "Assessment Tool for European Rivers"),
-        "version_number" : "3.0.0.2",
+        "version_number" : "3.0.0.3",
         "version_date" : time.strftime("%Y-%m-%d-%H-%M")}