From 789dcfa0eb1632d66e0b41ceb374037f802b6e6d Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 4 Jun 2020 19:01:03 +0200 Subject: [PATCH] Update windows nsi --- dist/windows/clementine.nsi.in | 150 ++++++++++++++++++++++----------- 1 file changed, 102 insertions(+), 48 deletions(-) diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in index b2a119f91..ed40c1507 100644 --- a/dist/windows/clementine.nsi.in +++ b/dist/windows/clementine.nsi.in @@ -261,6 +261,41 @@ Section "Delete old files" oldfiles ; Versioned FLAC DLL Delete "$INSTDIR\libFLAC.dll" + + ; Unused files that have not been uninstalled previously. + Delete "$INSTDIR\mingwm10.dll" + Delete "$INSTDIR\pthreadGC2.dll" + Delete "$INSTDIR\libeay32.dll" + Delete "$INSTDIR\ssleay32.dll" + Delete "$INSTDIR\libffi-6.dll" + Delete "$INSTDIR\libnettle-4-6.dll" + Delete "$INSTDIR\libnettle-6.dll" + Delete "$INSTDIR\libhogweed-4.dll" + Delete "$INSTDIR\libmad.dll" + Delete "$INSTDIR\libqjson.dll" + Delete "$INSTDIR\libid3tag.dll" + Delete "$INSTDIR\libgstcontroller-1.0-0.dll" + Delete "$INSTDIR\libprotobuf-9.dll" + Delete "$INSTDIR\libcdio-16.dll" + Delete "$INSTDIR\libfaad.dll" + Delete "$INSTDIR\libfaac.dll" + Delete "$INSTDIR\liblastfm.dll" + Delete "$INSTDIR\QtCore4.dll" + Delete "$INSTDIR\QtGui4.dll" + Delete "$INSTDIR\QtNetwork4.dll" + Delete "$INSTDIR\QtOpenGL4.dll" + Delete "$INSTDIR\QtSql4.dll" + Delete "$INSTDIR\QtSvg4.dll" + Delete "$INSTDIR\QtXml4.dll" + Delete "$INSTDIR\Qt5Svg.dll" + Delete "$INSTDIR\Qt5XmlPatterns.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstdirectsoundsink.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstsouphttpsrc.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstfaac.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstmad.dll" + Delete "$INSTDIR\imageformats\qgif4.dll" + Delete "$INSTDIR\imageformats\qjpeg4.dll" + SectionEnd Section "Clementine" Clementine @@ -271,11 +306,11 @@ Section "Clementine" Clementine File "clementine-spotifyblob.exe" File "clementine.ico" File "glew32.dll" - File "libcdio-16.dll" + File "libcdio-19.dll" File "libchromaprint.dll" - File "libeay32.dll" - File "libfaad.dll" - File "libffi-6.dll" + File "libcrypto-1_1.dll" + File "libfaad-2.dll" + File "libffi-7.dll" File "libfftw3-3.dll" File "libFLAC-8.dll" File "libgcc_s_sjlj-1.dll" @@ -291,7 +326,6 @@ Section "Clementine" Clementine File "libgstapp-1.0-0.dll" File "libgstaudio-1.0-0.dll" File "libgstbase-1.0-0.dll" - File "libgstcontroller-1.0-0.dll" File "libgstfft-1.0-0.dll" File "libgstnet-1.0-0.dll" File "libgstpbutils-1.0-0.dll" @@ -303,32 +337,35 @@ Section "Clementine" Clementine File "libgsttag-1.0-0.dll" File "libgstvideo-1.0-0.dll" File "libgthread-2.0-0.dll" - File "libhogweed-4.dll" + File "libhogweed-6.dll" File "libiconv-2.dll" - File "libid3tag.dll" File "libintl-8.dll" File "liblastfm5.dll" - File "libmad.dll" File "libmms-0.dll" File "libmp3lame-0.dll" - File "libnettle-6.dll" + File "libnettle-8.dll" File "libogg-0.dll" File "liboil-0.3-0.dll" + File "libopus-0.dll" File "liborc-0.4-0.dll" File "liborc-test-0.4-0.dll" File "libp11-kit-0.dll" + File "libpcre-1.dll" File "libplist.dll" - File "libpsl-5.dll" File "libprotobuf-17.dll" + File "libpsl-5.dll" File "libsoup-2.4-1.dll" File "libspeex-1.dll" File "libspotify.dll" + File "libssl-1_1.dll" File "libsqlite3-0.dll" File "libstdc++-6.dll" File "libtag.dll" File "libtasn1-6.dll" + File "libunistring-2.dll" File "libvorbis-0.dll" File "libvorbisenc-2.dll" + File "libwavpack-1.dll" File "libwinpthread-1.dll" File "libxml2-2.dll" File "Qt5Concurrent.dll" @@ -337,12 +374,9 @@ Section "Clementine" Clementine File "Qt5Network.dll" File "Qt5OpenGL.dll" File "Qt5Sql.dll" - File "Qt5Svg.dll" File "Qt5Widgets.dll" File "Qt5WinExtras.dll" File "Qt5Xml.dll" - File "Qt5XmlPatterns.dll" - File "ssleay32.dll" File "zlib1.dll" ; Create data folder to enable portable mode @@ -429,9 +463,11 @@ SectionEnd Section "Gstreamer plugins" gstreamer-plugins SetOutPath "$INSTDIR\gstreamer-plugins" + File "/oname=libgstaiff.dll" "gstreamer-plugins\libgstaiff.dll" File "/oname=libgstapetag.dll" "gstreamer-plugins\libgstapetag.dll" File "/oname=libgstapp.dll" "gstreamer-plugins\libgstapp.dll" File "/oname=libgstasf.dll" "gstreamer-plugins\libgstasf.dll" + File "/oname=libgstasfmux.dll" "gstreamer-plugins\libgstasfmux.dll" File "/oname=libgstaudioconvert.dll" "gstreamer-plugins\libgstaudioconvert.dll" File "/oname=libgstaudiofx.dll" "gstreamer-plugins\libgstaudiofx.dll" File "/oname=libgstaudioparsers.dll" "gstreamer-plugins\libgstaudioparsers.dll" @@ -440,7 +476,7 @@ Section "Gstreamer plugins" gstreamer-plugins File "/oname=libgstautodetect.dll" "gstreamer-plugins\libgstautodetect.dll" File "/oname=libgstcdio.dll" "gstreamer-plugins\libgstcdio.dll" File "/oname=libgstcoreelements.dll" "gstreamer-plugins\libgstcoreelements.dll" - File "/oname=libgstdirectsoundsink.dll" "gstreamer-plugins\libgstdirectsoundsink.dll" + File "/oname=libgstdirectsound.dll" "gstreamer-plugins\libgstdirectsound.dll" File "/oname=libgstequalizer.dll" "gstreamer-plugins\libgstequalizer.dll" File "/oname=libgstfaad.dll" "gstreamer-plugins\libgstfaad.dll" File "/oname=libgstflac.dll" "gstreamer-plugins\libgstflac.dll" @@ -448,15 +484,20 @@ Section "Gstreamer plugins" gstreamer-plugins File "/oname=libgstgio.dll" "gstreamer-plugins\libgstgio.dll" File "/oname=libgsticydemux.dll" "gstreamer-plugins\libgsticydemux.dll" File "/oname=libgstid3demux.dll" "gstreamer-plugins\libgstid3demux.dll" + File "/oname=libgstid3tag.dll" "gstreamer-plugins\libgstid3tag.dll" File "/oname=libgstisomp4.dll" "gstreamer-plugins\libgstisomp4.dll" File "/oname=libgstlame.dll" "gstreamer-plugins\libgstlame.dll" File "/oname=libgstlibav.dll" "gstreamer-plugins\libgstlibav.dll" - File "/oname=libgstmad.dll" "gstreamer-plugins\libgstmad.dll" File "/oname=libgstmms.dll" "gstreamer-plugins\libgstmms.dll" File "/oname=libgstogg.dll" "gstreamer-plugins\libgstogg.dll" + File "/oname=libgstopus.dll" "gstreamer-plugins\libgstopus.dll" + File "/oname=libgstopusparse.dll" "gstreamer-plugins\libgstopusparse.dll" + File "/oname=libgstpbtypes.dll" "gstreamer-plugins\libgstpbtypes.dll" File "/oname=libgstplayback.dll" "gstreamer-plugins\libgstplayback.dll" File "/oname=libgstreplaygain.dll" "gstreamer-plugins\libgstreplaygain.dll" - File "/oname=libgstsouphttpsrc.dll" "gstreamer-plugins\libgstsouphttpsrc.dll" + File "/oname=libgstrtp.dll" "gstreamer-plugins\libgstrtp.dll" + File "/oname=libgstrtsp.dll" "gstreamer-plugins\libgstrtsp.dll" + File "/oname=libgstsoup.dll" "gstreamer-plugins\libgstsoup.dll" File "/oname=libgstspectrum.dll" "gstreamer-plugins\libgstspectrum.dll" File "/oname=libgstspeex.dll" "gstreamer-plugins\libgstspeex.dll" File "/oname=libgsttaglib.dll" "gstreamer-plugins\libgsttaglib.dll" @@ -465,6 +506,7 @@ Section "Gstreamer plugins" gstreamer-plugins File "/oname=libgstudp.dll" "gstreamer-plugins\libgstudp.dll" File "/oname=libgstvolume.dll" "gstreamer-plugins\libgstvolume.dll" File "/oname=libgstvorbis.dll" "gstreamer-plugins\libgstvorbis.dll" + File "/oname=libgstwavpack.dll" "gstreamer-plugins\libgstwavpack.dll" File "/oname=libgstwavparse.dll" "gstreamer-plugins\libgstwavparse.dll" SectionEnd @@ -1090,19 +1132,18 @@ Section "Uninstall" Abort completed: - + ; Delete all the files - Delete "$INSTDIR\clementine.ico" Delete "$INSTDIR\clementine.exe" Delete "$INSTDIR\clementine-tagreader.exe" Delete "$INSTDIR\clementine-spotifyblob.exe" + Delete "$INSTDIR\clementine.ico" Delete "$INSTDIR\glew32.dll" - Delete "$INSTDIR\libcdio-16.dll" + Delete "$INSTDIR\libcdio-19.dll" + Delete "$INSTDIR\libcrypto-1_1.dll" Delete "$INSTDIR\libchromaprint.dll" - Delete "$INSTDIR\libeay32.dll" - Delete "$INSTDIR\libfaac.dll" - Delete "$INSTDIR\libfaad.dll" - Delete "$INSTDIR\libffi-6.dll" + Delete "$INSTDIR\libfaad-2.dll" + Delete "$INSTDIR\libffi-7.dll" Delete "$INSTDIR\libfftw3-3.dll" Delete "$INSTDIR\libFLAC-8.dll" Delete "$INSTDIR\libgcc_s_sjlj-1.dll" @@ -1111,7 +1152,6 @@ Section "Uninstall" Delete "$INSTDIR\libglib-2.0-0.dll" Delete "$INSTDIR\libgmodule-2.0-0.dll" Delete "$INSTDIR\libgmp-10.dll" - Delete "$INSTDIR\libgnutls-28.dll" Delete "$INSTDIR\libgnutls-30.dll" Delete "$INSTDIR\libgobject-2.0-0.dll" Delete "$INSTDIR\libgpg-error-0.dll" @@ -1119,7 +1159,6 @@ Section "Uninstall" Delete "$INSTDIR\libgstapp-1.0-0.dll" Delete "$INSTDIR\libgstaudio-1.0-0.dll" Delete "$INSTDIR\libgstbase-1.0-0.dll" - Delete "$INSTDIR\libgstcontroller-1.0-0.dll" Delete "$INSTDIR\libgstfft-1.0-0.dll" Delete "$INSTDIR\libgstnet-1.0-0.dll" Delete "$INSTDIR\libgstpbutils-1.0-0.dll" @@ -1131,51 +1170,58 @@ Section "Uninstall" Delete "$INSTDIR\libgsttag-1.0-0.dll" Delete "$INSTDIR\libgstvideo-1.0-0.dll" Delete "$INSTDIR\libgthread-2.0-0.dll" - Delete "$INSTDIR\libhogweed-4.dll" + Delete "$INSTDIR\libhogweed-6.dll" Delete "$INSTDIR\libiconv-2.dll" - Delete "$INSTDIR\libid3tag.dll" Delete "$INSTDIR\libintl-8.dll" - Delete "$INSTDIR\liblastfm.dll" - Delete "$INSTDIR\libmad.dll" + Delete "$INSTDIR\liblastfm5.dll" Delete "$INSTDIR\libmms-0.dll" Delete "$INSTDIR\libmp3lame-0.dll" - Delete "$INSTDIR\libnettle-4-6.dll" + Delete "$INSTDIR\libnettle-8.dll" Delete "$INSTDIR\libogg-0.dll" Delete "$INSTDIR\liboil-0.3-0.dll" + Delete "$INSTDIR\libopus-0.dll" Delete "$INSTDIR\liborc-0.4-0.dll" Delete "$INSTDIR\liborc-test-0.4-0.dll" Delete "$INSTDIR\libp11-kit-0.dll" + Delete "$INSTDIR\libpcre-1.dll" Delete "$INSTDIR\libplist.dll" + Delete "$INSTDIR\libprotobuf-17.dll" Delete "$INSTDIR\libpsl-5.dll" - Delete "$INSTDIR\libprotobuf-9.dll" - Delete "$INSTDIR\libqjson.dll" - Delete "$INSTDIR\libsoup-2-4-1.dll" + Delete "$INSTDIR\libsoup-2.4-1.dll" Delete "$INSTDIR\libspeex-1.dll" Delete "$INSTDIR\libspotify.dll" + Delete "$INSTDIR\libssl-1_1.dll" + Delete "$INSTDIR\libsqlite3-0.dll" Delete "$INSTDIR\libstdc++-6.dll" Delete "$INSTDIR\libtag.dll" Delete "$INSTDIR\libtasn1-6.dll" + Delete "$INSTDIR\libunistring-2.dll" Delete "$INSTDIR\libvorbis-0.dll" Delete "$INSTDIR\libvorbisenc-2.dll" + Delete "$INSTDIR\libwavpack-1.dll" + Delete "$INSTDIR\libwinpthread-1.dll" Delete "$INSTDIR\libxml2-2.dll" - Delete "$INSTDIR\mingwm10.dll" - Delete "$INSTDIR\pthreadGC2.dll" - Delete "$INSTDIR\QtCore4.dll" - Delete "$INSTDIR\QtGui4.dll" - Delete "$INSTDIR\QtNetwork4.dll" - Delete "$INSTDIR\QtOpenGL4.dll" - Delete "$INSTDIR\QtSql4.dll" - Delete "$INSTDIR\QtSvg4.dll" - Delete "$INSTDIR\QtXml4.dll" - Delete "$INSTDIR\ssleay32.dll" + Delete "$INSTDIR\Qt5Concurrent.dll" + Delete "$INSTDIR\Qt5Core.dll" + Delete "$INSTDIR\Qt5Gui.dll" + Delete "$INSTDIR\Qt5Network.dll" + Delete "$INSTDIR\Qt5OpenGL.dll" + Delete "$INSTDIR\Qt5Sql.dll" + Delete "$INSTDIR\Qt5Widgets.dll" + Delete "$INSTDIR\Qt5WinExtras.dll" + Delete "$INSTDIR\Qt5Xml.dll" Delete "$INSTDIR\zlib1.dll" - Delete "$INSTDIR\imageformats\qgif4.dll" - Delete "$INSTDIR\imageformats\qjpeg4.dll" + Delete "$INSTDIR\platforms\qwindows.dll" + Delete "$INSTDIR\styles\qwindowsvistastyle.dll" + Delete "$INSTDIR\imageformats\qgif.dll" + Delete "$INSTDIR\imageformats\qjpeg.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstaiff.dll" Delete "$INSTDIR\gstreamer-plugins\libgstapetag.dll" Delete "$INSTDIR\gstreamer-plugins\libgstapp.dll" Delete "$INSTDIR\gstreamer-plugins\libgstasf.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstasfmux.dll" Delete "$INSTDIR\gstreamer-plugins\libgstaudioconvert.dll" Delete "$INSTDIR\gstreamer-plugins\libgstaudiofx.dll" Delete "$INSTDIR\gstreamer-plugins\libgstaudioparsers.dll" @@ -1184,7 +1230,7 @@ Section "Uninstall" Delete "$INSTDIR\gstreamer-plugins\libgstautodetect.dll" Delete "$INSTDIR\gstreamer-plugins\libgstcdio.dll" Delete "$INSTDIR\gstreamer-plugins\libgstcoreelements.dll" - Delete "$INSTDIR\gstreamer-plugins\libgstdirectsoundsink.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstdirectsound.dll" Delete "$INSTDIR\gstreamer-plugins\libgstequalizer.dll" Delete "$INSTDIR\gstreamer-plugins\libgstfaac.dll" Delete "$INSTDIR\gstreamer-plugins\libgstfaad.dll" @@ -1193,15 +1239,20 @@ Section "Uninstall" Delete "$INSTDIR\gstreamer-plugins\libgstgio.dll" Delete "$INSTDIR\gstreamer-plugins\libgsticydemux.dll" Delete "$INSTDIR\gstreamer-plugins\libgstid3demux.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstid3tag.dll" Delete "$INSTDIR\gstreamer-plugins\libgstisomp4.dll" Delete "$INSTDIR\gstreamer-plugins\libgstlame.dll" Delete "$INSTDIR\gstreamer-plugins\libgstlibav.dll" - Delete "$INSTDIR\gstreamer-plugins\libgstmad.dll" Delete "$INSTDIR\gstreamer-plugins\libgstmms.dll" Delete "$INSTDIR\gstreamer-plugins\libgstogg.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstopus.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstopusparse.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstpbtypes.dll" Delete "$INSTDIR\gstreamer-plugins\libgstplayback.dll" Delete "$INSTDIR\gstreamer-plugins\libgstreplaygain.dll" - Delete "$INSTDIR\gstreamer-plugins\libgstsouphttpsrc.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstrtp.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstrtsp.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll" Delete "$INSTDIR\gstreamer-plugins\libgstspectrum.dll" Delete "$INSTDIR\gstreamer-plugins\libgstspeex.dll" Delete "$INSTDIR\gstreamer-plugins\libgsttaglib.dll" @@ -1210,6 +1261,7 @@ Section "Uninstall" Delete "$INSTDIR\gstreamer-plugins\libgstudp.dll" Delete "$INSTDIR\gstreamer-plugins\libgstvolume.dll" Delete "$INSTDIR\gstreamer-plugins\libgstvorbis.dll" + Delete "$INSTDIR\gstreamer-plugins\libgstwavpack.dll" Delete "$INSTDIR\gstreamer-plugins\libgstwavparse.dll" Delete "$INSTDIR\projectm-presets\Aderrasi - Agitator.milk" @@ -1792,6 +1844,8 @@ Section "Uninstall" RMDir "$INSTDIR\gstreamer-plugins" RMDir "$INSTDIR\projectm-presets" RMDir "$INSTDIR\imageformats" + RMDir "$INSTDIR\styles" + RMDir "$INSTDIR\platforms" RMDir "$INSTDIR\gio-modules" RMDir "$INSTDIR"