[Greater-commits] r3624 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-20 15:25:56 +0200 (Wed, 20 Jul 2011)
New Revision: 3624

Modified:
   trunk/packaging/greater-installer.nsi
Log:
Change the order of the uninstalltion of components


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-07-20 12:59:50 UTC (rev 3623)
+++ trunk/packaging/greater-installer.nsi	2011-07-20 13:25:56 UTC (rev 3624)
@@ -378,6 +378,31 @@
 ;--------------------------------
 ;Uninstaller
 
+Section "un.PostgreSQL" UnSecPostgreSQL
+  uninstallPostgreSQL:
+   Banner::show /NOUNLOAD /set 76 "Uninstalling PostgreSQL..."
+   ; TODO find path from registry and uninstall
+   ExecWait '"$INSTDIR\postgres9\uninstall-postgresql.exe"'
+   Banner::destroy 
+   RMDIR "$INSTDIR\postgres9"
+   RMDIR "$INSTDIR"
+   MessageBox MB_YESNO|MB_ICONQUESTION "Do you also want to delete contents of your \
+   GREAT-ER Database?" \
+   IDYES deletedb IDNO no
+   deletedb:
+   RMDIR /r "$INSTDIR\GREAT-ER-DB\database"
+   no:
+SectionEnd
+
+Section "un.Python"
+   Banner::show /NOUNLOAD /set 76 "Uninstalling Python..."
+   SetOutPath "$TEMP" 
+   File "python-2.7.2.msi"
+   ExecWait '"msiexec" /uninstall $TEMP\python-2.7.2.msi'
+   Banner::destroy 
+   RMDIR "$INSTDIR"
+SectionEnd
+
 Section "un."
   !include ${client-un}
   !include ${admin-un}
@@ -403,30 +428,6 @@
   RMDir "$INSTDIR"
 SectionEnd
 
-Section "un.PostgreSQL" UnSecPostgreSQL
-  uninstallPostgreSQL:
-   Banner::show /NOUNLOAD /set 76 "Uninstalling PostgreSQL..."
-   ; TODO find path from registry and uninstall
-   ExecWait '"$INSTDIR\postgres9\uninstall-postgresql.exe"'
-   Banner::destroy 
-   RMDIR "$INSTDIR\postgres9"
-   RMDIR "$INSTDIR"
-   MessageBox MB_YESNO|MB_ICONQUESTION "Do you also want to delete contents of your \
-   GREAT-ER Database?" \
-   IDYES deletedb IDNO no
-   deletedb:
-   RMDIR /r "$INSTDIR\GREAT-ER-DB\database"
-   no:
-SectionEnd
-
-Section "un.Python"
-   Banner::show /NOUNLOAD /set 76 "Uninstalling Python..."
-   SetOutPath "$TEMP" 
-   File "python-2.7.2.msi"
-   ExecWait '"msiexec" /uninstall $TEMP\python-2.7.2.msi'
-   Banner::destroy 
-   RMDIR "$INSTDIR"
-SectionEnd
 ;--------------------------------
 ;Uninstall Functions