22 files changed:
Section "un.lyr_freetype"
Delete "$INSTDIR\lib\synfig\modules\lyr_freetype.dll"
Section "un.lyr_freetype"
Delete "$INSTDIR\lib\synfig\modules\lyr_freetype.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.lyr_std"
Delete "$INSTDIR\lib\synfig\modules\lyr_std.dll"
Section "un.lyr_std"
Delete "$INSTDIR\lib\synfig\modules\lyr_std.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_bmp"
Delete "$INSTDIR\lib\synfig\modules\mod_bmp.dll"
Section "un.mod_bmp"
Delete "$INSTDIR\lib\synfig\modules\mod_bmp.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_dv"
Delete "$INSTDIR\lib\synfig\modules\mod_dv.dll"
Section "un.mod_dv"
Delete "$INSTDIR\lib\synfig\modules\mod_dv.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_ffmpeg"
Delete "$INSTDIR\lib\synfig\modules\mod_ffmpeg.dll"
Section "un.mod_ffmpeg"
Delete "$INSTDIR\lib\synfig\modules\mod_ffmpeg.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_filter"
Delete "$INSTDIR\lib\synfig\modules\mod_filter.dll"
Section "un.mod_filter"
Delete "$INSTDIR\lib\synfig\modules\mod_filter.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_geometry"
Delete "$INSTDIR\lib\synfig\modules\mod_geometry.dll"
Section "un.mod_geometry"
Delete "$INSTDIR\lib\synfig\modules\mod_geometry.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_gif"
Delete "$INSTDIR\lib\synfig\modules\mod_gif.dll"
Section "un.mod_gif"
Delete "$INSTDIR\lib\synfig\modules\mod_gif.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_gradient"
Delete "$INSTDIR\lib\synfig\modules\mod_gradient.dll"
Section "un.mod_gradient"
Delete "$INSTDIR\lib\synfig\modules\mod_gradient.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_imagemagick"
Delete "$INSTDIR\lib\synfig\modules\mod_imagemagick.dll"
Section "un.mod_imagemagick"
Delete "$INSTDIR\lib\synfig\modules\mod_imagemagick.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_jpeg"
Delete "$INSTDIR\lib\synfig\modules\mod_jpeg.dll"
Section "un.mod_jpeg"
Delete "$INSTDIR\lib\synfig\modules\mod_jpeg.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_libavcodec"
Delete "$INSTDIR\lib\synfig\modules\mod_libavcodec.dll"
Section "un.mod_libavcodec"
Delete "$INSTDIR\lib\synfig\modules\mod_libavcodec.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_noise"
Delete "$INSTDIR\lib\synfig\modules\mod_noise.dll"
Section "un.mod_noise"
Delete "$INSTDIR\lib\synfig\modules\mod_noise.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_openexr"
Delete "$INSTDIR\lib\synfig\modules\mod_openexr.dll"
Section "un.mod_openexr"
Delete "$INSTDIR\lib\synfig\modules\mod_openexr.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_particle"
Delete "$INSTDIR\lib\synfig\modules\mod_particle.dll"
Section "un.mod_particle"
Delete "$INSTDIR\lib\synfig\modules\mod_particle.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_png"
Delete "$INSTDIR\lib\synfig\modules\mod_png.dll"
Section "un.mod_png"
Delete "$INSTDIR\lib\synfig\modules\mod_png.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_ppm"
Delete "$INSTDIR\lib\synfig\modules\mod_ppm.dll"
Section "un.mod_ppm"
Delete "$INSTDIR\lib\synfig\modules\mod_ppm.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.mod_yuv420p"
Delete "$INSTDIR\lib\synfig\modules\mod_yuv420p.dll"
Section "un.mod_yuv420p"
Delete "$INSTDIR\lib\synfig\modules\mod_yuv420p.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.@MODNAME@"
Delete "$INSTDIR\lib\synfig\modules\@MODNAME@.dll"
Section "un.@MODNAME@"
Delete "$INSTDIR\lib\synfig\modules\@MODNAME@.dll"
+ RMDir "$INSTDIR\lib\synfig\modules"
+ RMDir "$INSTDIR\lib\synfig"
+ RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.Synfig Core"
Delete "$INSTDIR\bin\libsynfig-0.dll"
Section "un.Synfig Core"
Delete "$INSTDIR\bin\libsynfig-0.dll"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
Section "un.Synfig Tool Uninstall"
Delete "$INSTDIR\bin\synfig.exe"
Section "un.Synfig Tool Uninstall"
Delete "$INSTDIR\bin\synfig.exe"
RMDir "$INSTDIR"
SectionEnd
RMDir "$INSTDIR"
SectionEnd
; The default installation directory
InstallDir $PROGRAMFILES\@PACKAGE_TARNAME@
; The default installation directory
InstallDir $PROGRAMFILES\@PACKAGE_TARNAME@
-; Registry key to check for directory (so if you install again, it will
-; overwrite the old one automatically)
-InstallDirRegKey HKLM "Software\Voria_@PACKAGE_TARNAME@" "Install_Dir"
-
!define VERSION_MAJ "@VERSION_MAJ@"
!define VERSION_MIN "@VERSION_MIN@"
!define VERSION_REV "@VERSION_REV@"
!define VERSION_MAJ "@VERSION_MAJ@"
!define VERSION_MIN "@VERSION_MIN@"
!define VERSION_REV "@VERSION_REV@"
Delete $INSTDIR\etc\synfig_modules.cfg
; Write the installation path into the registry
Delete $INSTDIR\etc\synfig_modules.cfg
; Write the installation path into the registry
- ; WriteRegStr HKLM "Software\Voria_@PACKAGE_TARNAME@" "Install_Dir" "$INSTDIR"
-
WriteRegStr HKLM "${SYNFIG_REG_KEY}" "Path" "$INSTDIR"
WriteRegStr HKLM "${SYNFIG_REG_KEY}" "Version" "@PACKAGE_VERSION@"
WriteRegStr HKLM "${SYNFIG_REG_KEY}" "Path" "$INSTDIR"
WriteRegStr HKLM "${SYNFIG_REG_KEY}" "Version" "@PACKAGE_VERSION@"
-
-; Optional section (can be disabled by the user)
-;Section "Start Menu Shortcuts"
-
-; CreateDirectory "$SMPROGRAMS\Example2"
-; CreateShortCut "$SMPROGRAMS\Example2\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-; CreateShortCut "$SMPROGRAMS\Example2\Example2 (MakeNSISW).lnk" "$INSTDIR\makensisw.exe" "" "$INSTDIR\makensisw.exe" 0
-
-;SectionEnd
-
; Optional section (can be disabled by the user)
Section "Start Menu Shortcuts"
; Optional section (can be disabled by the user)
Section "Start Menu Shortcuts"
; Remove registry keys
DeleteRegKey HKLM "${SYNFIG_REG_KEY}"
DeleteRegKey HKLM "${SYNFIG_UNINSTALL_KEY}"
; Remove registry keys
DeleteRegKey HKLM "${SYNFIG_REG_KEY}"
DeleteRegKey HKLM "${SYNFIG_UNINSTALL_KEY}"
- ; DeleteRegKey HKLM "Software\Voria_@PACKAGE_TARNAME@"
; Remove files and uninstaller
; Remove files and uninstaller
- ;Delete $INSTDIR\synfig.exe
Delete $INSTDIR\uninstall-@PACKAGE_TARNAME@.exe
Delete $INSTDIR\etc\synfig_modules.cfg
Delete $INSTDIR\uninstall-@PACKAGE_TARNAME@.exe
Delete $INSTDIR\etc\synfig_modules.cfg
- RMDir $INSTDIR\bin
- RMDir $INSTDIR\etc
+ RMDir "$INSTDIR\bin"
+ RMDir "$INSTDIR\etc"
+ RMDir "$INSTDIR"
- ; Remove shortcuts, if any
+SectionEnd
+
+Section "un.Start Menu Shortcuts"
+ ; Remove shortcuts, if any
Delete "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk"
Delete "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk"
- ; Remove directories used
- ;RMDir "$SMPROGRAMS\Example2"
- RMDir "$INSTDIR"
+ RMDir "$SMPROGRAMS\Voria"
Section "Examples"
SetOutPath $INSTDIR\examples
File "@srcdir@\examples\*.sif"
Section "Examples"
SetOutPath $INSTDIR\examples
File "@srcdir@\examples\*.sif"
CreateDirectory "$SMPROGRAMS\Voria"
CreateShortCut "$SMPROGRAMS\Voria\Examples.lnk" "$INSTDIR\examples" "" "$INSTDIR\examples" 0
SectionEnd
Section "un.Examples"
CreateDirectory "$SMPROGRAMS\Voria"
CreateShortCut "$SMPROGRAMS\Voria\Examples.lnk" "$INSTDIR\examples" "" "$INSTDIR\examples" 0
SectionEnd
Section "un.Examples"
- Delete "$SMPROGRAMS\Voria\Examples.lnk"
Delete "$INSTDIR\examples\*.sif"
RMDir "$INSTDIR\examples"
Delete "$INSTDIR\examples\*.sif"
RMDir "$INSTDIR\examples"
+
+ Delete "$SMPROGRAMS\Voria\Examples.lnk"
+ RMDir "$SMPROGRAMS\Voria"
-SubSection "PlugIns"
-SubSection "Layers"
+SectionGroup "PlugIns"
+SectionGroup "Layers"
!include "@srcdir@\src\modules\lyr_std\lyr_std.nsh"
!include "@srcdir@\src\modules\mod_filter\mod_filter.nsh"
!include "@srcdir@\src\modules\mod_gradient\mod_gradient.nsh"
!include "@srcdir@\src\modules\lyr_std\lyr_std.nsh"
!include "@srcdir@\src\modules\mod_filter\mod_filter.nsh"
!include "@srcdir@\src\modules\mod_gradient\mod_gradient.nsh"
!include "@srcdir@\src\modules\mod_particle\mod_particle.nsh"
!include "@srcdir@\src\modules\mod_geometry\mod_geometry.nsh"
!include "@srcdir@\src\modules\lyr_freetype\lyr_freetype.nsh"
!include "@srcdir@\src\modules\mod_particle\mod_particle.nsh"
!include "@srcdir@\src\modules\mod_geometry\mod_geometry.nsh"
!include "@srcdir@\src\modules\lyr_freetype\lyr_freetype.nsh"
-SubSectionEnd
-SubSection "Render Targets"
+SectionGroupEnd
+SectionGroup "Render Targets"
!include "@srcdir@\src\modules\mod_bmp\mod_bmp.nsh"
!include "@srcdir@\src\modules\mod_dv\mod_dv.nsh"
!include "@srcdir@\src\modules\mod_ffmpeg\mod_ffmpeg.nsh"
!include "@srcdir@\src\modules\mod_bmp\mod_bmp.nsh"
!include "@srcdir@\src\modules\mod_dv\mod_dv.nsh"
!include "@srcdir@\src\modules\mod_ffmpeg\mod_ffmpeg.nsh"
!include "@srcdir@\src\modules\mod_png\mod_png.nsh"
!include "@srcdir@\src\modules\mod_ppm\mod_ppm.nsh"
!include "@srcdir@\src\modules\mod_yuv420p\mod_yuv420p.nsh"
!include "@srcdir@\src\modules\mod_png\mod_png.nsh"
!include "@srcdir@\src\modules\mod_ppm\mod_ppm.nsh"
!include "@srcdir@\src\modules\mod_yuv420p\mod_yuv420p.nsh"
-SubSectionEnd
-SubSectionEnd
-
+SectionGroupEnd
+SectionGroupEnd
-SubSection "un.PlugIns"
-SubSection "un.Layers"
+SectionGroup "un.PlugIns"
+SectionGroup "un.Layers"
!include "@srcdir@\src\modules\lyr_std\unlyr_std.nsh"
!include "@srcdir@\src\modules\lyr_freetype\unlyr_freetype.nsh"
!include "@srcdir@\src\modules\mod_filter\unmod_filter.nsh"
!include "@srcdir@\src\modules\lyr_std\unlyr_std.nsh"
!include "@srcdir@\src\modules\lyr_freetype\unlyr_freetype.nsh"
!include "@srcdir@\src\modules\mod_filter\unmod_filter.nsh"
!include "@srcdir@\src\modules\mod_noise\unmod_noise.nsh"
!include "@srcdir@\src\modules\mod_particle\unmod_particle.nsh"
!include "@srcdir@\src\modules\mod_geometry\unmod_geometry.nsh"
!include "@srcdir@\src\modules\mod_noise\unmod_noise.nsh"
!include "@srcdir@\src\modules\mod_particle\unmod_particle.nsh"
!include "@srcdir@\src\modules\mod_geometry\unmod_geometry.nsh"
-SubSectionEnd
-SubSection "un.Render Targets"
+SectionGroupEnd
+SectionGroup "un.Render Targets"
!include "@srcdir@\src\modules\mod_bmp\unmod_bmp.nsh"
!include "@srcdir@\src\modules\mod_dv\unmod_dv.nsh"
!include "@srcdir@\src\modules\mod_ffmpeg\unmod_ffmpeg.nsh"
!include "@srcdir@\src\modules\mod_bmp\unmod_bmp.nsh"
!include "@srcdir@\src\modules\mod_dv\unmod_dv.nsh"
!include "@srcdir@\src\modules\mod_ffmpeg\unmod_ffmpeg.nsh"
!include "@srcdir@\src\modules\mod_png\unmod_png.nsh"
!include "@srcdir@\src\modules\mod_ppm\unmod_ppm.nsh"
!include "@srcdir@\src\modules\mod_yuv420p\unmod_yuv420p.nsh"
!include "@srcdir@\src\modules\mod_png\unmod_png.nsh"
!include "@srcdir@\src\modules\mod_ppm\unmod_ppm.nsh"
!include "@srcdir@\src\modules\mod_yuv420p\unmod_yuv420p.nsh"
-SubSectionEnd
-SubSectionEnd
+SectionGroupEnd
+SectionGroupEnd
Function .onInit
; Get installer location
Function .onInit
; Get installer location