From 7fce08d290c9dbe78f427913f66ac954bcd96733 Mon Sep 17 00:00:00 2001 From: Louie S Date: Thu, 2 May 2024 13:29:54 -0400 Subject: Add license information to nsis installer --- nsis/Makefile.am | 2 ++ nsis/Makefile.in | 8 ++++-- nsis/installer.nsi | 78 --------------------------------------------------- nsis/installer.nsi.in | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 80 deletions(-) delete mode 100644 nsis/installer.nsi create mode 100644 nsis/installer.nsi.in (limited to 'nsis') diff --git a/nsis/Makefile.am b/nsis/Makefile.am index 8b2e209..b05f308 100644 --- a/nsis/Makefile.am +++ b/nsis/Makefile.am @@ -1 +1,3 @@ +EXTRA_DIST = installer.nsi.in + CLEANFILES = $(PACKAGE_NAME)-Setup.exe diff --git a/nsis/Makefile.in b/nsis/Makefile.in index 7408ccf..cfd6dd8 100644 --- a/nsis/Makefile.in +++ b/nsis/Makefile.in @@ -94,7 +94,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = installer.nsi CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -116,7 +116,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/installer.nsi.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -158,6 +158,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_TITLE = @PACKAGE_TITLE@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ @@ -220,6 +221,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +EXTRA_DIST = installer.nsi.in CLEANFILES = $(PACKAGE_NAME)-Setup.exe all: all-am @@ -253,6 +255,8 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +installer.nsi: $(top_builddir)/config.status $(srcdir)/installer.nsi.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ tags TAGS: ctags CTAGS: diff --git a/nsis/installer.nsi b/nsis/installer.nsi deleted file mode 100644 index 3030a40..0000000 --- a/nsis/installer.nsi +++ /dev/null @@ -1,78 +0,0 @@ -;------------------------------------------------------------------------------- -; Includes -!include "MUI2.nsh" -!include "LogicLib.nsh" -!include "WinVer.nsh" -!include "x64.nsh" - -;------------------------------------------------------------------------------- -; Constants -!define PRODUCT_NAME "Terminal Media Launcher" -!define PRODUCT_DESCRIPTION "TODO" -!define COPYRIGHT "GNU GPLv3" -!define PRODUCT_VERSION "0.1.0.0" -!define SETUP_VERSION 1.0.0.0 - -;------------------------------------------------------------------------------- -; Attributes -Name "terminal-media-launcher" -OutFile "terminal-media-launcher-Setup.exe" -InstallDir "$PROGRAMFILES\Terminal Media Launcher" -InstallDirRegKey HKCU "Software\Louie S\Terminal Media Launcher" "" -RequestExecutionLevel user ; user|highest|admin - -;------------------------------------------------------------------------------- -; Version Info -VIProductVersion "${PRODUCT_VERSION}" -VIAddVersionKey "ProductName" "${PRODUCT_NAME}" -VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" -VIAddVersionKey "FileDescription" "${PRODUCT_DESCRIPTION}" -VIAddVersionKey "LegalCopyright" "${COPYRIGHT}" -VIAddVersionKey "FileVersion" "${SETUP_VERSION}" - -;------------------------------------------------------------------------------- -; Modern UI Appearance -;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" -!define MUI_HEADERIMAGE -;!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\orange.bmp" -;!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp" -!define MUI_FINISHPAGE_NOAUTOCLOSE - -;------------------------------------------------------------------------------- -; Installer Pages -!insertmacro MUI_PAGE_WELCOME -;!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt" -!insertmacro MUI_PAGE_COMPONENTS -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - -;------------------------------------------------------------------------------- -; Uninstaller Pages -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -;------------------------------------------------------------------------------- -; Languages -!insertmacro MUI_LANGUAGE "English" - -;------------------------------------------------------------------------------- -; Installer Sections -Section "My Application" MyApp - SetOutPath $INSTDIR - File "..\src\terminal-media-launcher.exe" - ;File "Readme.txt" - WriteUninstaller "$INSTDIR\Uninstall.exe" -SectionEnd - -;------------------------------------------------------------------------------- -; Uninstaller Sections -Section "Uninstall" - Delete "$INSTDIR\terminal-media-launcher.exe" - Delete "$INSTDIR\Uninstall.exe" - ; FIXME directory is not being uninstalled - RMDir "$INSTDIR" - ;DeleteRegKey /ifempty HKCU "Software\Modern UI Test" -SectionEnd diff --git a/nsis/installer.nsi.in b/nsis/installer.nsi.in new file mode 100644 index 0000000..a757628 --- /dev/null +++ b/nsis/installer.nsi.in @@ -0,0 +1,78 @@ +;------------------------------------------------------------------------------- +; Includes +!include "MUI2.nsh" +!include "LogicLib.nsh" +!include "WinVer.nsh" +!include "x64.nsh" + +;------------------------------------------------------------------------------- +; Constants +!define PRODUCT_NAME "@PACKAGE_TITLE@" +!define PRODUCT_DESCRIPTION "TODO" +!define COPYRIGHT "GNU GPLv3" +!define PRODUCT_VERSION "@PACKAGE_VERSION@.0.0" +!define SETUP_VERSION 1.0.0.0 + +;------------------------------------------------------------------------------- +; Attributes +Name "@PACKAGE_NAME@" +OutFile "@PACKAGE_NAME@-Setup.exe" +InstallDir "$PROGRAMFILES\@PACKAGE_TITLE@" +InstallDirRegKey HKCU "Software\Louie S\@PACKAGE_TITLE@" "" +RequestExecutionLevel user ; user|highest|admin + +;------------------------------------------------------------------------------- +; Version Info +VIProductVersion "${PRODUCT_VERSION}" +VIAddVersionKey "ProductName" "${PRODUCT_NAME}" +VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" +VIAddVersionKey "FileDescription" "${PRODUCT_DESCRIPTION}" +VIAddVersionKey "LegalCopyright" "${COPYRIGHT}" +VIAddVersionKey "FileVersion" "${SETUP_VERSION}" + +;------------------------------------------------------------------------------- +; Modern UI Appearance +;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" +!define MUI_HEADERIMAGE +;!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\orange.bmp" +;!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp" +!define MUI_FINISHPAGE_NOAUTOCLOSE + +;------------------------------------------------------------------------------- +; Installer Pages +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "..\COPYING" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +;------------------------------------------------------------------------------- +; Uninstaller Pages +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +;------------------------------------------------------------------------------- +; Languages +!insertmacro MUI_LANGUAGE "English" + +;------------------------------------------------------------------------------- +; Installer Sections +Section "My Application" MyApp + SetOutPath $INSTDIR + File "..\src\@PACKAGE_NAME@.exe" + ;File "Readme.txt" + WriteUninstaller "$INSTDIR\Uninstall.exe" +SectionEnd + +;------------------------------------------------------------------------------- +; Uninstaller Sections +Section "Uninstall" + Delete "$INSTDIR\@PACKAGE_NAME@.exe" + Delete "$INSTDIR\Uninstall.exe" + ; FIXME directory is not being uninstalled + RMDir "$INSTDIR" + ;DeleteRegKey /ifempty HKCU "Software\Modern UI Test" +SectionEnd -- cgit