[checkmk-commits] Fixed version info in crash log.

Module: check_mk Branch: master Commit: 992046911e2d761e2dd17e9b39f828bbab687b3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=992046911e2d76… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 14 11:38:55 2017 +0100 Fixed version info in crash log. Change-Id: I69e4544aa9fed94f9e781ba77225e6c6420bf9a7 --- agents/windows/Makefile | 4 ++-- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1329152 -> 1329152 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15658018 -> 15658018 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1329152 -> 1329152 bytes agents/windows/check_mk_agent.exe | Bin 1305600 -> 1305600 bytes agents/windows/check_mk_agent.msi | Bin 2904576 -> 2904576 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13549114 -> 13549114 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1305600 -> 1305600 bytes agents/windows/crash.exe | Bin 101624 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 567960 -> 586828 bytes agents/windows/install_agent.exe | Bin 565029 -> 583891 bytes agents/windows/nowin.exe | Bin 103760 -> 103760 bytes 13 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 6760c2a..c35eeab 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -27,12 +27,12 @@ SHELL = /bin/bash VERSION = 1.5.0i1 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres -GIT_REV = $(shell git describe --abbrev=4 --dirty --always --tags) +GIT_REV = $(shell git rev-parse --verify --short HEAD) DEPDIR = depend DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td -COMMON_OPTS = -Wall -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++14 -gdwarf-2 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO -DVCS_REV=\"$(GIT_REV)\" +COMMON_OPTS = -Wall -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++14 -gdwarf-2 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO -DVCS_REV=\"$(VERSION)-$(GIT_REV)\" COPTIONS = -O2 -Wformat=2 -Werror $(COMMON_OPTS) $(DEPFLAGS) # for debug builds #COPTIONS = -O0 $(COMMON_OPTS) $(DEPFLAGS) diff --git a/agents/windows/build_version b/agents/windows/build_version index 166c7ce..bcf6e41 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2539 +2541 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index f215b1b..b2ea483 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 f1b99ec..e84b793 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 881e4a6..3955a4d 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 79d7da4..ef93271 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 6905ccf..95b7b00 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 27c88b2..c35ce70 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 5ffebcf..11c52f4 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 70c7b87..a672400 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 8b51347..b5289a8 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 e97e527..ffb4e49 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 142db98..dbd94c0 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ