projects / synfig.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...
[synfig.git] / synfig-core / tags / stable / win32inst.nsi.in
diff --git a/synfig-core/tags/stable/win32inst.nsi.in b/synfig-core/tags/stable/win32inst.nsi.in
index c26c83e..172cfbb 100644 (file)
--- a/synfig-core/tags/stable/win32inst.nsi.in
+++ b/synfig-core/tags/stable/win32inst.nsi.in
@@ -12,7 +12,7 @@
 ; The name of the installer
 Name "@PACKAGE_NAME@ @PACKAGE_VERSION@"
 
-!define PRODUCT_WEB_SITE "http://deepdarc.dnsalias.net/~darco/"
+!define PRODUCT_WEB_SITE "http://synfig.org/"
 
 ; The file to write
 OutFile "@PACKAGE_TARNAME@-@PACKAGE_VERSION@.exe"
@@ -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@"
@@ -48,7 +44,8 @@ InstallDirRegKey HKLM "Software\Voria_@PACKAGE_TARNAME@" "Install_Dir"
 ;CustomGuiInit
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "@srcdir@\alphalicense.txt"
+!insertmacro MUI_PAGE_LICENSE "@srcdir@\COPYING"
+#!insertmacro MUI_PAGE_LICENSE "@srcdir@\alphalicense.txt"
 ;Page custom PageReinstall ; PageLeaveReinstall
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
@@ -70,20 +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"
-  
   ; Put file there
-;  File "sinfg_modules.conf"
   
   CreateDirectory "$INSTDIR\etc"
-  Delete $INSTDIR\etc\sinfg_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@"
@@ -95,15 +86,15 @@ Section ""
   
 SectionEnd
 
-
 ; Optional section (can be disabled by the user)
-;Section "Start Menu Shortcuts"
+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
+  SetShellVarContext All
+  CreateDirectory "$SMPROGRAMS\Voria"
+  CreateShortCut "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" "" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" 0
   
-;SectionEnd
+SectionEnd
+
 
 ;--------------------------------
 
@@ -114,41 +105,48 @@ 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\sinfg.exe
   Delete $INSTDIR\uninstall-@PACKAGE_TARNAME@.exe
-  Delete $INSTDIR\etc\sinfg_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
 
-  ; Remove directories used
-  ;RMDir "$SMPROGRAMS\Example2"
-  RMDir "$INSTDIR"
+Section "un.Start Menu Shortcuts"
+
+  ; Remove shortcuts, if any
+  SetShellVarContext All
+  Delete "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk"
+  RMDir "$SMPROGRAMS\Voria"
 
 SectionEnd
 
-!include @srcdir@\src\sinfg\sinfg.nsh
+!include @srcdir@\src\synfig\synfig.nsh
 !include @srcdir@\src\tool\tool.nsh
 
 Section "Examples"
        SetOutPath $INSTDIR\examples
-       File "@srcdir@\examples\*.sif"
+       File "@srcdir@\examples\*.sifz"
+
+       SetShellVarContext All
        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"
+       Delete "$INSTDIR\examples\*.sifz"
        RMDir "$INSTDIR\examples"
+
+       SetShellVarContext All
+       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"
@@ -156,23 +154,23 @@ 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"
-;!include "@srcdir@\src\modules\mod_gif\mod_gif.nsh"
-;!include "@srcdir@\src\modules\mod_imagemagick\mod_imagemagick.nsh"
+!include "@srcdir@\src\modules\mod_dv\mod_dv.nsh"
+!include "@srcdir@\src\modules\mod_ffmpeg\mod_ffmpeg.nsh"
+!include "@srcdir@\src\modules\mod_gif\mod_gif.nsh"
+!include "@srcdir@\src\modules\mod_imagemagick\mod_imagemagick.nsh"
 !include "@srcdir@\src\modules\mod_jpeg\mod_jpeg.nsh"
+!include "@srcdir@\src\modules\mod_openexr\mod_openexr.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"
@@ -180,19 +178,20 @@ 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"
-;!include "@srcdir@\src\modules\mod_gif\unmod_gif.nsh"
-;!include "@srcdir@\src\modules\mod_imagemagick\unmod_imagemagick.nsh"
+!include "@srcdir@\src\modules\mod_dv\unmod_dv.nsh"
+!include "@srcdir@\src\modules\mod_ffmpeg\unmod_ffmpeg.nsh"
+!include "@srcdir@\src\modules\mod_gif\unmod_gif.nsh"
+!include "@srcdir@\src\modules\mod_imagemagick\unmod_imagemagick.nsh"
 !include "@srcdir@\src\modules\mod_jpeg\unmod_jpeg.nsh"
+!include "@srcdir@\src\modules\mod_openexr\unmod_openexr.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
Synfig (Bombe’s repository)