Atrus' Windows patches: [ 1695475 ] win32-synfig-regver-fix

[synfig.git] / synfig-core / trunk / win32inst.nsi.in

diff --git a/synfig-core/trunk/win32inst.nsi.in b/synfig-core/trunk/win32inst.nsi.in
index c26c83e..eb6e901 100644 (file)
--- a/synfig-core/trunk/win32inst.nsi.in
+++ b/synfig-core/trunk/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://www.synfig.com/"
 
 ; The file to write
 OutFile "@PACKAGE_TARNAME@-@PACKAGE_VERSION@.exe"
@@ -48,7 +48,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
@@ -72,18 +73,19 @@ Section ""
 
   File "C:\mingw\bin\mingwm10.dll"
   File "C:\GTK\bin\libfreetype-6.dll"
+  File "C:\GTK\bin\libxml2.dll"
   
   ; Put file there
-;  File "sinfg_modules.conf"
+;  File "synfig_modules.conf"
   
   CreateDirectory "$INSTDIR\etc"
-  Delete $INSTDIR\etc\sinfg_modules.conf
+  Delete $INSTDIR\etc\synfig_modules.conf
        
   ; 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@"
@@ -105,6 +107,15 @@ SectionEnd
   
 ;SectionEnd
 
+; Optional section (can be disabled by the user)
+Section "Start Menu Shortcuts"
+
+  CreateDirectory "$SMPROGRAMS\Voria"
+  CreateShortCut "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" "" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" 0
+  
+SectionEnd
+
+
 ;--------------------------------
 
 ; Uninstaller
@@ -117,21 +128,22 @@ Section "Uninstall"
   ; DeleteRegKey HKLM "Software\Voria_@PACKAGE_TARNAME@"
 
   ; Remove files and uninstaller
-  ;Delete $INSTDIR\sinfg.exe
+  ;Delete $INSTDIR\synfig.exe
   Delete $INSTDIR\uninstall-@PACKAGE_TARNAME@.exe
-  Delete $INSTDIR\etc\sinfg_modules.conf
+  Delete $INSTDIR\etc\synfig_modules.conf
   RMDir $INSTDIR\bin
   RMDir $INSTDIR\etc
 
   ; Remove shortcuts, if any
 
+  Delete "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk"
   ; Remove directories used
   ;RMDir "$SMPROGRAMS\Example2"
   RMDir "$INSTDIR"
 
 SectionEnd
 
-!include @srcdir@\src\sinfg\sinfg.nsh
+!include @srcdir@\src\synfig\synfig.nsh
 !include @srcdir@\src\tool\tool.nsh
 
 Section "Examples"
@@ -159,10 +171,10 @@ SubSection "Layers"
 SubSectionEnd
 SubSection "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_png\mod_png.nsh"
 !include "@srcdir@\src\modules\mod_ppm\mod_ppm.nsh"
@@ -183,10 +195,10 @@ SubSection "un.Layers"
 SubSectionEnd
 SubSection "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_png\unmod_png.nsh"
 !include "@srcdir@\src\modules\mod_ppm\unmod_ppm.nsh"