Update to Windows nsis install script from Stephen George <steve_geo@optusnet.com.au>. Puts the license file in the correct install location.

svn: r11225
This commit is contained in:
Brian Matherly 2008-10-31 12:05:45 +00:00
parent 2e3a7643c8
commit e99de3069a
2 changed files with 12 additions and 7 deletions

View File

@ -18,7 +18,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# $Id: $ # $Id$
import sys import sys
fn = sys.argv[1] fn = sys.argv[1]

View File

@ -1,7 +1,8 @@
# #
# Gramps - a GTK+ based genealogy program # Gramps - a GTK+ based genealogy program
# #
# Copyright (C) 2008 Steve Hall [ digitect dancingpaper com ] # Copyright (C) 2008 Steve Hall <digitect dancingpaper com>
# Copyright (C) 2008 Stephen George <steve_geo@optusnet.com.au>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -17,7 +18,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# $Id: $ # $Id$
# #
# Description: Nullsoft Installer (NSIS) file to build Windows installer: # Description: Nullsoft Installer (NSIS) file to build Windows installer:
# #
@ -215,6 +216,10 @@ SectionIn 1 2 3 RO
SetOutPath $INSTDIR SetOutPath $INSTDIR
File /r ..\src\*.* File /r ..\src\*.*
File ..\COPYING
File ..\NEWS
File ..\FAQ
File ..\AUTHORS
#File /r ..\nsis\gramps.ico #File /r ..\nsis\gramps.ico
SectionEnd SectionEnd
@ -227,7 +232,7 @@ Section "Add GRAMPS to the Start Menu" MenuStart
SectionIn 1 3 SectionIn 1 3
# determines "Start In" location for shortcuts # determines "Start In" location for shortcuts
SetOutPath $INSTDIR SetOutPath $INSTDIR
StrCpy $0 "GRAMPS" StrCpy $0 "GRAMPS"
IfFileExists "$SMPROGRAMS\$0" 0 skipStartMenuRemove IfFileExists "$SMPROGRAMS\$0" 0 skipStartMenuRemove
@ -524,7 +529,7 @@ Function .onInit
#StrCpy $3 "$3pythonw.exe" ; append "pythonw.exe" #StrCpy $3 "$3pythonw.exe" ; append "pythonw.exe"
#IfFileExists $3 HavePython 0 #IfFileExists $3 HavePython 0
; Keys not prone to be properly updated on upgrades ; Keys not prone to be properly updated on upgrades
; reg key ; reg key
ReadRegStr $3 HKCR 'Applications\python.exe\shell\open\command' "" ReadRegStr $3 HKCR 'Applications\python.exe\shell\open\command' ""
StrCpy $3 "$3pythonw.exe" ; append "pythonw.exe" StrCpy $3 "$3pythonw.exe" ; append "pythonw.exe"
@ -612,7 +617,7 @@ Function .onInit
; reg key ; reg key
ReadRegStr $3 HKLM 'Software\GTK\2.0\DllPath' "" ReadRegStr $3 HKLM 'Software\GTK\2.0\DllPath' ""
IfFileExists $3\*.* NoHavePyGTK 0 IfFileExists $3\*.* NoHavePyGTK 0
; if we make it this far, we don't have GTK+ ; if we make it this far, we don't have GTK+
#MessageBox MB_OK "GRAMPS requires GTK+ and PyGTK to be installed, please see:$\n \ #MessageBox MB_OK "GRAMPS requires GTK+ and PyGTK to be installed, please see:$\n \
# $\n \ # $\n \
@ -738,4 +743,4 @@ FunctionEnd
!insertmacro MUI_FUNCTION_DESCRIPTION_END !insertmacro MUI_FUNCTION_DESCRIPTION_END
# 1}}} # 1}}}
# vim:foldmethod=marker:noexpandtab # vim:foldmethod=marker:noexpandtab