Install binaries into bin subfolder
authorAndre Heinecke <aheinecke@intevation.de>
Fri, 8 Jan 2016 13:43:21 +0000 (14:43 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Fri, 8 Jan 2016 13:43:21 +0000 (14:43 +0100)
* src/gpgol.nsi, src/gpgex.nsi: Install x64 binaries in bin_64
* src/gpa.nsi: Do not install into pub.
* src/inst-atk.nsi
  src/inst-cairo.nsi
  src/inst-dbus.nsi,
  src/inst-expat.nsi,
  src/inst-fontconfig.nsi,
  src/inst-freetype.nsi,
  src/inst-gdk-pixbuf.nsi,
  src/inst-gettext.nsi,
  src/inst-glib.nsi,
  src/inst-gpa.nsi,
  src/inst-gpg4win.nsi,
  src/inst-gpgex.nsi,
  src/inst-gpgme.nsi,
  src/inst-gpgol.nsi,
  src/inst-gtk+.nsi,
  src/inst-kleopatra.nsi,
  src/inst-libassuan.nsi,
  src/inst-libffi.nsi,
  src/inst-libgpg-error.nsi,
  src/inst-libiconv.nsi,
  src/inst-libpng.nsi,
  src/inst-pango.nsi,
  src/inst-paperkey.nsi,
  src/inst-pinentry.nsi,
  src/inst-qtbase.nsi,
  src/inst-sections.nsi,
  src/inst-w32pth.nsi,
  src/inst-zlib.nsi,
  src/uninst-atk.nsi,
  src/uninst-cairo.nsi,
  src/uninst-claws-mail-cmds.nsi,
  src/uninst-dbus.nsi,
  src/uninst-expat.nsi,
  src/uninst-fontconfig.nsi,
  src/uninst-freetype.nsi,
  src/uninst-gdk-pixbuf.nsi,
  src/uninst-gettext.nsi,
  src/uninst-glib.nsi,
  src/uninst-gpa.nsi,
  src/uninst-gpg4win.nsi,
  src/uninst-gpgex.nsi,
  src/uninst-gpgme.nsi,
  src/uninst-gpgol.nsi,
  src/uninst-gtk+.nsi,
  src/uninst-kleopatra.nsi,
  src/uninst-libassuan.nsi,
  src/uninst-libffi.nsi,
  src/uninst-libgpg-error.nsi,
  src/uninst-libiconv.nsi,
  src/uninst-libpng.nsi,
  src/uninst-pango.nsi,
  src/uninst-paperkey.nsi,
  src/uninst-pinentry.nsi,
  src/uninst-qtbase.nsi,
  src/uninst-w32pth.nsi,
  src/uninst-zlib.nsi: Install binaries into bin.

--
This removes the need for Kleowrap. This will also fix
"Pinned to taskbar" Kleopatra instances where the shortcut
would not be to Kleowrap otherwise.

Basically this should fix most of the reports where
Kleopatra fails to start because DLL's can't be found.

56 files changed:
src/inst-atk.nsi
src/inst-cairo.nsi
src/inst-dbus.nsi
src/inst-expat.nsi
src/inst-fontconfig.nsi
src/inst-freetype.nsi
src/inst-gdk-pixbuf.nsi
src/inst-gettext.nsi
src/inst-glib.nsi
src/inst-gpa.nsi
src/inst-gpg4win.nsi
src/inst-gpgex.nsi
src/inst-gpgme.nsi
src/inst-gpgol.nsi
src/inst-gtk+.nsi
src/inst-kleopatra.nsi
src/inst-libassuan.nsi
src/inst-libffi.nsi
src/inst-libgpg-error.nsi
src/inst-libiconv.nsi
src/inst-libpng.nsi
src/inst-pango.nsi
src/inst-paperkey.nsi
src/inst-pinentry.nsi
src/inst-qtbase.nsi
src/inst-sections.nsi
src/inst-w32pth.nsi
src/inst-zlib.nsi
src/uninst-atk.nsi
src/uninst-cairo.nsi
src/uninst-claws-mail-cmds.nsi
src/uninst-dbus.nsi
src/uninst-expat.nsi
src/uninst-fontconfig.nsi
src/uninst-freetype.nsi
src/uninst-gdk-pixbuf.nsi
src/uninst-gettext.nsi
src/uninst-glib.nsi
src/uninst-gpa.nsi
src/uninst-gpg4win.nsi
src/uninst-gpgex.nsi
src/uninst-gpgme.nsi
src/uninst-gpgol.nsi
src/uninst-gtk+.nsi
src/uninst-kleopatra.nsi
src/uninst-libassuan.nsi
src/uninst-libffi.nsi
src/uninst-libgpg-error.nsi
src/uninst-libiconv.nsi
src/uninst-libpng.nsi
src/uninst-pango.nsi
src/uninst-paperkey.nsi
src/uninst-pinentry.nsi
src/uninst-qtbase.nsi
src/uninst-w32pth.nsi
src/uninst-zlib.nsi

index 38f0763..2791243 100644 (file)
@@ -32,6 +32,7 @@ Section "-atk" SEC_atk
 !ifdef SOURCES
   File ${gpg4win_pkg_atk_src}
 !else
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/libatk-1.0-0.dll
 
   SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
index 5de16f0..e1468d2 100644 (file)
@@ -32,6 +32,7 @@ Section "-cairo" SEC_cairo
 !ifdef SOURCES
   File "${gpg4win_pkg_cairo_src}"
 !else
+  SetOutPath "$INSTDIR\bin"
 
   File ${prefix}/bin/libcairo-2.dll
   File ${prefix}/bin/libcairo-gobject-2.dll
index 5096d56..e213096 100644 (file)
@@ -32,7 +32,6 @@ Section "-dbus" SEC_dbus
 !ifdef SOURCES
   File "${gpg4win_pkg_dbus_src}"
 !else
-  # FIXME: Figure out how to relocate dbus-daemon (and kleopatra).
   SetOutPath "$INSTDIR\bin"
   ClearErrors
   SetOverwrite try
@@ -41,7 +40,6 @@ Section "-dbus" SEC_dbus
   IfErrors 0 +3
       File /oname=dbus-daemon.exe.tmp ${prefix}/bin/dbus-daemon.exe
       Rename /REBOOTOK dbus-daemon.exe.tmp dbus-daemon.exe
-  SetOutPath "$INSTDIR"
 
   File ${prefix}/bin/dbus-launch.exe
   File ${prefix}/bin/dbus-env.bat
index 02bed7f..3885ada 100644 (file)
@@ -32,6 +32,7 @@ Section "-expat" SEC_expat
 !ifdef SOURCES
   File "${gpg4win_pkg_expat_src}"
 !else
+  SetOutPath "$INSTDIR\bin"
 
   File ${prefix}/bin/libexpat-1.dll
 
index 60ce6f7..db0a7ca 100644 (file)
@@ -32,6 +32,7 @@ Section "-fontconfig" SEC_fontconfig
 !ifdef SOURCES
   File "${gpg4win_pkg_fontconfig_src}"
 !else
+  SetOutPath "$INSTDIR\bin"
 
   File ${prefix}/bin/libfontconfig-1.dll
   SetOutPath "$INSTDIR\etc\fonts"
index e1b9b34..404884a 100644 (file)
@@ -32,6 +32,7 @@ Section "-freetype" SEC_freetype
 !ifdef SOURCES
   File "${gpg4win_pkg_freetype_src}"
 !else
+  SetOutPath "$INSTDIR\bin"
 
   File ${prefix}/bin/freetype6.dll
 
index f755c3e..75eecb2 100644 (file)
@@ -31,6 +31,8 @@ Section "-gdk_pixbuf" SEC_gdk_pixbuf
 !ifdef SOURCES
   File ${gpg4win_pkg_gdk_pixbuf}
 !else
+  SetOutPath "$INSTDIR\bin"
+
   File ${prefix}/bin/libgdk_pixbuf-2.0-0.dll
   File ${prefix}/bin/gdk-pixbuf-query-loaders.exe
   File ${prefix}/bin/gdk-pixbuf-pixdata.exe
index 975345a..2bd3891 100644 (file)
@@ -32,6 +32,7 @@ Section "-gettext" SEC_gettext
 !ifdef SOURCES
   File ${gpg4win_pkg_gettext}
 !else
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/libintl-8.dll
   File /oname=intl.dll ${prefix}/bin/libintl-8.dll
 
index 417ed51..5932863 100644 (file)
@@ -31,6 +31,7 @@ Section "-glib" SEC_glib
 !ifdef SOURCES
   File ${gpg4win_pkg_glib}
 !else
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/gspawn-win32-helper.exe
   File ${prefix}/bin/gspawn-win32-helper-console.exe
   File ${prefix}/bin/libglib-2.0-0.dll
index aadef77..28a40cb 100644 (file)
 !ifdef SOURCES
   File "${gpg4win_pkg_gpa}"
 !else
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/gpa.exe
 
-  SetOutPath "$INSTDIR\pub"
-  File /oname=gpa.exe "${BUILD_DIR}/gpgwrap.exe"
-
   SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
   File ${prefix}/share/locale/de/LC_MESSAGES/gpa.mo
 
index 4b7c51a..6b530a9 100644 (file)
@@ -89,7 +89,7 @@ skip_uninst:
   DetailPrint "Deleted obsolete gpgProgram value"
 
   # Install gpg4win included tools
-  SetOutPath "$INSTDIR"
+  SetOutPath "$INSTDIR\bin"
   File "${BUILD_DIR}/sha1sum.exe"
   File "${BUILD_DIR}/sha256sum.exe"
   File "${BUILD_DIR}/md5sum.exe"
index 8eced8d..4f22b9e 100644 (file)
@@ -32,7 +32,7 @@ Section "-removegpgee"
 # Uninstall a previous gpgee version, if it exists.
   ifFileExists "$INSTDIR\GPGee.dll" 0 gpgex_no_gpgee
     UnRegDLL "$INSTDIR\GPGee.dll"
-    Delete /REBOOTOK "$INSTDIR\GPGee.dll"
+    Delete /REBOOTOK "$INSTDIR\bin\GPGee.dll"
     Delete /REBOOTOK "$INSTDIR\GPGee.DEU"
     Delete "$INSTDIR\GPGee.hlp"
     Delete "$INSTDIR\share\gpgee\gpl.txt"
@@ -49,6 +49,7 @@ ${MementoSection} "GpgEX" SEC_gpgex
 !ifdef SOURCES
   File "${gpg4win_pkg_gpgex}"
 !else
+  SetOutPath "$INSTDIR\bin"
 
   ClearErrors
   SetOverwrite try
@@ -61,7 +62,7 @@ ${MementoSection} "GpgEX" SEC_gpgex
  do_reg:
   # Register the DLL.
   ClearErrors
-  RegDLL "$INSTDIR\gpgex.dll"
+  RegDLL "$INSTDIR\bin\gpgex.dll"
   ifErrors 0 +2
      MessageBox MB_OK "$(T_GpgEX_RegFailed)"
 
@@ -92,7 +93,7 @@ ${MementoSection} "GpgEX" SEC_gpgex
 ${If} ${RunningX64}
 
   # Install the 64 bit version of the dll.
-  SetOutPath "$INSTDIR\bin"
+  SetOutPath "$INSTDIR\bin_64"
   ClearErrors
   SetOverwrite try
   File ${exprefix}/bin/gpgex.dll
@@ -106,7 +107,7 @@ ${If} ${RunningX64}
   # RegDLL can't be used for 64 bit and InstallLib seems to be a
   # registry hack.
   ClearErrors
-  ExecWait '"$SYSDIR\regsvr32" /s "$INSTDIR\bin\gpgex.dll"'
+  ExecWait '"$SYSDIR\regsvr32" /s "$INSTDIR\bin_64\gpgex.dll"'
   ifErrors 0 +2
      MessageBox MB_OK "$(T_GpgEX_RegFailed) (64 bit)"
 
index 8b8e8d5..9233e5c 100644 (file)
@@ -32,6 +32,7 @@ Section "-gpgme" SEC_gpgme
 !ifdef SOURCES
   File "${gpg4win_pkg_gpgme}"
 !else
+  SetOutPath "$INSTDIR\bin"
   ClearErrors
   SetOverwrite try
   File "${prefix}/bin/libgpgme-11.dll"
index d80dc59..33eeff6 100644 (file)
@@ -34,6 +34,7 @@ ${MementoSection} "GpgOL" SEC_gpgol
   File "${gpg4win_pkg_gpgol}"
 !else
 
+  SetOutPath "$INSTDIR\bin"
   ClearErrors
   SetOverwrite try
   File ${prefix}/bin/gpgol.dll
@@ -44,7 +45,7 @@ ${MementoSection} "GpgOL" SEC_gpgol
 
  do_reg:
   # Register the DLL.
-  RegDLL "$INSTDIR\gpgol.dll"
+  RegDLL "$INSTDIR\bin\gpgol.dll"
   ifErrors 0 +2
      MessageBox MB_OK "$(T_GpgOL_RegFailed)"
 
@@ -71,7 +72,7 @@ ${MementoSection} "GpgOL" SEC_gpgol
 ${If} ${RunningX64}
 
   # Install the 64 bit version of the dll.
-  SetOutPath "$INSTDIR\bin"
+  SetOutPath "$INSTDIR\bin_64"
   ClearErrors
   SetOverwrite try
   File ${exprefix}/bin/gpgol.dll
@@ -85,7 +86,7 @@ ${If} ${RunningX64}
   # RegDLL can't be used for 64 bit and InstallLib seems to be a
   # registry hack.
   ClearErrors
-  ExecWait '"$SYSDIR\regsvr32" /s "$INSTDIR\bin\gpgol.dll"'
+  ExecWait '"$SYSDIR\regsvr32" /s "$INSTDIR\bin_64\gpgol.dll"'
   ifErrors 0 +2
      MessageBox MB_OK "$(T_GpgOL_RegFailed) (64 bit)"
 ${EndIf}
index ecd5a67..2667f50 100644 (file)
@@ -32,6 +32,7 @@ Section "-gtk+" SEC_gtk_
 !ifdef SOURCES
   File "${gpg4win_pkg_gtk_}"
 !else
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/libgdk-win32-2.0-0.dll
   File ${prefix}/bin/libgtk-win32-2.0-0.dll
 
index c126d97..bab6f58 100644 (file)
@@ -35,19 +35,12 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/kleopatra.exe
   File ${prefix}/bin/kdebugdialog.exe
-  File ${prefix}/bin/kgpgconf.exe
   File ${prefix}/bin/kwatchgnupg.exe
   File ${prefix}/bin/kbuildsycoca4.exe
 
   # Path lookups are relative to libkdecore so it currently needs to be
   # in bin
   File ${prefix}/bin/libkdecore.dll
-  SetOutPath "$INSTDIR"
-  File /oname=kleopatra.exe "${BUILD_DIR}/kleowrap.exe"
-  File /oname=kdebugdialog.exe "${BUILD_DIR}/kleowrap.exe"
-  File /oname=kbuildsycoca4.exe "${BUILD_DIR}/kleowrap.exe"
-  File /oname=kgpgconf.exe "${BUILD_DIR}/kleowrap.exe"
-  File /oname=kwatchgnupg.exe "${BUILD_DIR}/kleowrap.exe"
 
 #  File ${prefix}/bin/kcmdwrapper.exe
   File ${prefix}/bin/libattica.dll
index deb338a..bba43f1 100644 (file)
@@ -34,6 +34,7 @@ Section "-libassuan" SEC_libassuan
 !ifdef SOURCES
   File "${gpg4win_pkg_libassuan}"
 !else
+  SetOutPath "$INSTDIR\bin"
   ClearErrors
   SetOverwrite try
   File "${prefix}/bin/libassuan-0.dll"
index 59ba654..2a32425 100644 (file)
@@ -31,6 +31,7 @@ Section "-libffi" SEC_libffi
 !ifdef SOURCES
   File ${gpg4win_pkg_libffi}
 !else
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/libffi-6.dll
 !endif
 SectionEnd
index fb689c3..2a6ebea 100644 (file)
@@ -33,6 +33,7 @@ Section "-libgpg-error" SEC_libgpg_error
 !ifdef SOURCES
   File "${gpg4win_pkg_libgpg_error}"
 !else
+  SetOutPath "$INSTDIR\bin"
 
   ClearErrors
   SetOverwrite try
@@ -52,7 +53,7 @@ Section "-libgpg-error" SEC_libgpg_error
   SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
   File ${prefix}/share/locale/fr/LC_MESSAGES/libgpg-error.mo
 
-  SetOutPath "$INSTDIR"
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/gpg-error.exe
 
   SetOutPath "$INSTDIR\lib"
index 814b5d3..1830e0f 100644 (file)
@@ -33,6 +33,7 @@ Section "-libiconv" SEC_libiconv
 !ifdef SOURCES
   File "${gpg4win_pkg_libiconv}"
 !else
+  SetOutPath "$INSTDIR\bin"
 
   ClearErrors
   SetOverwrite try
@@ -52,16 +53,6 @@ Section "-libiconv" SEC_libiconv
       File /oname=iconv.dll.tmp "${prefix}/bin/libiconv-2.dll"
       Rename /REBOOTOK iconv.dll.tmp iconv.dll
 
-  # Install a copy in pub; this is a bad hack and should be removed ASAP.
-  SetOutPath "$INSTDIR\pub"
-  ClearErrors
-  SetOverwrite try
-  File /oname=iconv.dll "${prefix}/bin/libiconv-2.dll"
-  SetOverwrite lastused
-  ifErrors 0 +3
-      File /oname=iconv.dll.tmp "${prefix}/bin/libiconv-2.dll"
-      Rename /REBOOTOK iconv.dll.tmp iconv.dll
-
   SetOutPath "$INSTDIR\lib"
   File ${prefix}/lib/charset.alias
 
index c03abeb..6388b85 100644 (file)
@@ -32,6 +32,7 @@ Section "-libpng" SEC_libpng
 !ifdef SOURCES
   File "${gpg4win_pkg_libpng}"
 !else
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/libpng14-14.dll
 !endif
 SectionEnd
index e028b0f..07b3193 100644 (file)
@@ -31,6 +31,7 @@ Section "-pango" SEC_pango
 !ifdef SOURCES
   File "${gpg4win_pkg_pango_src}"
 !else
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/pango-querymodules.exe
   File ${prefix}/bin/libpango-1.0-0.dll
   File ${prefix}/bin/libpangoft2-1.0-0.dll
index 27636a9..e3e219d 100644 (file)
@@ -32,6 +32,7 @@ Section "-Paperkey" SEC_paperkey
 !ifdef SOURCES
   File "${gpg4win_pkg_paperkey}"
 !else
+  SetOutPath "$INSTDIR\bin"
 
   File "${prefix}/bin/paperkey.exe"
 
index b9aa508..ec826a5 100644 (file)
@@ -34,6 +34,7 @@ Section "-Pinentry" SEC_pinentry
 !ifdef SOURCES
   File "${gpg4win_pkg_pinentry}"
 !else
+  SetOutPath "$INSTDIR\bin"
 
   File "${prefix}/bin/pinentry-w32.exe"
 !ifdef GPG4WIN_VANILLA
index da4e99b..343e7e9 100644 (file)
 !define prefix ${ipdir}/qtbase-${gpg4win_pkg_qtbase_version}
 
 !ifdef DEBUG
-Section "qtbase" SEC_qt
+Section "qtbase" SEC_qtbase
 !else
-Section "-qtbase" SEC_qt
+Section "-qtbase" SEC_qtbase
 !endif
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
   File "${gpg4win_pkg_qtbase}"
 !else
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/Qt5Core.dll
   File ${prefix}/bin/Qt5Gui.dll
   File ${prefix}/bin/Qt5Widgets.dll
index 3459753..4004cba 100644 (file)
@@ -874,7 +874,7 @@ Section "-startmenu"
     IntOp $R0 $R0 & ${SF_SELECTED}
     IntCmp $R0 ${SF_SELECTED} 0 no_gpa_menu
     CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GPA.lnk" \
-       "$INSTDIR\gpa.exe" \
+       "$INSTDIR\bin\gpa.exe" \
         "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpa)
   no_gpa_menu:
 !endif
@@ -884,7 +884,7 @@ Section "-startmenu"
     IntOp $R0 $R0 & ${SF_SELECTED}
     IntCmp $R0 ${SF_SELECTED} 0 no_kleopatra_menu
     CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Kleopatra.lnk" \
-       "$INSTDIR\kleopatra.exe" \
+       "$INSTDIR\bin\kleopatra.exe" \
         "" "$INSTDIR\bin\kleopatra.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_kleopatra)
   no_kleopatra_menu:
 !endif
index d31a40a..184929c 100644 (file)
@@ -34,6 +34,7 @@ Section "-w32pth" SEC_w32pth
 !ifdef SOURCES
   File "${gpg4win_pkg_w32pth}"
 !else
+  SetOutPath "$INSTDIR\bin"
 
   ClearErrors
   SetOverwrite try
index 1634510..1095021 100644 (file)
@@ -32,6 +32,7 @@ Section "-zlib" SEC_zlib
 !ifdef SOURCES
   File "${gpg4win_pkg_zlib}"
 !else
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/zlib1.dll
 !endif
 SectionEnd
index 1f87f7f..0df3ce8 100644 (file)
@@ -66,7 +66,7 @@ Section "-un.atk"
   RMDir "$INSTDIR\share\locale"
   RMDir "$INSTDIR\share"
 
-  Delete /REBOOTOK "$INSTDIR\libatk-1.0-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libatk-1.0-0.dll"
 
 !endif
 
index 08070b9..fe40390 100644 (file)
@@ -30,9 +30,9 @@ Section "-un.cairo"
   Push "${gpg4win_pkg_cairo_src}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\libcairo-2.dll"
-  Delete /REBOOTOK "$INSTDIR\libcairo-gobject-2.dll"
-  Delete /REBOOTOK "$INSTDIR\libcairo-script-interpreter-2.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libcairo-2.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libcairo-gobject-2.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libcairo-script-interpreter-2.dll"
 
 !endif
 SectionEnd
index ffcfe06..642cc34 100644 (file)
 
 # We delete this file from the old (and removed) jpeg package, that
 # was only installed if claws was selected.
-Delete "$INSTDIR\jpeg62.dll"
+Delete "$INSTDIR\bin\jpeg62.dll"
 
-Delete "$INSTDIR\claws-mail.exe"
+Delete "$INSTDIR\bin\claws-mail.exe"
 
 Delete "$INSTDIR\claws-mail-manual.pdf"
 
 Delete "$INSTDIR\share\claws-mail\ca-certificates.crt"
-Delete "$INSTDIR\lib\claws-mail\plugins\pgpcore.dll"
-Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\pgpcore.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\pgpinline.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.deps"
-Delete "$INSTDIR\lib\claws-mail\plugins\pgpmime.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\pgpmime.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\pgpmime.deps"
-Delete "$INSTDIR\lib\claws-mail\plugins\smime.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\smime.dll"
 Delete "$INSTDIR\lib\claws-mail\plugins\smime.deps"
-Delete "$INSTDIR\lib\claws-mail\plugins\address_keeper.dll"
-Delete "$INSTDIR\lib\claws-mail\plugins\att_remover.dll"
-Delete "$INSTDIR\lib\claws-mail\plugins\attachwarner.dll"
-Delete "$INSTDIR\lib\claws-mail\plugins\bsfilter.dll"
-Delete "$INSTDIR\lib\claws-mail\plugins\fetchinfo.dll"
-Delete "$INSTDIR\lib\claws-mail\plugins\notification.dll"
-Delete "$INSTDIR\lib\claws-mail\plugins\tnef_parse.dll"
-Delete "$INSTDIR\lib\claws-mail\plugins\rssyl.dll"
-Delete "$INSTDIR\lib\claws-mail\plugins\spamreport.dll"
-Delete "$INSTDIR\lib\claws-mail\plugins\vcalendar.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\address_keeper.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\att_remover.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\attachwarner.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\bsfilter.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\fetchinfo.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\notification.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\tnef_parse.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\rssyl.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\spamreport.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\vcalendar.dll"
 
 RMDir "$INSTDIR\lib\claws-mail\plugins"
 RMDir "$INSTDIR\lib\claws-mail"
@@ -79,22 +79,22 @@ DeleteRegKey HKLM "SOFTWARE\Clients\Mail\Claws Mail"
 DeleteRegKey HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto"
 
 ; libetpan
-Delete "$INSTDIR\libetpan-13.dll"
+Delete "$INSTDIR\bin\libetpan-13.dll"
 
 ; libxml2
-Delete "$INSTDIR\libxml2-2.dll"
+Delete "$INSTDIR\bin\libxml2-2.dll"
 
 ; regex
 # Old version.
-Delete "$INSTDIR\regex.dll"
+Delete "$INSTDIR\bin\regex.dll"
 
-Delete "$INSTDIR\libregex-1.dll"
+Delete "$INSTDIR\bin\libregex-1.dll"
 
 ; crypt had nothing to uninstall
 
 ; enchant
-Delete "$INSTDIR\libenchant-1.dll"
-Delete "$INSTDIR\lib\enchant\libenchant_myspell.dll"
+Delete "$INSTDIR\bin\libenchant-1.dll"
+Delete "$INSTDIR\bin\lib\enchant\libenchant_myspell.dll"
 
 RMDir "$INSTDIR\lib\enchant"
 RMDir "$INSTDIR\lib"
@@ -111,7 +111,7 @@ RMDir "$INSTDIR\share\enchant\myspell"
 RMDIR "$INSTDIR\share\enchant"
 
 ; gtkhtmlviewer2
-Delete "$INSTDIR\lib\claws-mail\plugins\gtkhtml2_viewer.dll"
+Delete "$INSTDIR\bin\lib\claws-mail\plugins\gtkhtml2_viewer.dll"
 RMDir "$INSTDIR\lib\claws-mail\plugins"
 RMDir "$INSTDIR\lib\claws-mail"
 Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\gtkhtml2_viewer.mo"
@@ -133,7 +133,7 @@ Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\gtkhtml2_viewer.mo"
 Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\gtkhtml2_viewer.mo"
 
 ; pthreads
-Delete "$INSTDIR\pthreadGC2.dll"
+Delete "$INSTDIR\bin\pthreadGC2.dll"
 
 RMDir "$INSTDIR\share"
 RMDir "$INSTDIR"
index 29e12c5..6688a9f 100644 (file)
@@ -30,23 +30,23 @@ Section "-un.dbus"
   Push "${gpg4win_pkg_dbus_src}"
   Call un.SourceDelete
 !else
-  # FIXME: See inst-dbus.nsi.
   Delete /REBOOTOK "$INSTDIR\bin\dbus-daemon.exe"
-  RMDir "$INSTDIR\bin"
 
-  Delete "$INSTDIR\dbus-env.bat"
-  Delete "$INSTDIR\dbus-launch.exe"
-  Delete "$INSTDIR\dbus-monitor.exe"
-  Delete "$INSTDIR\dbus-send.exe"
+  Delete "$INSTDIR\bin\dbus-env.bat"
+  Delete "$INSTDIR\bin\dbus-launch.exe"
+  Delete "$INSTDIR\bin\dbus-monitor.exe"
+  Delete "$INSTDIR\bin\dbus-send.exe"
 
   # FIXME: Force dbus installed in our prefix down.
-  Delete /REBOOTOK "$INSTDIR\libdbus-1.dll"
-  Delete /REBOOTOK "$INSTDIR\libexpat.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libdbus-1.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libexpat.dll"
 
   Delete "$INSTDIR\etc\session.conf"
   Delete "$INSTDIR\etc\system.conf"
   RMDir "$INSTDIR\etc"
 
+  RMDir "$INSTDIR\bin"
+
   RMDir "$INSTDIR"
 !endif
 SectionEnd
index f203d8d..4d70966 100644 (file)
@@ -30,6 +30,6 @@ Section "-un.expat"
   Push "${gpg4win_pkg_expat_src}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\libexpat-1.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libexpat-1.dll"
 !endif
 SectionEnd
index c1b5a23..6acbf4c 100644 (file)
@@ -30,7 +30,7 @@ Section "-un.fontconfig"
   Push "${gpg4win_pkg_fontconfig_src}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\libfontconfig-1.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libfontconfig-1.dll"
   Delete "$INSTDIR\etc\fonts\fonts.conf"
   RMDir "$INSTDIR\etc\fonts"
 
index 19bb778..d07bfd2 100644 (file)
@@ -30,6 +30,6 @@ Section "-un.freetype"
   Push "${gpg4win_pkg_freetype_src}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\freetype6.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\freetype6.dll"
 !endif
 SectionEnd
index 691f8c2..2fd82aa 100644 (file)
@@ -30,9 +30,9 @@ Section "-un.gdk_pixbuf"
   Call un.SourceDelete
 !else
 
-  Delete /REBOOTOK "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
-  Delete "$INSTDIR\gdk-pixbuf-query-loaders.exe"
-  Delete "$INSTDIR\gdk-pixbuf-pixdata.exe"
+  Delete /REBOOTOK "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll"
+  Delete "$INSTDIR\bin\gdk-pixbuf-query-loaders.exe"
+  Delete "$INSTDIR\bin\gdk-pixbuf-pixdata.exe"
 
 !endif
 SectionEnd
index 001d527..f04eafe 100644 (file)
@@ -30,13 +30,13 @@ Section "-un.gettext"
   Push "${gpg4win_pkg_gettext}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\libintl-8.dll"
-  Delete /REBOOTOK "$INSTDIR\intl.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libintl-8.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\intl.dll"
 !ifdef DEBUG
-  Delete "$INSTDIR\gettext.exe"
-  Delete "$INSTDIR\ngettext.exe"
-  Delete "$INSTDIR\envsubst.exe"
-  Delete "$INSTDIR\asprintf.dll"
+  Delete "$INSTDIR\bin\gettext.exe"
+  Delete "$INSTDIR\bin\ngettext.exe"
+  Delete "$INSTDIR\bin\envsubst.exe"
+  Delete "$INSTDIR\bin\asprintf.dll"
 !endif
   RMDir "$INSTDIR"
 !endif
index 6f2f84f..062ddbd 100644 (file)
@@ -40,24 +40,24 @@ Section "-un.glib"
   RMDir "$INSTDIR\share\glib-2.0\schemas"
   RMDir "$INSTDIR\share\glib-2.0"
 
-  Delete "$INSTDIR\gspawn-win32-helper.exe"
-  Delete "$INSTDIR\gspawn-win32-helper-console.exe"
-  Delete "$INSTDIR\gdbus.exe"
-  Delete "$INSTDIR\gio-querymodules.exe"
-  Delete "$INSTDIR\glib-compile-resources.exe"
-  Delete "$INSTDIR\glib-compile-schemas.exe"
-  Delete "$INSTDIR\glib-genmarshal.exe"
-  Delete "$INSTDIR\gobject-query.exe"
-  Delete "$INSTDIR\gresource.exe"
-  Delete "$INSTDIR\gsettings.exe"
-  Delete "$INSTDIR\gspawn-win32-helper-console.exe"
-  Delete "$INSTDIR\gspawn-win32-helper.exe"
-
-  Delete /REBOOTOK "$INSTDIR\libglib-2.0-0.dll"
-  Delete /REBOOTOK "$INSTDIR\libgmodule-2.0-0.dll"
-  Delete /REBOOTOK "$INSTDIR\libgobject-2.0-0.dll"
-  Delete /REBOOTOK "$INSTDIR\libgthread-2.0-0.dll"
-  Delete /REBOOTOK "$INSTDIR\libgio-2.0-0.dll"
+  Delete "$INSTDIR\bin\gspawn-win32-helper.exe"
+  Delete "$INSTDIR\bin\gspawn-win32-helper-console.exe"
+  Delete "$INSTDIR\bin\gdbus.exe"
+  Delete "$INSTDIR\bin\gio-querymodules.exe"
+  Delete "$INSTDIR\bin\glib-compile-resources.exe"
+  Delete "$INSTDIR\bin\glib-compile-schemas.exe"
+  Delete "$INSTDIR\bin\glib-genmarshal.exe"
+  Delete "$INSTDIR\bin\gobject-query.exe"
+  Delete "$INSTDIR\bin\gresource.exe"
+  Delete "$INSTDIR\bin\gsettings.exe"
+  Delete "$INSTDIR\bin\gspawn-win32-helper-console.exe"
+  Delete "$INSTDIR\bin\gspawn-win32-helper.exe"
+
+  Delete /REBOOTOK "$INSTDIR\bin\libglib-2.0-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libgmodule-2.0-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libgobject-2.0-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libgthread-2.0-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libgio-2.0-0.dll"
 
 !endif
 SectionEnd
index e80ec85..8b58177 100644 (file)
@@ -30,8 +30,7 @@ Section "-un.gpa"
   Push "${gpg4win_pkg_gpa}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\gpa.exe"
-  Delete /REBOOTOK "$INSTDIR\pub\gpa.exe"
+  Delete /REBOOTOK "$INSTDIR\bin\gpa.exe"
 
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gpa.mo"
   Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\gpa.mo"
index ba54fd4..22820e7 100644 (file)
@@ -31,15 +31,15 @@ Section "-un.gpg4win"
   Call un.RemoveFromPath
 
   # Delete gpg4win included tools
-  Delete "$INSTDIR\sha1sum.exe"
-  Delete "$INSTDIR\sha256sum.exe"
-  Delete "$INSTDIR\md5sum.exe"
-  Delete "$INSTDIR\mkportable.exe"
+  Delete "$INSTDIR\bin\sha1sum.exe"
+  Delete "$INSTDIR\bin\sha256sum.exe"
+  Delete "$INSTDIR\bin\md5sum.exe"
+  Delete "$INSTDIR\bin\mkportable.exe"
 
   # Delete the runtime libaries
-  Delete "$INSTDIR\libstdc++-6.dll"
-  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
-  Delete "$INSTDIR\libwinpthread-1.dll"
+  Delete "$INSTDIR\bin\libstdc++-6.dll"
+  Delete "$INSTDIR\bin\libgcc_s_sjlj-1.dll"
+  Delete "$INSTDIR\bin\libwinpthread-1.dll"
 
   # Delete standard stuff.
   Delete "$INSTDIR\share\gpg4win\README.*.txt"
@@ -132,7 +132,7 @@ Section "-un.gpg4win"
 
   # Try again to remove the scdaemon.  This is useful because scdaemon
   # needs some time to stop after gpg-agent has been stopped.
-  Delete "$INSTDIR\scdaemon.exe"
+  Delete "$INSTDIR\bin\scdaemon.exe"
 
   # Try to remove other top directories.
   RMDir "$INSTDIR\lib"
index f0a79a9..a8d4c2a 100644 (file)
@@ -65,13 +65,13 @@ Section "-un.gpgex"
   RMDir "$INSTDIR\share\locale"
   RMDir "$INSTDIR\share"
 
-  UnRegDLL "$INSTDIR\gpgex.dll"
+  UnRegDLL "$INSTDIR\bin\gpgex.dll"
 
-  Delete /REBOOTOK "$INSTDIR\gpgex.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\gpgex.dll"
 
 ${If} ${RunningX64}
-  ExecWait '"$SYSDIR\regsvr32" /u /s "$INSTDIR\bin\gpgex.dll"'
-  Delete /REBOOTOK "$INSTDIR\bin\gpgex.dll"
+  ExecWait '"$SYSDIR\regsvr32" /u /s "$INSTDIR\bin_64\gpgex.dll"'
+  Delete /REBOOTOK "$INSTDIR\bin_64\gpgex.dll"
 ${EndIf}
 
 !endif
index b650b4c..fabcf9c 100644 (file)
@@ -30,10 +30,10 @@ Section "-un.gpgme"
   Push "${gpg4win_pkg_gpgme}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\libgpgme-11.dll"
-  Delete /REBOOTOK "$INSTDIR\libgpgme-glib-11.dll"
-  Delete /REBOOTOK "$INSTDIR\libgpgme-qt-11.dll"
-  Delete "$INSTDIR\gpgme-w32spawn.exe"
+  Delete /REBOOTOK "$INSTDIR\bin\libgpgme-11.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libgpgme-glib-11.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libgpgme-qt-11.dll"
+  Delete "$INSTDIR\bin\gpgme-w32spawn.exe"
   Delete "$INSTDIR\lib\libgpgme.imp"
   Delete "$INSTDIR\lib\libgpgme-glib.imp"
   Delete "$INSTDIR\include\gpgme.h"
index 0f6be8b..9f02550 100644 (file)
@@ -59,13 +59,13 @@ Section "-un.gpgol"
   RMDir "$INSTDIR\share\locale"
   RMDir "$INSTDIR\share\"
 
-  UnRegDLL "$INSTDIR\gpgol.dll"
+  UnRegDLL "$INSTDIR\bin\gpgol.dll"
 
-  Delete /REBOOTOK "$INSTDIR\gpgol.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\gpgol.dll"
 
 ${If} ${RunningX64}
-  ExecWait '"$SYSDIR\regsvr32" /u /s "$INSTDIR\bin\gpgol.dll"'
-  Delete /REBOOTOK "$INSTDIR\bin\gpgol.dll"
+  ExecWait '"$SYSDIR\regsvr32" /u /s "$INSTDIR\bin_64\gpgol.dll"'
+  Delete /REBOOTOK "$INSTDIR\bin_64\gpgol.dll"
 ${EndIf}
   RMDir "$INSTDIR"
 !endif
index bb83c6d..671a158 100644 (file)
@@ -31,13 +31,13 @@ Section "-un.gtk+"
   Call un.SourceDelete
 !else
 
-  Delete /REBOOTOK "$INSTDIR\libgdk-win32-2.0-0.dll"
-  Delete /REBOOTOK "$INSTDIR\libgtk-win32-2.0-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libgdk-win32-2.0-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libgtk-win32-2.0-0.dll"
 
-  Delete /REBOOTOK "$INSTDIR\libgailutil-18.dll"
-  Delete "$INSTDIR\gtk-query-immodules-2.0.exe"
+  Delete /REBOOTOK "$INSTDIR\bin\libgailutil-18.dll"
+  Delete "$INSTDIR\bin\gtk-query-immodules-2.0.exe"
 
-  Delete "$INSTDIR\gtk-update-icon-cache.exe"
+  Delete "$INSTDIR\bin\gtk-update-icon-cache.exe"
 
   Delete "$INSTDIR\etc\gtk-2.0\gdk-pixbuf.loaders"
   Delete "$INSTDIR\etc\gtk-2.0\gtk.immodules"
index ff07a80..ad6e8f9 100644 (file)
@@ -43,12 +43,6 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\bin\libkdecore.dll"
   RMDir "$INSTDIR\bin"
 
-  Delete "$INSTDIR\kleopatra.exe"
-  Delete "$INSTDIR\kwatchgnupg.exe"
-  Delete "$INSTDIR\kgpgconf.exe"
-  Delete "$INSTDIR\kbuildsycoca4.exe"
-  Delete "$INSTDIR\kdebugdialog.exe"
-
   Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfolders.desktop"
   Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfiles.desktop"
   Delete "$INSTDIR\share\kde4\services\kleopatra_decryptverifyfolders.desktop"
@@ -204,36 +198,36 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\applications\kde4\kleopatra.desktop"
   Delete "$INSTDIR\lib\kde4\kcm_kleopatra.dll"
   Delete "$INSTDIR\lib\kde4\kded_globalaccel.dll"
-  Delete "$INSTDIR\libkleopatraclientgui.dll"
-  Delete "$INSTDIR\libkleopatraclientcore.dll"
-  Delete "$INSTDIR\libkleo.dll"
-  Delete "$INSTDIR\libattica.dll"
-  Delete "$INSTDIR\libdbusmenu-qt.dll"
-  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
-  Delete "$INSTDIR\libgpgme++.dll"
-  Delete "$INSTDIR\libintl.dll"
-  Delete "$INSTDIR\libkcmutils.dll"
-  Delete "$INSTDIR\libkdeui.dll"
-  Delete "$INSTDIR\libkdewin.dll"
-  Delete "$INSTDIR\libkleo.dll"
-  Delete "$INSTDIR\libkleopatraclientcore.dll"
-  Delete "$INSTDIR\libkleopatraclientgui.dll"
-  Delete "$INSTDIR\libkmime.dll"
-  Delete "$INSTDIR\libqgpgme.dll"
+  Delete "$INSTDIR\bin\libkleopatraclientgui.dll"
+  Delete "$INSTDIR\bin\libkleopatraclientcore.dll"
+  Delete "$INSTDIR\bin\libkleo.dll"
+  Delete "$INSTDIR\bin\libattica.dll"
+  Delete "$INSTDIR\bin\libdbusmenu-qt.dll"
+  Delete "$INSTDIR\bin\libgcc_s_sjlj-1.dll"
+  Delete "$INSTDIR\bin\libgpgme++.dll"
+  Delete "$INSTDIR\bin\libintl.dll"
+  Delete "$INSTDIR\bin\libkcmutils.dll"
+  Delete "$INSTDIR\bin\libkdeui.dll"
+  Delete "$INSTDIR\bin\libkdewin.dll"
+  Delete "$INSTDIR\bin\libkleo.dll"
+  Delete "$INSTDIR\bin\libkleopatraclientcore.dll"
+  Delete "$INSTDIR\bin\libkleopatraclientgui.dll"
+  Delete "$INSTDIR\bin\libkmime.dll"
+  Delete "$INSTDIR\bin\libqgpgme.dll"
 
   # Parts formerly in the kdelibs section
 
-  Delete "$INSTDIR\kded_globalaccel.dll"
-  Delete "$INSTDIR\libkdeui.dll"
-  Delete "$INSTDIR\libkdecore.dll"
-  Delete "$INSTDIR\libkcmutils.dll"
-  Delete "$INSTDIR\libqgpgme.dll"
-  Delete "$INSTDIR\libkmime.dll"
-  Delete "$INSTDIR\libgpgme++.dll"
-  Delete "$INSTDIR\libgpgme++-qt.dll"
-  Delete "$INSTDIR\libgpgme++-glib.dll"
+  Delete "$INSTDIR\bin\kded_globalaccel.dll"
+  Delete "$INSTDIR\bin\libkdeui.dll"
+  Delete "$INSTDIR\bin\libkdecore.dll"
+  Delete "$INSTDIR\bin\libkcmutils.dll"
+  Delete "$INSTDIR\bin\libqgpgme.dll"
+  Delete "$INSTDIR\bin\libkmime.dll"
+  Delete "$INSTDIR\bin\libgpgme++.dll"
+  Delete "$INSTDIR\bin\libgpgme++-qt.dll"
+  Delete "$INSTDIR\bin\libgpgme++-glib.dll"
   # Old (but correct) location, better delete it too.
-  Delete "$INSTDIR\kbuildsycoca4.exe"
+  Delete "$INSTDIR\bin\kbuildsycoca4.exe"
 
   Delete "$INSTDIR\share\locale\all_languages"
 
@@ -345,23 +339,23 @@ Section "-un.kleopatra"
 
   # Files installed by old versions, mainly from the former
   # kdesupport package
-  Delete "$INSTDIR\giflib4.dll"
-  Delete "$INSTDIR\libexpatw.dll"
-  Delete "$INSTDIR\libexslt.dll"
-  Delete "$INSTDIR\libkdewin32.dll"
-  Delete "$INSTDIR\libxml2.dll"
-  Delete "$INSTDIR\libxslt.dll"
-  Delete "$INSTDIR\mingw-pcrecpp.dll"
-  Delete "$INSTDIR\mingwm10.dll"
-  Delete "$INSTDIR\pcre.dll"
-  Delete "$INSTDIR\pcrecpp.dll"
-  Delete "$INSTDIR\pcregrep.exe"
-  Delete "$INSTDIR\pcreposix.dll"
-  Delete "$INSTDIR\update-mime-database.exe"
-  Delete "$INSTDIR\xmlcatalog.exe"
-  Delete "$INSTDIR\xmllint.exe"
-  Delete "$INSTDIR\xsltproc.exe"
-  Delete "$INSTDIR\bin\kcmdwrapper.exe"
+  Delete "$INSTDIR\bin\giflib4.dll"
+  Delete "$INSTDIR\bin\libexpatw.dll"
+  Delete "$INSTDIR\bin\libexslt.dll"
+  Delete "$INSTDIR\bin\libkdewin32.dll"
+  Delete "$INSTDIR\bin\libxml2.dll"
+  Delete "$INSTDIR\bin\libxslt.dll"
+  Delete "$INSTDIR\bin\mingw-pcrecpp.dll"
+  Delete "$INSTDIR\bin\mingwm10.dll"
+  Delete "$INSTDIR\bin\pcre.dll"
+  Delete "$INSTDIR\bin\pcrecpp.dll"
+  Delete "$INSTDIR\bin\pcregrep.exe"
+  Delete "$INSTDIR\bin\pcreposix.dll"
+  Delete "$INSTDIR\bin\update-mime-database.exe"
+  Delete "$INSTDIR\bin\xmlcatalog.exe"
+  Delete "$INSTDIR\bin\xmllint.exe"
+  Delete "$INSTDIR\bin\xsltproc.exe"
+  Delete "$INSTDIR\bin\bin\kcmdwrapper.exe"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdelibs.mo"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepim.mo"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepimlibs.mo"
index aea64e0..ea48649 100644 (file)
@@ -31,7 +31,7 @@ Section "-un.libassuan"
   Push "${gpg4win_pkg_libassuan}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\libassuan-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libassuan-0.dll"
   Delete "$INSTDIR\lib\libassuan.imp"
   Delete "$INSTDIR\include\assuan.h"
 
index 5171e8b..20429c2 100644 (file)
@@ -30,10 +30,10 @@ Section "-un.libffi"
   Call un.SourceDelete
 !else
 
-  Delete /REBOOTOK "$INSTDIR\libffi-6.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libffi-6.dll"
 
 # Also delete any left-over old libffi version.
-  Delete "$INSTDIR\libffi-5.dll"
+  Delete "$INSTDIR\bin\libffi-5.dll"
 
 !endif
 SectionEnd
index 55a3993..6f5615c 100644 (file)
@@ -30,14 +30,14 @@ Section "-un.libgpg-error"
   Push "${gpg4win_pkg_libgpg_error}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\libgpg-error-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libgpg-error-0.dll"
 
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libgpg-error.mo"
   Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\libgpg-error.mo"
   Delete "$INSTDIR\share\locale\ro\LC_MESSAGES\libgpg-error.mo"
   Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\libgpg-error.mo"
 
-  Delete "$INSTDIR\gpg-error.exe"
+  Delete "$INSTDIR\bin\gpg-error.exe"
   Delete "$INSTDIR\lib\libgpg-error.imp"
   Delete "$INSTDIR\lib\libgpg-assuan.imp"
   Delete "$INSTDIR\include\gpg-error.h"
index 21b3e80..9cb0455 100644 (file)
@@ -30,14 +30,14 @@ Section "-un.libiconv"
   Push "${gpg4win_pkg_libiconv}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\libiconv-2.dll"
-  Delete /REBOOTOK "$INSTDIR\iconv.dll"
-  Delete /REBOOTOK "$INSTDIR\pub\iconv.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libiconv-2.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\iconv.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\pub\iconv.dll"
 
   Delete "$INSTDIR\lib\charset.alias"
 !ifdef DEBUG
-  Delete "$INSTDIR\charset.dll"
-  Delete "$INSTDIR\iconv.exe"
+  Delete "$INSTDIR\bin\charset.dll"
+  Delete "$INSTDIR\bin\iconv.exe"
 !endif
   RMDir "$INSTDIR"
 !endif
index 947fdbe..23f1d5e 100644 (file)
@@ -31,11 +31,11 @@ Section "-un.libpng"
   Call un.SourceDelete
 !else
 
-  Delete /REBOOTOK "$INSTDIR\libpng14-14.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libpng14-14.dll"
 
   # Old versions:
-  Delete "$INSTDIR\libpng13.dll"
-  Delete "$INSTDIR\libpng12-0.dll"
+  Delete "$INSTDIR\bin\libpng13.dll"
+  Delete "$INSTDIR\bin\libpng12-0.dll"
 
   RMDir "$INSTDIR"
 !endif
index 416ea79..4658d1f 100644 (file)
@@ -29,11 +29,11 @@ Section "-un.pango"
   Push "${gpg4win_pkg_pango_src}"
   Call un.SourceDelete
 !else
-  Delete "$INSTDIR\pango-querymodules.exe"
-  Delete /REBOOTOK "$INSTDIR\libpango-1.0-0.dll"
-  Delete /REBOOTOK "$INSTDIR\libpangoft2-1.0-0.dll"
-  Delete /REBOOTOK "$INSTDIR\libpangowin32-1.0-0.dll"
-  Delete /REBOOTOK "$INSTDIR\libpangocairo-1.0-0.dll"
+  Delete "$INSTDIR\bin\pango-querymodules.exe"
+  Delete /REBOOTOK "$INSTDIR\bin\libpango-1.0-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libpangoft2-1.0-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libpangowin32-1.0-0.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libpangocairo-1.0-0.dll"
 
 
   Delete "$INSTDIR\etc\pango\pango.modules"
@@ -41,16 +41,16 @@ Section "-un.pango"
   RMDir "$INSTDIR\etc"
 
 # Remove stuff from old Pango versions.
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-arabic-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-basic-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-basic-win32.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-hangul-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-hebrew-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-indic-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-khmer-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-syriac-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-thai-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-tibetan-fc.dll"
+  Delete "$INSTDIR\bin\lib\pango\1.4.0\modules\pango-arabic-fc.dll"
+  Delete "$INSTDIR\bin\lib\pango\1.4.0\modules\pango-basic-fc.dll"
+  Delete "$INSTDIR\bin\lib\pango\1.4.0\modules\pango-basic-win32.dll"
+  Delete "$INSTDIR\bin\lib\pango\1.4.0\modules\pango-hangul-fc.dll"
+  Delete "$INSTDIR\bin\lib\pango\1.4.0\modules\pango-hebrew-fc.dll"
+  Delete "$INSTDIR\bin\lib\pango\1.4.0\modules\pango-indic-fc.dll"
+  Delete "$INSTDIR\bin\lib\pango\1.4.0\modules\pango-khmer-fc.dll"
+  Delete "$INSTDIR\bin\lib\pango\1.4.0\modules\pango-syriac-fc.dll"
+  Delete "$INSTDIR\bin\lib\pango\1.4.0\modules\pango-thai-fc.dll"
+  Delete "$INSTDIR\bin\lib\pango\1.4.0\modules\pango-tibetan-fc.dll"
   RMDir "$INSTDIR\lib\pango\1.4.0\modules"
   RMDir "$INSTDIR\lib\pango\1.4.0"
   RMDir "$INSTDIR\lib\pango"
index ce54698..ae711e2 100644 (file)
@@ -28,7 +28,7 @@ Section "-un.paperkey"
   Push "${gpg4win_pkg_paperkey}"
   Call un.SourceDelete
 !else
-  Delete "$INSTDIR\paperkey.exe"
+  Delete "$INSTDIR\bin\paperkey.exe"
   Delete "$INSTDIR\share\gnupg\paperkey.man"
   RMDir "$INSTDIR\share\gnupg"
 !endif
index 785b3af..7b3f4a0 100644 (file)
@@ -31,10 +31,10 @@ Section "-un.pinentry"
   Push "${gpg4win_pkg_pinentry}"
   Call un.SourceDelete
 !else
-  Delete "$INSTDIR\pinentry-w32.exe"
-  Delete "$INSTDIR\pinentry-gtk-2.exe"
-  Delete "$INSTDIR\pinentry-qt.exe"
-  Delete "$INSTDIR\pinentry.exe"
+  Delete "$INSTDIR\bin\pinentry-w32.exe"
+  Delete "$INSTDIR\bin\pinentry-gtk-2.exe"
+  Delete "$INSTDIR\bin\pinentry-qt.exe"
+  Delete "$INSTDIR\bin\pinentry.exe"
 
   RMDir "$INSTDIR"
 !endif
index 3228e37..326e882 100644 (file)
@@ -31,9 +31,9 @@ Section "-un.qtbase"
   Push "${gpg4win_pkg_qtbase_src}"
   Call un.SourceDelete
 !else
-  Delete "$INSTDIR\Qt5Core.dll"
-  Delete "$INSTDIR\Qt5Gui.dll"
-  Delete "$INSTDIR\Qt5Widgets.dll"
+  Delete "$INSTDIR\bin\Qt5Core.dll"
+  Delete "$INSTDIR\bin\Qt5Gui.dll"
+  Delete "$INSTDIR\bin\Qt5Widgets.dll"
 
   Delete "$INSTDIR\platforms\qwindows.dll"
 
index 570cc60..13f6228 100644 (file)
@@ -31,7 +31,7 @@ Section "-un.w32pth"
   Push "${gpg4win_pkg_w32pth}"
   Call un.SourceDelete
 !else
-  Delete "$INSTDIR\libw32pth-0.dll"
+  Delete "$INSTDIR\bin\libw32pth-0.dll"
   RMDir "$INSTDIR"
 !endif
 SectionEnd
index b348619..36dfad9 100644 (file)
@@ -30,7 +30,7 @@ Section "-un.zlib"
   Push "${gpg4win_pkg_zlib}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\zlib1.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\zlib1.dll"
 
 !endif
 SectionEnd