diff options
Diffstat (limited to 'nsis')
| -rw-r--r-- | nsis/Makefile.am | 9 | ||||
| -rw-r--r-- | nsis/Makefile.in | 8 | ||||
| -rw-r--r-- | nsis/installer.nsi.in | 3 |
3 files changed, 15 insertions, 5 deletions
diff --git a/nsis/Makefile.am b/nsis/Makefile.am index c16bc2c..3f47a9f 100644 --- a/nsis/Makefile.am +++ b/nsis/Makefile.am @@ -1,8 +1,13 @@ EXTRA_DIST = installer.nsi.in -CLEANFILES = $(PACKAGE_NAME)-Setup.exe +CLEANFILES = $(PACKAGE_NAME)-Setup.exe deps/* + +SEARCHPATH=$$PATH +DEPENDENCIES = $(shell ./find_dlls.sh -q -s $(SEARCHPATH) '../src/$(PACKAGE_NAME).exe') .PHONY: installer +installer: $(PACKAGE_NAME)-Setup.exe $(PACKAGE_NAME)-Setup.exe: installer.nsi + mkdir -p deps + for file in $(DEPENDENCIES); do install "$$file" "deps/$$(basename "$$file")"; done makensis installer.nsi -installer: $(PACKAGE_NAME)-Setup.exe diff --git a/nsis/Makefile.in b/nsis/Makefile.in index 76207d2..9588932 100644 --- a/nsis/Makefile.in +++ b/nsis/Makefile.in @@ -222,7 +222,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = installer.nsi.in -CLEANFILES = $(PACKAGE_NAME)-Setup.exe +CLEANFILES = $(PACKAGE_NAME)-Setup.exe deps/* +SEARCHPATH = $$PATH +DEPENDENCIES = $(shell ./find_dlls.sh -q -s $(SEARCHPATH) '../src/$(PACKAGE_NAME).exe') all: all-am .SUFFIXES: @@ -414,9 +416,11 @@ uninstall-am: .PHONY: installer +installer: $(PACKAGE_NAME)-Setup.exe $(PACKAGE_NAME)-Setup.exe: installer.nsi + mkdir -p deps + for file in $(DEPENDENCIES); do install "$$file" "deps/$$(basename "$$file")"; done 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. diff --git a/nsis/installer.nsi.in b/nsis/installer.nsi.in index f055455..18a52af 100644 --- a/nsis/installer.nsi.in +++ b/nsis/installer.nsi.in @@ -63,7 +63,7 @@ VIAddVersionKey "FileVersion" "${SETUP_VERSION}" Section "My Application" MyApp SetOutPath $INSTDIR File "..\src\@PACKAGE_NAME@.exe" - ;@DLL_DEPENDENCIES@ + File "deps\*.*" ;File "Readme.txt" WriteUninstaller "$INSTDIR\Uninstall.exe" SectionEnd @@ -72,6 +72,7 @@ SectionEnd ; Uninstaller Sections Section "Uninstall" Delete "$INSTDIR\@PACKAGE_NAME@.exe" + Delete "$INSTDIR\*.dll" Delete "$INSTDIR\Uninstall.exe" RMDir "$INSTDIR" ;DeleteRegKey /ifempty HKCU "Software\Modern UI Test" |