Module: check_mk
Branch: master
Commit: 1d2bfa8151f274ff46742cf9f9bf8c864d838f4d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d2bfa8151f274…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Oct 4 10:42:45 2017 +0200
Updated precompiled windows agent files
Change-Id: If97d19dc81b768eeffa3ea729f6369824f404cb5
---
agents/Makefile | 2 +-
agents/windows/Makefile | 9 ++++-----
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 1568768 -> 1568768 bytes
agents/windows/check_mk_agent-64.unstripped.exe | Bin 22974157 -> 22974157 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 1568768 -> 1568768 bytes
agents/windows/check_mk_agent.exe | Bin 1552384 -> 1552384 bytes
agents/windows/check_mk_agent.msi | Bin 3395072 -> 3395072 bytes
agents/windows/check_mk_agent.unstripped.exe | Bin 19784372 -> 19784372 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 1552384 -> 1552384 bytes
agents/windows/install_agent-64.exe | Bin 683168 -> 683171 bytes
agents/windows/install_agent.exe | Bin 678265 -> 678268 bytes
12 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/agents/Makefile b/agents/Makefile
index b094217..85de987 100644
--- a/agents/Makefile
+++ b/agents/Makefile
@@ -61,7 +61,7 @@ setversion:
fi ; \
done ; \
$(MAKE) packages
- $(MAKE) -C windows NEW_VERSION=$(NEW_VERSION) setversion
+ cd windows ; ./make-agent
packages: rpm deb
diff --git a/agents/windows/Makefile b/agents/windows/Makefile
index 1c58698..899a938 100644
--- a/agents/windows/Makefile
+++ b/agents/windows/Makefile
@@ -46,9 +46,9 @@ ifneq (,$(MAKECMDGOALS))
endif
# Check if called inside chroot jail.
-#ifneq (WinAgent,$(CHROOTNAME))
-# $(error "Not allowed outside chroot. Please call
'./make-agent$(SEPARATOR)$(MAKECMDGOALS)' instead")
-#endif
+ifneq (WinAgent,$(CHROOTNAME))
+ $(error "Not allowed outside chroot. Please call
'./make-agent$(SEPARATOR)$(MAKECMDGOALS)' instead")
+endif
ifeq ($(shell uname),Linux)
CXX = i686-w64-mingw32-g++-posix
@@ -65,8 +65,7 @@ all: directories fix_linebreaks check_mk_agent.exe check_mk_agent-64.exe
install
setversion:
sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION
"'$(NEW_VERSION)'"/' installer*.nsi ; \
sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile
; \
- rm check_mk_agent.exe check_mk_agent-64.exe check_mk_agent.msi ; \
- make install_agent.exe install_agent-64.exe msi_installer
+ $(MAKE) clean install_agent.exe install_agent-64.exe msi_installer
# Converts all files which are targeted to a windows system to CRLF
fix_linebreaks:
diff --git a/agents/windows/build_version b/agents/windows/build_version
index 5672c98..fc818e9 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-2938
+2940
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index 4884f6a..461f508 100755
Binary files a/agents/windows/check_mk_agent-64.exe and
b/agents/windows/check_mk_agent-64.exe differ
diff --git a/agents/windows/check_mk_agent-64.unstripped.exe
b/agents/windows/check_mk_agent-64.unstripped.exe
index 9313547..ae30283 100755
Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and
b/agents/windows/check_mk_agent-64.unstripped.exe differ
diff --git a/agents/windows/check_mk_agent-64.unversioned.exe
b/agents/windows/check_mk_agent-64.unversioned.exe
index 1c0c693..17842e2 100755
Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and
b/agents/windows/check_mk_agent-64.unversioned.exe differ
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index e8eb7ee..7f1efc7 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe
differ
diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi
index 46ca8f7..17b83e0 100755
Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi
differ
diff --git a/agents/windows/check_mk_agent.unstripped.exe
b/agents/windows/check_mk_agent.unstripped.exe
index 6d31405..624767c 100755
Binary files a/agents/windows/check_mk_agent.unstripped.exe and
b/agents/windows/check_mk_agent.unstripped.exe differ
diff --git a/agents/windows/check_mk_agent.unversioned.exe
b/agents/windows/check_mk_agent.unversioned.exe
index d077a3f..7afb3ec 100755
Binary files a/agents/windows/check_mk_agent.unversioned.exe and
b/agents/windows/check_mk_agent.unversioned.exe differ
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 70bec4d..4dc23be 100755
Binary files a/agents/windows/install_agent-64.exe and
b/agents/windows/install_agent-64.exe differ
diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe
index f89335c..196ac3e 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ