Module: check_mk
Branch: master
Commit: fa7181c81727ac75f41ba77ee412ba2bd8004852
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa7181c81727ac…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jan 10 10:37:54 2012 +0100
make version also updates the windows agent installer
---
Makefile | 1 +
agents/windows/installer.nsi | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 569484d..49d32ff 100644
--- a/Makefile
+++ b/Makefile
@@ -117,6 +117,7 @@ setversion:
fi ; \
done ; \
sed -i 's/#define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION
"'$(NEW_VERSION)'"/' agents/windows/check_mk_agent.cc ; \
+ sed -i 's/!define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION
"'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \
sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus],
['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/'
livestatus/configure.ac ; \
sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/'
scripts/setup.sh ; \
echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \
diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi
index 715197d..025583e 100644
--- a/agents/windows/installer.nsi
+++ b/agents/windows/installer.nsi
@@ -4,8 +4,8 @@
; Useful sources:
;
http://nsis.sourceforge.net/Reusable_installer_script
-!define VERSION "1.1.13i3"
-!define NAME "Check_MK Agent ${VERSION}"
+!define CHECK_MK_VERSION "1.1.13i3"
+!define NAME "Check_MK Agent ${CHECK_MK_VERSION}"
XPStyle on
Icon "installer.ico"
@@ -14,7 +14,7 @@ Icon "installer.ico"
Name "${NAME}"
; The file to write
-OutFile "check_mk_agent_install-${VERSION}.exe"
+OutFile "check_mk_agent_install-${CHECK_MK_VERSION}.exe"
SetDateSave on
SetDatablockOptimize on