X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fwin32inst.nsi.in;h=2e4ad9e3da6918c1f740121e7219b850525ff419;hb=2d0138b713ae1fda62952f420b200953cfe1f5f6;hp=f49f1e15b35a4f38c01da922d4d3138af7bb3765;hpb=4703112d7d74ffb596489505ab57773fb8089cb6;p=synfig.git

diff --git a/synfig-core/trunk/win32inst.nsi.in b/synfig-core/trunk/win32inst.nsi.in
index f49f1e1..2e4ad9e 100644
--- a/synfig-core/trunk/win32inst.nsi.in
+++ b/synfig-core/trunk/win32inst.nsi.in
@@ -20,10 +20,6 @@ OutFile "@PACKAGE_TARNAME@-@PACKAGE_VERSION@.exe"
 ; 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@"
@@ -71,21 +67,14 @@ Section ""
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR\bin
 
-  File "C:\mingw\bin\mingwm10.dll"
-  File "C:\GTK\bin\libfreetype-6.dll"
-  File "C:\GTK\bin\libxml2.dll"
-  
   ; Put file there
-;  File "synfig_modules.conf"
   
   CreateDirectory "$INSTDIR\etc"
-  Delete $INSTDIR\etc\synfig_modules.conf
+  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" "@PRODUCT_VERSION@"
+  WriteRegStr HKLM "${SYNFIG_REG_KEY}" "Version" "@PACKAGE_VERSION@"
   
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "${SYNFIG_UNINSTALL_KEY}" "DisplayName" "@PACKAGE_NAME@"
@@ -97,16 +86,6 @@ Section ""
   
 SectionEnd
 
-
-; 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"
 
@@ -125,21 +104,21 @@ Section "Uninstall"
   ; Remove registry keys
   DeleteRegKey HKLM "${SYNFIG_REG_KEY}"
   DeleteRegKey HKLM "${SYNFIG_UNINSTALL_KEY}"
-  ; DeleteRegKey HKLM "Software\Voria_@PACKAGE_TARNAME@"
 
   ; Remove files and uninstaller
-  ;Delete $INSTDIR\synfig.exe
   Delete $INSTDIR\uninstall-@PACKAGE_TARNAME@.exe
-  Delete $INSTDIR\etc\synfig_modules.conf
-  RMDir $INSTDIR\bin
-  RMDir $INSTDIR\etc
+  Delete $INSTDIR\etc\synfig_modules.cfg
+  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"
-  ; Remove directories used
-  ;RMDir "$SMPROGRAMS\Example2"
-  RMDir "$INSTDIR"
+  RMDir "$SMPROGRAMS\Voria"
 
 SectionEnd
 
@@ -149,18 +128,21 @@ SectionEnd
 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"
-	Delete "$SMPROGRAMS\Voria\Examples.lnk"
 	Delete "$INSTDIR\examples\*.sif"
 	RMDir "$INSTDIR\examples"
+	
+	Delete "$SMPROGRAMS\Voria\Examples.lnk"
+	RMDir "$SMPROGRAMS\Voria"
 SectionEnd
 
-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"
@@ -168,8 +150,8 @@ SubSection "Layers"
 !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"
@@ -179,12 +161,11 @@ SubSection "Render Targets"
 !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"
@@ -192,8 +173,8 @@ SubSection "un.Layers"
 !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"
@@ -203,8 +184,8 @@ SubSection "un.Render Targets"
 !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