From a42828ac5ecf3924891fdbc9b9a1d53bb7f1249c Mon Sep 17 00:00:00 2001 From: Louie S Date: Thu, 9 May 2024 11:49:38 -0400 Subject: Incorporate installer creation in build system --- docs/windows_compile_instructions.md | 2 +- nsis/Makefile.am | 5 +++++ nsis/Makefile.in | 5 +++++ nsis/installer.nsi.in | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/windows_compile_instructions.md b/docs/windows_compile_instructions.md index 9c4dbf5..5e700c5 100644 --- a/docs/windows_compile_instructions.md +++ b/docs/windows_compile_instructions.md @@ -59,5 +59,5 @@ These instructions were written with 64-bit architecture in mind. Although I hav Support for building an NSIS installer is in development (it currently will not work, as it is missing the installation of certain dependencies). 1. First, follow the above instructions to compile the project -2. Run `makensis nsis/installer.nsi` +2. Run `cd nsis && make installer` 3. Run the generated `nsis/terminal-media-launcher-Setup.exe` file diff --git a/nsis/Makefile.am b/nsis/Makefile.am index b05f308..c16bc2c 100644 --- a/nsis/Makefile.am +++ b/nsis/Makefile.am @@ -1,3 +1,8 @@ EXTRA_DIST = installer.nsi.in CLEANFILES = $(PACKAGE_NAME)-Setup.exe + +.PHONY: installer +$(PACKAGE_NAME)-Setup.exe: installer.nsi + makensis installer.nsi +installer: $(PACKAGE_NAME)-Setup.exe diff --git a/nsis/Makefile.in b/nsis/Makefile.in index cfd6dd8..76207d2 100644 --- a/nsis/Makefile.in +++ b/nsis/Makefile.in @@ -413,6 +413,11 @@ uninstall-am: .PRECIOUS: Makefile +.PHONY: installer +$(PACKAGE_NAME)-Setup.exe: installer.nsi + makensis installer.nsi +installer: $(PACKAGE_NAME)-Setup.exe + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/nsis/installer.nsi.in b/nsis/installer.nsi.in index b53f4cb..f055455 100644 --- a/nsis/installer.nsi.in +++ b/nsis/installer.nsi.in @@ -63,6 +63,7 @@ VIAddVersionKey "FileVersion" "${SETUP_VERSION}" Section "My Application" MyApp SetOutPath $INSTDIR File "..\src\@PACKAGE_NAME@.exe" + ;@DLL_DEPENDENCIES@ ;File "Readme.txt" WriteUninstaller "$INSTDIR\Uninstall.exe" SectionEnd -- cgit