[Greater-commits] r3818 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-11-21 12:26:13 +0100 (Mon, 21 Nov 2011)
New Revision: 3818

Modified:
   trunk/packaging/greater-installer.nsi
   trunk/packaging/makeinstaller.py
Log:
Commit packaging changes to install the runtime
packages before postgres, disable installing them in
postgres and check for an installation error


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-10-14 13:08:57 UTC (rev 3817)
+++ trunk/packaging/greater-installer.nsi	2011-11-21 11:26:13 UTC (rev 3818)
@@ -100,6 +100,35 @@
 ;--------------------------------
 ;Installer Sections
 
+;---------------------------
+; General Section - Included in all installations
+Section ""
+  ; Create uninstaller
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+  # Delete old Start menu entries.
+  RMDir /R  "$SMPROGRAMS\${productname_short}"
+  SetOutPath "$TEMP"
+  DetailPrint "Installing Microsoft Visual C Runtime Libraries..."
+  File "vcredist_x86.exe"
+  File "vcredist-80_x86.exe"
+  ExecWait 'msiexec /i "$TEMP\vcredist_x86.exe" /passive /q' $0
+  ExecWait 'msiexec /i "$TEMP\vcredist-80_x86.exe" /passive /q' $0
+  Delete "$TEMP\vcredist_x86.exe"
+  Delete "$TEMP\vcredist-80_x86.exe"
+  ; Store installation folder
+  WriteRegStr HKLM "Software\${productname_short}" "" $INSTDIR
+  ; Create Registry keys
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "DisplayName" "${productname_short} ${version_date}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "Displayversion_number" "${version_number}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "Displayversion_date" "${version_date}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "NoModify" 1
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "NoRepair" 1
+SectionEnd
+
+;------------------
+;PostgreSQL Installation
 Section "PostgreSQL 9.0.4" SecPostgreSQL
   Banner::show /NOUNLOAD /set 76 "Installing..." "PostgreSQL 9.0.4" "" 
   SetOutPath "$TEMP"
@@ -109,8 +138,18 @@
   --superpassword greater --superaccount greater \
   --serviceaccount greater-db --servicepassword greater \
   --datadir "$INSTDIR\GREAT-ER-DB\database" --create_shortcuts 0 \
-  --servicename greater_postgres_server' $0
+  --servicename greater_postgres_server --unattendedmodeui minimal \
+  --debugtrace "$INSTDIR\postgres_installation.txt" --debuglevel 2 \
+  --install_runtimes 0' $0
+
   Delete "$TEMP\postgresql-9.0.4-1-windows.exe"
+  IntCmp $0 0 pgInstallOK
+  MessageBox MB_OK|MB_ICONEXCLAMATION "Your PostgreSQL database installation failed! $\r$\n \
+  Please report this issue to http://wald.intevation.org/tracker/?group_id=55 $\r$\n \
+  with the attached installation log that you can find at:$\r$\n %TMP%\install-postgresql.log"
+
+pgInstallOK:
+
   banner::destroy
   ;--------------------------------
   ; Install default database
@@ -146,33 +185,7 @@
   ; Database should now be ready
 SectionEnd
 
-;---------------------------
-; General Section - Included in all installations
-Section ""
-  ; Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
 
-  # Delete old Start menu entries.
-  RMDir /R  "$SMPROGRAMS\${productname_short}"
-  SetOutPath "$TEMP"
-  DetailPrint "Installing Microsoft Visual C Runtime Libraries..."
-  File "vcredist_x86.exe"
-  File "vcredist-80_x86.exe"
-  ExecWait '$TEMP\vcredist_x86.exe /q' $0
-  ExecWait '$TEMP\vcredist-80_x86.exe /q' $0
-  Delete "$TEMP\vcredist_x86.exe"
-  Delete "$TEMP\vcredist-80_x86.exe"
-  ; Store installation folder
-  WriteRegStr HKLM "Software\${productname_short}" "" $INSTDIR
-  ; Create Registry keys
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "DisplayName" "${productname_short} ${version_date}"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "Displayversion_number" "${version_number}"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "Displayversion_date" "${version_date}"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "UninstallString" '"$INSTDIR\uninstall.exe"'
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "NoModify" 1
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}" "NoRepair" 1
-SectionEnd
-
 ;---------------------------
 ; Admintool Section
 

Modified: trunk/packaging/makeinstaller.py
===================================================================
--- trunk/packaging/makeinstaller.py	2011-10-14 13:08:57 UTC (rev 3817)
+++ trunk/packaging/makeinstaller.py	2011-11-21 11:26:13 UTC (rev 3818)
@@ -41,7 +41,7 @@
         "productname_short" : "GREAT-ER",
         "description" : ("Geo-referenced Regional Exposure "
                          "Assessment Tool for European Rivers"),
-        "version_number" : "3.0.0.0",
+        "version_number" : "3.0.0.1",
         "version_date" : time.strftime("%Y-%m-%d-%H-%M")}