win32 installer, do not remove user files

diff --git a/packaging/win32/MessageBox.txt b/packaging/win32/MessageBox.txt
new file mode 100644 (file)
index 0000000..dddab55
--- /dev/null
+++ b/packaging/win32/MessageBox.txt
@@ -0,0 +1,186 @@
+Customisable MessageBox Plug-In (v0.98 beta 3)\r
+\r
+[  Archive Page: http://nsis.sourceforge.net/archive/???  ]\r
+\r
+--------------\r
+\r
+The Customisable MessageBox plug-in allows you to use a MessageBox in your installer which can be altered to how you want it to be.  You can control:\r
+       *  the number of buttons shown\r
+       *  the text each button shows\r
+       *  a standard or customisable icon ( flexible so you can use the installer or other files )\r
+       *  a fully working 'forth' button!\r
+\r
+The plug-in uses a few tricks to allow for the messagebox functionality to be altered so that the button text can finally be altered making [ Yes | Yes to All | No | No to All ] ( and anything else you care for ) possible.\r
+\r
+Also with the changes made it is now possible to have a functional 'forth' button - yes you read correctly!  When using the function just pass in four button texts and you will see the forth button - simple really :o)\r
+\r
+There is only the one function to show the messagebox so enjoy.\r
+\r
+[ As of v0.98 beta the parameters of calling the function have changed, check out usage for the revised options - thanks to n0On3 for the suggestions. ]\r
+\r
+\r
+Usage\r
+-----\r
+\r
+messagebox::show  styles  caption  ( module_name, icon_id )  text   but1  [ but2  but3  but4 ]\r
+\r
+styles - messagebox styles ( supports most of the windows messagebox styles )\r
+\r
+caption - the text to be used for the dialog title ( or the installer title if not specified )\r
+\r
+module_name - sets the name of the file ( usually a dll or exe file ) that contains the custom icon to be used - if 0 is passed then the installer will be used\r
+\r
+icon_id - the id of the icon group to be used for the custom icon\r
+\r
+text - the text to be shown by the messagebox\r
+\r
+but1 - specified text or name id to use ie IDYES, IDNO, etc ( there must always be at least one button )\r
+\r
+but2, but3, but4 - optional buttons which follow the same way as for but1\r
+\r
+\r
+When passing in options, you should use a "" pair for options you pass in to ensure the strings are correctly read.  It is not necessary to do so for the predefined button texts\r
+e.g. "IDCANCEL" is the same as IDCANCEL.\r
+\r
+See Example.nsi for an example ;o)  ( bit hacked at the moment due to testing but shows most things )\r
+\r
+\r
+Return Values\r
+-----\r
+\r
+To get the return value use Pop $0 immediately after the function has been used incase other functions alter the value.\r
+\r
+If there were no problems then the function will return the number of the button pressed working from the left being 'button 1'.\r
+i.e.\r
+       if you have [ yes | no | abort ] and 'no' is selected then the return value will be '2'\r
+\r
+If an error happens then the messagebox will return 0.\r
+\r
+If there are no buttons passed then the function will return '-1'.\r
+\r
+\r
+Some More Info\r
+----------------\r
+\r
+If you pass an empty string for the caption ( "" ) then the installer title text will be used instead (stripping back the current section name as NSIS messageboxes do).\r
+If the installer is run silently then the title will be blank if setting the caption option to "" ( as NSIS messageboxes do ).  This is because when the installer is silent it does not have a visible window and so will not have a window title ( had not taken this into account initially, oops - fixed from v0.98 beta 3 ).\r
+\r
+When you want to use a custom icon, setting module to '0' will look for the icon in the installer otherwise it will search the file specified.\r
+e.g.\r
+       "0,103" will load the installer icon ( well in testing it does :o)  )\r
+       "shell32.dll,24" will load the help file icon from the shell32.dll ( as long as the file exists! )\r
+\r
+If the module passed is not valid then the usericon style will not be used ( you may receive a windows message informing of this ).\r
+\r
+If the icon is not valid then the messagebox will just show a blank area where the icon would be displayed assuming that the value of module is valid.\r
+\r
+If a usericon is specified then if there are any of the messagebox icon styles passed in, these will be ignored.  This allows an icon to appear otherwise internal style conflicts will prevent any icon being shown.\r
+\r
+If you want to display the standard button texts then pass the following strings in for the necessary button:\r
+\r
+       IDOK            -       Ok\r
+       IDCANCEL        -       Cancel\r
+       IDABORT -       Abort\r
+       IDRETRY -       Retry\r
+       IDIGNORE        -       Ignore\r
+       IDYES           -       Yes\r
+       IDNO            -       No\r
+       IDHELP          -       Help / 4th button\r
+       IDTRYAGAIN      -       Try Again\r
+       IDCONTINUE      -       Continue\r
+\r
+When the function is processing the passed button texts to use, if a duplicate of the predefined texts (above) happen then the only the first instance will be allowed\r
+e.g.\r
+       IDYES "ah go on if you dare" IDYES      ->      [  YES  |  ah go on if you dare  ]\r
+\r
+Each button will be resized if needed to allow the text to fit correctly in the button without being clipped.  If the text is still too long for the messagebox width ( limited to 80% of the screen width ) then buttons will be resized and clipping of the button text may happen again ( this will be fixed in v1.0 ).\r
+\r
+\r
+Final Notes\r
+-------\r
+\r
+I have no idea how the code will work with international text (since i just use plain text in the code) so if you try it in a multilanguage setup then let me know how it reacts or if there are any issues with the function's display.\r
+\r
+The predefined button texts are hard coded and cannot be altered.  To alter the default texts involves passing in the language button text as a custom button text.\r
+\r
+The button resizing code is not complete at the moment ( as can be clearly seen from the first messagebox ) when it detects that the width of the messagebox is at the 80% screen width.  Issues are that the buttons are not correctly resized to ensure that they appear correctly ( as is the case with the second messagebox ).  This is more down to fiddling with the button widths after the initial processing but will be fixed soon :o)\r
+\r
+\r
+Credits\r
+-------\r
+\r
+Coded by Darren Owen, aka DrO (Sept 2003)\r
+\r
+n0On3 - Idea request and helpful feedback ( the simplified function use over previous versions :o) )\r
+\r
+A plugin from me to you :o)\r
+\r
+\r
+Version History\r
+-------\r
+\r
+v0.1\r
+* Initial release of the function\r
+* Basic support to show that the button text can be altered on the messagebox\r
+* Inital support for controlling the number of buttons shown\r
+\r
+v0.5\r
+* Setting of text of only the buttons wanted ( "/but? blah" )\r
+* Now if a string is not passed then the text will not be set (broken in the v0.1 release)\r
+* Altered a lot of internal workings to allow for more customising of the MessageBox\r
+* Better support for the number of buttons to show\r
+* The functional '4th' button - making use of the 'Help' button to act as a real button\r
+* Fixed a number of crash issues due to buffer sizes and a few other bugs, etc\r
+\r
+v0.8\r
+* A lot of changes made :o)\r
+* Improved internal handling so that now button text is set correctly either when the number of buttons is set or user styles are set so now "/but2 blah" will always set the second buttons text and not just a few cases as beforehand\r
+* Altered the order of the parameters from earlier versions to make some internals easier to do :o)\r
+* The 4th / Help button will now close the MessageBox in ALL cases - would not close correctly if there was not a 'cancel' button in earlier versions\r
+* Buffers are now allocated to the NSIS buffer sizes passed to the dll on use for better compatibility between dll and installer\r
+* When the button numbers are set, the function will map the returned value now to the button selected instead of the normal wndows defined return value\r
+* some other bits and bobs that i've forgotten on the way\r
+\r
+v0.9\r
+* Added in support for displaying custom icons on the messagebox ( along with standard icons which can be shown ) either in the installer or from other files\r
+* Altered the example script to show off some more bits of what it can do\r
+\r
+v0.95 beta\r
+* Added in support for resizing of buttons based on the text set into the button ( use the /trim before the text to be set )\r
+* Messagebox is now limited to approximately 80% of the screen size ( as the messagebox normally does )\r
+* The resizing of button texts will also update the width of the text width to ensure it keeps to the size of the messagebox\r
+* Support is not complete for /trim ( still need to update the graduating of the width increment )\r
+* When the 80% width is reached, currently buttons will disappear off the messagebox ( handling for a double height button will come to cope with this soon )\r
+* Altered the example script to show off some more bits of what it can do\r
+\r
+v0.98 beta\r
+* Removed the passing in of a hwnd parameter - is always owned by the installer\r
+* Altered the custom icon option to be a single parameter now in the form 'module,id' where module can be 0 to use the installer\r
+* All return values are now mapped to the button number pressed ie 1,2,etc\r
+* Now the number of buttons to show is based on the button string texts passed in to the function :o)\r
+* Altered the order of parameters to work in a top to bottom order with respect to the messagebox layout and to match closer to the NSIS setup\r
+[ a good suggestion from n0On3 - nice ]\r
+- now goes:    style  title  usericon  text  but1  [ but2  but3  but4 ]\r
+* Altered the button texts to be set in the order passed and will also convert the default ids too! eg IDYES -> "Yes", IDIGNORE -> "Ignore"\r
+* Fixed the graduating of the button trim feature to appear 'natural'\r
+[ adds approxiamately 3 character widths either side when the text won't fit fully in the button ]\r
+* Fixed a few bugs in the code introduced in the changes made\r
+* Support for MB_DEFBUTTON? is broken when a button has to be resized ( will fix this soon - already worked out how to but not why this happens )\r
+\r
+v0.98 beta 2\r
+* Fixed the MB_DEFBUTTON? issue ( needed to prevent the wm_active message being handled )\r
+* Verified the installer will show icons correctly if the installer is run silently ( no code changes were made )\r
+* Added in checking of the defined buttons to ensure that duplicates are not allowed (only the first occurrance is allowed)\r
+* Checked that all strings are verified for having data before being used\r
+* A few code tidy-ups introduced to the code\r
+* Typo fix in the example\r
+* Added in stripping out of the icon definitions if a user icon is specified (otherwise no icon will appear!)\r
+* Updated the readme file to reflect the changes made to the plug-in's functionality since v0.98 beta and to clarify things in better detail now ( i hope )\r
+* Added in a reference to the archive page for the plugin ( will upload majority of this file to the archive )\r
+* All internal buffers are now set to the buffer size passed into the plugin when it is called and altered how they are referenced\r
+* Fixed how the module string is cleared, should fix a potential crash issue i hope\r
+* Partially fixed the resizing of the text area when using long button strings to correctly limit out when the 80% limit is reached ( fine when now icon is used at the moment )\r
+* Added a silent installer option to the example script, just !define SILENT to get the silent version (should show that the function works fine either in a normal or silent installer)\r
+\r
+v0.98 beta 3\r
+* Fixed a crash when a silent installer is run ( pointed out by n0On3 ) - not checking the string length when getting the installer title if ""is the pased caption value, doh!
\ No newline at end of file

diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi
index 2b70ab2392246add1b00859c4d179074aa492ad1..db241cd13ae585523172008b2708ed24f1e5adfd 100644 (file)
--- a/packaging/win32/inkscape.nsi
+++ b/packaging/win32/inkscape.nsi
@@ -12,6 +12,7 @@
 !define PRODUCT_WEB_SITE "http://www.inkscape.org"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\inkscape.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+;!define UNINST_EXE "uninstall.exe"
 
 
 
@@ -48,6 +49,10 @@ SetCompressor /SOLID lzma
 ;!insertmacro UNATTENDED_UNINSTALL
 !insertmacro INTERACTIVE_UNINSTALL
 
+!addplugindir .
+!include "FileFunc.nsh"
+!insertmacro un.GetParent
+
 
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
@@ -482,7 +487,9 @@ FunctionEnd
     ReadRegStr $2 HKU "$1\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
     StrCmp $2 "" delprefs-Loop
        DetailPrint "$2\Inkscape will be removed"
-    RMDir /r "$2\Inkscape"
+    Delete "$2\Inkscape\preferences.xml"
+    Delete "$2\Inkscape\extension-errors.log"
+    RMDir "$2\Inkscape"
     Goto delprefs-Loop
   delprefs-End:
 !macroend
@@ -490,54 +497,26 @@ FunctionEnd
 
 ;--------------------------------
 ; Installer Sections
-; @todo better idea is to call the original uninstaller first
 Section -removeInkscape
   ; check for an old installation and clean that dlls and stuff
-  ClearErrors
-  IfFileExists $INSTDIR\etc 0 doDeleteLib
-    DetailPrint "$INSTDIR\etc exists, will be removed"
-    RmDir /r $INSTDIR\etc
-       IfErrors 0 +4
-      DetailPrint "fatal: failed to delete $INSTDIR\etc"
-      DetailPrint "aborting installation"
-         Abort
-  doDeleteLib:
-
-  ClearErrors
-  IfFileExists $INSTDIR\lib 0 doDeleteLocale
-    DetailPrint "$INSTDIR\lib exists, will be removed"  
-    RmDir /r $INSTDIR\lib
-       IfErrors 0 +4
-      DetailPrint "fatal: failed to delete $INSTDIR\lib"
-      DetailPrint "aborting installation"
-         Abort
-  doDeleteLocale:
-
-  ClearErrors
-  IfFileExists $INSTDIR\locale 0 doDeleteDll
-    DetailPrint "$INSTDIR\locale exists, will be removed"
-    RmDir /r $INSTDIR\locale
-       IfErrors 0 +4
-      DetailPrint "fatal: failed to delete $INSTDIR\locale"
-      DetailPrint "aborting installation"
-         Abort
-  doDeleteDll:
 
-  ClearErrors
-  FindFirst $0 $1 $INSTDIR\*.dll
-    FindNextLoop:
-    StrCmp $1 "" FindNextDone
-    DetailPrint "$INSTDIR\$1 exists, will be removed"
-    Delete $INSTDIR\$1
-    IfErrors 0 +4
-      DetailPrint "fatal: failed to delete $INSTDIR\$1"
-      DetailPrint "aborting installation"
-      Abort
+FindFirstINSTDIR:
+    FindFirst $0 $1 $INSTDIR\*.*
+FindINSTDIR:
+    StrCmp $1 "" FindNextDoneINSTDIR
+    StrCmp $1 "." FindNextINSTDIR
+       StrCmp $1 ".." FindNextINSTDIR
+       Goto FoundSomethingINSTDIR
+FindNextINSTDIR:
     FindNext $0 $1
-    Goto FindNextLoop
-  FindNextDone:
-  
-  ;remove the old inkscape shortcuts from the startmenu
+       Goto FindINSTDIR
+FoundSomethingINSTDIR:
+; @TODO translate
+       MessageBox MB_RETRYCANCEL "${PRODUCT_NAME} must be installed in an empty directory. $INSTDIR ($1) is not empty. Please clear this directory first!$(lng_OK_CANCEL_DESC)" /SD IDCANCEL IDRETRY FindFirstINSTDIR
+       Quit
+FindNextDoneINSTDIR:
+
+    ;remove the old inkscape shortcuts from the startmenu
   ;just in case they are still there
   SetShellVarContext current
   Delete "$SMPROGRAMS\Inkscape\Uninstall Inkscape.lnk"
@@ -980,6 +959,7 @@ SectionGroupEnd
 
 
 Section -FinalizeInstallation
+       DetailPrint "finalize installation"
   StrCmp $MultiUser "1" "" SingleUser
     DetailPrint "admin mode, registry root will be HKLM"
     SetShellVarContext all
@@ -1011,7 +991,7 @@ Section -FinalizeInstallation
   ; uninstall settings
   ClearErrors
   ; WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegExpandStr SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\${UNINST_EXE}"
+  WriteRegExpandStr SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" "${UNINST_EXE}"
   WriteRegExpandStr SHCTX "${PRODUCT_UNINST_KEY}" "InstallDir" "$INSTDIR"
   WriteRegExpandStr SHCTX "${PRODUCT_UNINST_KEY}" "InstallLocation" "$INSTDIR"
   WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayName" "${PRODUCT_NAME} ${PRODUCT_VERSION}"
@@ -1021,6 +1001,36 @@ Section -FinalizeInstallation
   WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoRepair" "1"
   IfErrors 0 +2
     DetailPrint "fatal: failed to write to registry un-installation info"
+
+  ;create/update log always within .onInstSuccess function
+  !insertmacro UNINSTALL.LOG_UPDATE_INSTALL
+  
+       DetailPrint "create MD5 sums"
+       md5dll::GetMD5File /NOUNLOAD "$INSTDIR\inkscape.exe"
+       Pop $1 ;md5 of file
+       DetailPrint $1
+       ClearErrors
+       FileOpen $0 $INSTDIR\uninstall.dat r
+       FileOpen $9 $INSTDIR\uninstall.log w
+       IfErrors doneinstall
+readnextlineinstall:
+       ClearErrors
+       FileRead $0 $1
+       IfErrors doneinstall
+       StrCpy $1 $1 -2
+       DetailPrint $1
+       md5dll::GetMD5File /NOUNLOAD $1
+       Pop $2
+       DetailPrint $2
+       StrCmp $2 "" +2
+       FileWrite $9 "$2  $1$\r$\n"
+       Goto readnextlineinstall
+doneinstall:
+       FileClose $0
+       FileClose $9
+       ; this file is not needed anymore
+       Delete $INSTDIR\uninstall.dat
+       
 SectionEnd
  
 ; Last the Descriptions
@@ -1120,9 +1130,10 @@ Function .onInit
        ReadRegStr $R1  HKCU ${PRODUCT_UNINST_KEY} "DisplayName"
        StrCmp $R0 "" uninstall_before_done
         
-         MessageBox MB_YESNO|MB_ICONEXCLAMATION $(lng_WANT_UNINSTALL_BEFORE) /SD IDNO IDYES +1 IDNO uninstall_before_done 
+         MessageBox MB_YESNO|MB_ICONEXCLAMATION $(lng_WANT_UNINSTALL_BEFORE) /SD IDNO IDNO uninstall_before_done 
          ;Run the uninstaller
          ;uninst:
+               DetailPrint "execute $R0 in $INSTDIR"
            ClearErrors
            ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
          uninstall_before_done:
@@ -1230,8 +1241,7 @@ FunctionEnd
 
 
 Function .onInstSuccess
-  ;create/update log always within .onInstSuccess function
-  !insertmacro UNINSTALL.LOG_UPDATE_INSTALL
+
 FunctionEnd
 
 ; --------------------------------------------------
@@ -1251,7 +1261,7 @@ FunctionEnd
 
 Function un.onInit
   ;begin uninstall, could be added on top of uninstall section instead
-  !insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
+  ;!insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
 
   ClearErrors
   StrCpy $User ""
@@ -1292,6 +1302,61 @@ Function un.onInit
    
 FunctionEnd
 
+# removes a file and if the directory is empty afterwards the directory also
+# push md5, push filename, call unremovefilename
+Function un.RemoveFile
+       Var /Global filename
+       Var /Global md5sum
+       Var /Global ismd5sum
+       Var /Global removenever ; never remove a touched file
+       Var /Global removealways        ; always remove files touched by user
+       Pop $filename
+       Pop $md5sum
+       
+       IfFileExists $filename +2 0
+               Return
+       StrCmp $removealways "always" unremovefile 0
+       md5dll::GetMD5File /NOUNLOAD $filename
+       Pop $ismd5sum ;md5 of file
+       StrCmp $md5sum $ismd5sum  unremovefile 0
+       DetailPrint "uups MD5 does not match"
+       StrCmp $removenever "never" 0 +2
+               Return
+       ; the md5 sums does not match so we ask
+       ; @TODO translate
+       messagebox::show MB_DEFBUTTON3|MB_TOPMOST "deleting changed file" "0,103" \
+               "The file has been changed after installation.$\r$\nDo you still want to delete that file?" \
+               "Yes" "always answer YES" "No" "always answer NO"
+       ;DetailPrint "messagebox finished"
+       Pop $md5sum
+       ;DetailPrint "messagebox call returned... $md5sum"
+       StrCmp $md5sum "1" unremovefile 0       ; Yes
+       StrCmp $md5sum "2" 0 unremoveno ; Yes always
+       StrCpy $removealways "always"
+       ;DetailPrint "removealways"
+       Goto unremovefile
+unremoveno:
+       StrCmp $md5sum "3" 0 unremovenever      ; No
+       ;DetailPrint "No remove"
+       Return
+unremovenever:
+       StrCpy $removenever "never"
+       ;DetailPrint "removenever"
+       Return
+unremovefile:
+       ;DetailPrint "removefile"
+       ClearErrors
+       Delete $filename
+       ;now recursivly remove the path
+unrmdir:
+       ${un.GetParent} $filename $filename
+       IfErrors 0 +2
+               Return
+       RMDir $filename
+       IfErrors +2
+               Goto unrmdir
+FunctionEnd
+
 Section Uninstall
 
   ; remove personal settings
@@ -1300,7 +1365,7 @@ Section Uninstall
     DetailPrint "purge personal settings in $APPDATA\Inkscape"
     ;RMDir /r "$APPDATA\Inkscape"
        !insertmacro delprefs
-  endPurge:
+       endPurge:
 
   ; Remove file associations for svg editor
   DetailPrint "removing file associations for svg editor"
@@ -1426,24 +1491,63 @@ Section Uninstall
   DetailPrint "removing uninstall info"
 
   ;uninstall from path, must be repeated for every install logged path individual
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\lib\locale"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\locale"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\doc"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\tutorials"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\templates"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\screens"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\clipart"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\extensions"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\icons"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\modules"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\python"
-  !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\lib\locale"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\locale"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\doc"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\tutorials"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\templates"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\screens"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\clipart"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\extensions"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share\icons"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\share"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\modules"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\python"
+  ;!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR"
 
   ;end uninstall, after uninstall from all logged paths has been performed
-  !insertmacro UNINSTALL.LOG_END_UNINSTALL
+  ;!insertmacro UNINSTALL.LOG_END_UNINSTALL
 
   ;RMDir /r "$INSTDIR"
+  
+       StrCpy $removenever ""
+       StrCpy $removealways ""
+       
+       InitPluginsDir
+       SetPluginUnload manual
+       
+       ClearErrors
+       FileOpen $0 $INSTDIR\uninstall.log r
+       IfErrors uninstallnotfound
+readnextline:  
+       ClearErrors
+       FileRead $0 $1
+       IfErrors done
+       ; cat the line into md5 and filename
+       StrLen $2 $1
+       IntCmp $2 35 readnextline readnextline
+       StrCpy $3 $1 32
+       StrCpy $4 $1 $2-36 34   #remove trailing CR/LF
+       StrCpy $4 $4 -2
+       Push $3
+       Push $4
+       Call un.RemoveFile
+       Goto readnextline
+uninstallnotfound:
+; @TODO translate
+       MessageBox MB_OK "Fatal! $INSTDIR\uninstall.log not found! Please clear directory $INSTDIR yourself!" /SD IDOK
+done:
+       FileClose $0
+
+       Delete "$INSTDIR\uninstall.log"
+       Delete "$INSTDIR\uninstall.exe"
+       ; remove empty directories
+       RMDir "$INSTDIR\data"
+       RMDir "$INSTDIR\doc"
+       RMDir "$INSTDIR\modules"
+       RMDir "$INSTDIR\plugins"
+       
+       RMDir $INSTDIR
 
   SetAutoClose false
 

diff --git a/packaging/win32/md5dll.dll b/packaging/win32/md5dll.dll
new file mode 100644 (file)
index 0000000..abefbb0
Binary files /dev/null and b/packaging/win32/md5dll.dll differ

diff --git a/packaging/win32/messagebox.dll b/packaging/win32/messagebox.dll
new file mode 100644 (file)
index 0000000..97407fa
Binary files /dev/null and b/packaging/win32/messagebox.dll differ