[checkmk-commits] Remove dependency on Git for Windows agent build

Module: check_mk Branch: master Commit: 616a420c03b7f8e898c6770dad179e542eed0831 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=616a420c03b7f8… Author: Jukka Aro &lt;ja(a)mathias-kettner.de&gt; Date: Thu Oct 12 09:32:57 2017 +0200 Remove dependency on Git for Windows agent build Windows agent has had a dependency to Git revision that is included as extra information for crash debug log prints. As Git is not available during the build on our build server, this dependency cannot be there any more. Just give the Check_MK version out in the crah log, instead. Change-Id: Ie9f0b0ee5bd7e44e98160a41bdc8d77f0f3105c9 --- agents/windows/CrashHandler.cc | 4 ++-- agents/windows/Makefile.am | 4 +--- agents/windows/chroot_version | 2 +- agents/windows/make-chroot | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/agents/windows/CrashHandler.cc b/agents/windows/CrashHandler.cc index 05be84f..d535693 100644 --- a/agents/windows/CrashHandler.cc +++ b/agents/windows/CrashHandler.cc @@ -135,8 +135,8 @@ LONG WINAPI CrashHandler::handleCrash(LPEXCEPTION_POINTERS ptrs) const { << static_cast<unsigned int>( ptrs->ExceptionRecord->ExceptionCode) << " from address " - << ptrs->ExceptionRecord->ExceptionAddress << " (revision " - << VCS_REV << ")"; + << ptrs->ExceptionRecord->ExceptionAddress << " (Check_MK Version " + << CHECK_MK_VERSION << ")"; #ifdef __x86_64 diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 6b09d9f..7c17ac4 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -1,10 +1,8 @@ bin_PROGRAMS = check_mk_agent wmitest AUTOMAKE_OPTIONS = foreign -GIT_REV = $(shell git rev-parse --verify --short HEAD) COMMON_OPTS = -O2 -Wformat=2 -Werror -Wall -fno-rtti -std=c++14 -gdwarf-2 \ - -DCHECK_MK_VERSION='"$(VERSION)"' -D__USE_MINGW_ANSI_STDIO \ - -DVCS_REV=\"$(VERSION)-$(GIT_REV)\" + -DCHECK_MK_VERSION='"$(VERSION)"' -D__USE_MINGW_ANSI_STDIO AM_CPPFLAGS = $(COMMON_OPTS) AM_LDFLAGS = -static -static-libgcc -static-libstdc++ diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index 0cfbf08..00750ed 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -2 +3 diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index 8d2af14..5d713d8 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -54,7 +54,6 @@ package_names=( "ca-certificates" "gcc" "gettext" - "git" "lcab" "libauthen-sasl-perl" "libc6-dev"