projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove .gitignore do nothing is ignored.
[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
0a2b56d
..
172cfbb
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@"
; The name of the installer
Name "@PACKAGE_NAME@ @PACKAGE_VERSION@"
-!define PRODUCT_WEB_SITE "http://
voria.com/synfi
g/"
+!define PRODUCT_WEB_SITE "http://
synfig.or
g/"
; The file to write
OutFile "@PACKAGE_TARNAME@-@PACKAGE_VERSION@.exe"
; 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@
; 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@"
@@
-48,7
+44,8
@@
InstallDirRegKey HKLM "Software\Voria_@PACKAGE_TARNAME@" "Install_Dir"
;CustomGuiInit
!insertmacro MUI_PAGE_WELCOME
;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
;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
; 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
; Put file there
-; File "synfig_modules.conf"
CreateDirectory "$INSTDIR\etc"
CreateDirectory "$INSTDIR\etc"
- Delete $INSTDIR\etc\synfig_modules.c
onf
+ Delete $INSTDIR\etc\synfig_modules.c
fg
; Write the installation path into the registry
; 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}" "Path" "$INSTDIR"
- WriteRegStr HKLM "${SYNFIG_REG_KEY}" "Version" "@P
RODUCT
_VERSION@"
+ WriteRegStr HKLM "${SYNFIG_REG_KEY}" "Version" "@P
ACKAGE
_VERSION@"
; Write the uninstall keys for Windows
WriteRegStr HKLM "${SYNFIG_UNINSTALL_KEY}" "DisplayName" "@PACKAGE_NAME@"
; Write the uninstall keys for Windows
WriteRegStr HKLM "${SYNFIG_UNINSTALL_KEY}" "DisplayName" "@PACKAGE_NAME@"
@@
-95,15
+86,15
@@
Section ""
SectionEnd
SectionEnd
-
; Optional section (can be disabled by the user)
; 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,20
+105,22
@@
Section "Uninstall"
; 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\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
- ; 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
SectionEnd
@@
-136,19
+129,24
@@
SectionEnd
Section "Examples"
SetOutPath $INSTDIR\examples
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"
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"
RMDir "$INSTDIR\examples"
+
+ SetShellVarContext All
+ Delete "$SMPROGRAMS\Voria\Examples.lnk"
+ RMDir "$SMPROGRAMS\Voria"
SectionEnd
SectionEnd
-S
ubSection
"PlugIns"
-S
ubSection
"Layers"
+S
ectionGroup
"PlugIns"
+S
ectionGroup
"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"
@@
-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"
!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"
-S
ubSection
End
-S
ubSection
"Render Targets"
+S
ectionGroup
End
+S
ectionGroup
"Render Targets"
!include "@srcdir@\src\modules\mod_bmp\mod_bmp.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_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_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"
!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
-S
ubSection
"un.PlugIns"
-S
ubSection
"un.Layers"
+S
ectionGroup
"un.PlugIns"
+S
ectionGroup
"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"
@@
-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"
!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"
-S
ubSection
End
-S
ubSection
"un.Render Targets"
+S
ectionGroup
End
+S
ectionGroup
"un.Render Targets"
!include "@srcdir@\src\modules\mod_bmp\unmod_bmp.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_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_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"
!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"
-S
ubSection
End
-S
ubSection
End
+S
ectionGroup
End
+S
ectionGroup
End
Function .onInit
; Get installer location
Function .onInit
; Get installer location