[Greater-commits] r441 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-13 16:55:20 +0200 (Wed, 13 Jul 2011)
New Revision: 441

Modified:
   trunk/packaging/greater-installer.nsi
   trunk/packaging/makeinstaller.py
Log:
Add icon for desktop greater shortcut and remove direcotries sorted


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-07-13 13:30:28 UTC (rev 440)
+++ trunk/packaging/greater-installer.nsi	2011-07-13 14:55:20 UTC (rev 441)
@@ -239,7 +239,8 @@
      "Field 3" "State"
   IntCmp $R0 0 no_desktop
   # Create new Desktop link
-  CreateShortCut "$DESKTOP\${productname_short}.lnk" "$INSTDIR\${executable}"
+  CreateShortCut "$DESKTOP\${productname_short}.lnk" "$INSTDIR\${executable}" \
+                 "" "$INSTDIR\GREAT-ER\Resources\greater2.ico"
   no_desktop:
 
   Return
@@ -386,8 +387,10 @@
   uninstallPostgreSQL:
    Banner::show /NOUNLOAD /set 76 "Uninstalling PostgreSQL..."
    ; TODO find path from registry and uninstall
-   ExecWait '"$INSTDIR\postgres9\uninstall-postgresql.exe --unattended"'
+   ExecWait '"$INSTDIR\postgres9\uninstall-postgresql.exe"'
    Banner::destroy 
+   RMDIR "$INSTDIR\postgres9"
+   RMDIR "$INSTDIR"
   no:
 SectionEnd
 
@@ -397,6 +400,7 @@
    File "python-2.7.2.msi"
    ExecWait '"msiexec" /uninstall $TEMP\python-2.7.2.msi'
    Banner::destroy 
+   RMDIR "$INSTDIR"
 SectionEnd
 ;--------------------------------
 ;Uninstall Functions

Modified: trunk/packaging/makeinstaller.py
===================================================================
--- trunk/packaging/makeinstaller.py	2011-07-13 13:30:28 UTC (rev 440)
+++ trunk/packaging/makeinstaller.py	2011-07-13 14:55:20 UTC (rev 441)
@@ -81,11 +81,8 @@
             else:
                 unptr.write('Delete "%s"\r\n' % \
                     fname.replace(absdir, "$INSTDIR"))
-    for dir in dirlist:
+    for dir in dirlist.sort(lambda x: len(x)):
         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()