Module: check_mk Branch: master Commit: 4ab2b75da7cd3b1eae2a43666584801296d7dac1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ab2b75da7cd3b… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Jun 27 14:24:10 2014 +0200 Always provide also 64 bit version of Windows agent --- .werks/1034 | 8 ++++++++ ChangeLog | 1 + Makefile | 3 +-- agents/windows/Makefile | 18 +++++++++++++----- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 207360 -> 207360 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 207360 -> 207360 bytes agents/windows/check_mk_agent.exe | Bin 176640 -> 176640 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 176640 -> 176640 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 159342 -> 159344 bytes agents/windows/install_agent.exe | Bin 156399 -> 156401 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 13 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.werks/1034 b/.werks/1034 new file mode 100644 index 0000000..84f5860 --- /dev/null +++ b/.werks/1034 @@ -0,0 +1,8 @@ +Title: Always provide also 64 bit version of Windows agent +Level: 2 +Component: checks +Version: 1.2.5i5 +Date: 1403871810 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7bb5f9c..fe71d5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 0168 f5_bigip_pool: Added Wato configuration... * 0995 raritan_pdu_outletcount: new check for outlet count of Raritan PX-2000 family PDUs * 0169 websphere_mq_channels,ebsphere_mq_queues: New Checks to monitor IBM Websphere MQ Queues and Channels... + * 1034 Always provide also 64 bit version of Windows agent * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/Makefile b/Makefile index e3cb5d3..5cd80d8 100644 --- a/Makefile +++ b/Makefile @@ -154,7 +154,6 @@ setversion: fi ; \ done ; \ sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms - 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 -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" agents/windows/Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/&#39; livestatus/configure.ac ; \ @@ -162,7 +161,7 @@ setversion: sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' doc/treasures/mknotifyd ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ - cd agents/windows ; rm *.exe ; make ; cd ../.. ; \ + cd agents/windows ; rm check_mk_agent.exe check_mk_agent-64.exe ; make ; cd ../.. ; \ cp agents/windows/install_agent.exe check-mk-agent-$(NEW_VERSION).exe headers: diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 692cfa1..98a1538 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -38,16 +38,20 @@ endif all: install_agent.exe install_agent-64.exe +.PHONY: inc_build_version + + # ----------------------------------------------------------------------------- # 1. Create ressource files with version and product information. Note: That file # contains a dummy version number, which is later being replaced with the # actual version number, during 'make version' # ----------------------------------------------------------------------------- -check_mk_agent.rc: check_mk_agent.rc.in - BUILD_VERSION=$$(cat build_version ; echo $$(( $$(cat build_version) + 1 )) > build_version.new && mv build_version.new build_version) ; \ +inc_build_version: + echo $$(( $$(cat build_version) + 1 )) > build_version.new && mv build_version.new build_version + BUILD_VERSION=$$(cat build_version) ; \ sed -e "s/%VERSION%/$(VERSION_DUMMY)/g" \ -e "s/%YEAR%/$$(date +%Y)/g" \ - -e "s/%BUILD_VERSION%/$$BUILD_VERSION/g" $< > $@ + -e "s/%BUILD_VERSION%/$$BUILD_VERSION/g" check_mk_agent.rc.in > check_mk_agent.rc check_mk_agent.res: check_mk_agent.rc $(WINDRES) $< -O coff -o $@ @@ -60,10 +64,14 @@ check_mk_agent-64.res: check_mk_agent.rc # 2. Compile the Windows agent from the sources, without a specific version # number. Instead a placeholder is being used as version. # ----------------------------------------------------------------------------- -check_mk_agent.unversioned.exe: check_mk_agent.cc check_mk_agent.res +check_mk_agent.unversioned.exe: check_mk_agent.cc + $(MAKE) inc_build_version + $(MAKE) check_mk_agent.res $(CXX) $(COPTIONS) -o $@ $< check_mk_agent.res -lwsock32 -check_mk_agent-64.unversioned.exe: check_mk_agent.cc check_mk_agent-64.res +check_mk_agent-64.unversioned.exe: check_mk_agent.cc + $(MAKE) inc_build_version + $(MAKE) check_mk_agent-64.res $(CXX_64) $(COPTIONS) -o $@ $< check_mk_agent-64.res -lwsock32 diff --git a/agents/windows/build_version b/agents/windows/build_version index d00491f..b4de394 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1 +11 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 302c273..b16a42e 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.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 94f6bc8..44ae5ef 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 9ad7c18..734fc3f 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.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 8451748..d569119 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/crash.exe b/agents/windows/crash.exe index 6e383bf..2581c99 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 2dab775..535aa55 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 765e81a..85e13c4 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 92b3f05..bc04e04 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ