projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo: 'rectaingles' -> 'rectangles'.
[synfig.git]
/
synfig-studio
/
trunk
/
win32inst.nsi.in
diff --git
a/synfig-studio/trunk/win32inst.nsi.in
b/synfig-studio/trunk/win32inst.nsi.in
index
8594deb
..
e13fda1
100644
(file)
--- a/
synfig-studio/trunk/win32inst.nsi.in
+++ b/
synfig-studio/trunk/win32inst.nsi.in
@@
-18,10
+18,6
@@
OutFile "@PACKAGE_TARNAME@-@PACKAGE_VERSION@.exe"
; The default installation directory
InstallDir $PROGRAMFILES\Synfig
; The default installation directory
InstallDir $PROGRAMFILES\Synfig
-; 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 MUI_ABORTWARNING
!define SHCNE_ASSOCCHANGED 0x8000000
!define MUI_ABORTWARNING
!define SHCNE_ASSOCCHANGED 0x8000000
@@
-33,12
+29,13
@@
InstallDirRegKey HKLM "Software\Voria_@PACKAGE_TARNAME@" "Install_Dir"
;--------------------------------
;--------------------------------
-
;!define MUI_WELCOMEFINISHPAGE_BITMAP "images\about_dialog
.bmp"
+
!define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\installer_logo
.bmp"
; Pages
!insertmacro MUI_PAGE_WELCOME
; Pages
!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "alphalicense.txt"
+;!insertmacro MUI_PAGE_LICENSE "@srcdir@\alphalicense.txt"
+!insertmacro MUI_PAGE_LICENSE "@srcdir@\COPYING"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
@@
-56,14
+53,14
@@
Section "Synfig Studio"
SectionIn RO
SetOutPath "$INSTDIR\share\pixmaps"
SectionIn RO
SetOutPath "$INSTDIR\share\pixmaps"
-
File "images\*.png
"
+
!include "images\images.nsh
"
- SetOutPath "$INSTDIR\share"
-
File "images\*.ico
"
+ SetOutPath "$INSTDIR\share
\pixmaps
"
+
!include "images\icons.nsh
"
SetOutPath "$INSTDIR\bin"
SetOutPath "$INSTDIR\bin"
- File "src\s
infgapp\.libs\libsinf
gapp-0.dll"
- File "src\gtkmm\.libs\s
inf
gstudio.exe"
+ File "src\s
ynfigapp\.libs\libsynfi
gapp-0.dll"
+ File "src\gtkmm\.libs\s
ynfi
gstudio.exe"
FileOpen $0 $PROFILE\.gtkrc-2.0 a
FileSeek $0 0 END
FileOpen $0 $PROFILE\.gtkrc-2.0 a
FileSeek $0 0 END
@@
-76,7
+73,7
@@
Section "Synfig Studio"
FileClose $0
WriteRegStr HKLM "${PRODUCT_REG_KEY}" "Path" "$INSTDIR"
FileClose $0
WriteRegStr HKLM "${PRODUCT_REG_KEY}" "Path" "$INSTDIR"
- WriteRegStr HKLM "${PRODUCT_REG_KEY}" "Version" "@P
RODUCT
_VERSION@"
+ WriteRegStr HKLM "${PRODUCT_REG_KEY}" "Version" "@P
ACKAGE
_VERSION@"
; Write the uninstall keys for Windows
WriteRegStr HKLM "${PRODUCT_UNINSTALL_KEY}" "DisplayName" "@PACKAGE_NAME@"
; Write the uninstall keys for Windows
WriteRegStr HKLM "${PRODUCT_UNINSTALL_KEY}" "DisplayName" "@PACKAGE_NAME@"
@@
-90,14
+87,14
@@
Section "Synfig Studio"
WriteRegStr HKCR ".sif" "Content Type" "image/x-sif"
WriteRegStr HKCR ".sif" "PerceivedType" "image"
WriteRegStr HKCR ".sif" "Content Type" "image/x-sif"
WriteRegStr HKCR ".sif" "PerceivedType" "image"
- WriteRegStr HKCR ".sif
.g
z" "" "Synfig.Composition"
- WriteRegStr HKCR ".sif
.g
z" "Content Type" "image/x-sifz"
- WriteRegStr HKCR ".sif
.g
z" "PerceivedType" "image"
+ WriteRegStr HKCR ".sifz" "" "Synfig.Composition"
+ WriteRegStr HKCR ".sifz" "Content Type" "image/x-sifz"
+ WriteRegStr HKCR ".sifz" "PerceivedType" "image"
WriteRegStr HKCR "Synfig.Composition" "" "Synfig Composition File"
WriteRegStr HKCR "Synfig.Composition" "" "Synfig Composition File"
- WriteRegStr HKCR "Synfig.Composition\DefaultIcon" "" "$INSTDIR\
bin\sinfgstudio.exe;1
"
+ WriteRegStr HKCR "Synfig.Composition\DefaultIcon" "" "$INSTDIR\
share\pixmaps\sif_icon.ico
"
WriteRegStr HKCR "Synfig.Composition\shell" "" "open"
WriteRegStr HKCR "Synfig.Composition\shell" "" "open"
- WriteRegStr HKCR "Synfig.Composition\shell\open\command" "" '$INSTDIR\bin\s
inf
gstudio.exe "%1"'
+ WriteRegStr HKCR "Synfig.Composition\shell\open\command" "" '$INSTDIR\bin\s
ynfi
gstudio.exe "%1"'
System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
WriteUninstaller "${PRODUCT_UNINSTALL_EXE}"
System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
WriteUninstaller "${PRODUCT_UNINSTALL_EXE}"
@@
-107,9
+104,10
@@
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"
+ SetShellVarContext All
CreateDirectory "$SMPROGRAMS\Voria"
CreateShortCut "$SMPROGRAMS\Voria\Uninstall Synfig Studio.lnk" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" "" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" 0
CreateDirectory "$SMPROGRAMS\Voria"
CreateShortCut "$SMPROGRAMS\Voria\Uninstall Synfig Studio.lnk" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" "" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" 0
- CreateShortCut "$SMPROGRAMS\Voria\Synfig Studio.lnk" "$INSTDIR\bin\s
infgstudio.exe" "" "$INSTDIR\bin\sinfgstudio.exe
" 0
+ CreateShortCut "$SMPROGRAMS\Voria\Synfig Studio.lnk" "$INSTDIR\bin\s
ynfigstudio.exe" "" "$INSTDIR\share\pixmaps\synfig_icon.ico
" 0
SectionEnd
SectionEnd
@@
-124,19
+122,26
@@
Section "Uninstall"
DeleteRegKey HKCR "Synfig.Composition\shell"
DeleteRegKey HKCR "Synfig.Composition"
DeleteRegKey HKCR ".sif"
DeleteRegKey HKCR "Synfig.Composition\shell"
DeleteRegKey HKCR "Synfig.Composition"
DeleteRegKey HKCR ".sif"
- DeleteRegKey HKCR ".sif
.g
z"
+ DeleteRegKey HKCR ".sifz"
; Remove registry keys
DeleteRegKey HKLM "${PRODUCT_REG_KEY}"
DeleteRegKey HKLM "${PRODUCT_UNINSTALL_KEY}"
; Remove registry keys
DeleteRegKey HKLM "${PRODUCT_REG_KEY}"
DeleteRegKey HKLM "${PRODUCT_UNINSTALL_KEY}"
+ ; Remove images and icons
+ !include "images\unimages.nsh"
+ !include "images\unicons.nsh"
+ RMDir "$INSTDIR\share\pixmaps"
+ RMDir "$INSTDIR\share"
+
; Remove files and uninstaller
Delete "$INSTDIR\${PRODUCT_UNINSTALL_EXE}"
; Remove files and uninstaller
Delete "$INSTDIR\${PRODUCT_UNINSTALL_EXE}"
- Delete $INSTDIR\bin\s
inf
gstudio.exe
- Delete $INSTDIR\bin\libs
inf
gapp-0.dll
- RMDir
$INSTDIR\bin
+ Delete $INSTDIR\bin\s
ynfi
gstudio.exe
+ Delete $INSTDIR\bin\libs
ynfi
gapp-0.dll
+ RMDir
"$INSTDIR\bin"
; Remove shortcuts, if any
; Remove shortcuts, if any
+ SetShellVarContext All
Delete "$SMPROGRAMS\Voria\Uninstall Synfig Studio.lnk"
Delete "$SMPROGRAMS\Voria\Synfig Studio.lnk"
Delete "$SMPROGRAMS\Voria\Uninstall Synfig Studio.lnk"
Delete "$SMPROGRAMS\Voria\Synfig Studio.lnk"