[Greater-commits] r440 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-13 15:30:28 +0200 (Wed, 13 Jul 2011)
New Revision: 440

Modified:
   trunk/packaging/greater-installer.nsi
   trunk/packaging/makeinstaller.py
Log:
Add icon for greater and make postgres uninstallable


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-07-13 11:11:36 UTC (rev 439)
+++ trunk/packaging/greater-installer.nsi	2011-07-13 13:30:28 UTC (rev 440)
@@ -228,7 +228,7 @@
   # Create new Start menu entries
   CreateDirectory "$SMPROGRAMS\${productname}"
   CreateShortCut "$SMPROGRAMS\${productname}\${productname_short}.lnk" \
-                 "$INSTDIR\${executable}" "" "$INSTDIR\GREAT-ER\Greater1.ico"
+                 "$INSTDIR\${executable}" "" "$INSTDIR\GREAT-ER\Resources\greater2.ico"
   no_start_menu:
 
   # ** Desktop Icon **
@@ -386,7 +386,7 @@
   uninstallPostgreSQL:
    Banner::show /NOUNLOAD /set 76 "Uninstalling PostgreSQL..."
    ; TODO find path from registry and uninstall
-   ExecWait '"uninstall-postgresql.exe --unattended"'
+   ExecWait '"$INSTDIR\postgres9\uninstall-postgresql.exe --unattended"'
    Banner::destroy 
   no:
 SectionEnd

Modified: trunk/packaging/makeinstaller.py
===================================================================
--- trunk/packaging/makeinstaller.py	2011-07-13 11:11:36 UTC (rev 439)
+++ trunk/packaging/makeinstaller.py	2011-07-13 13:30:28 UTC (rev 440)
@@ -83,6 +83,9 @@
                     fname.replace(absdir, "$INSTDIR"))
     for dir in dirlist:
         unptr.write('RMDir "%s"\r\n' % dir)
+    dirlist.reverse()
+    for dir in dirlist:
+        unptr.write('RMDir "%s"\r\n' % dir)
     unptr.write('RMDir "$INSTDIR"')
     fptr.close()
     unptr.close()