From c9c024c362db68a88241ffe40a6a44924937decb Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 11 Apr 2014 12:30:06 +0200 Subject: [PATCH] Fix some of the paths for the Docker scripts. Refs #5996 --- dev/clean | 3 +++ dev/docker/build | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100755 dev/clean diff --git a/dev/clean b/dev/clean new file mode 100755 index 000000000..07425fbb9 --- /dev/null +++ b/dev/clean @@ -0,0 +1,3 @@ +#!/bin/sh +cd `dirname -- $0` || exit 1 +rm -Rf .build diff --git a/dev/docker/build b/dev/docker/build index fcecb8577..4a34e0004 100755 --- a/dev/docker/build +++ b/dev/docker/build @@ -6,8 +6,8 @@ fi cd -cp icinga2/tools/debug/gdb/gdbinit ~/.gdbinit -sed -i 's/home\/gbeutner/home\/icinga/' ~/.gdbinit +cp icinga2/tools/debug/gdb/gdbinit .gdbinit +sed -i 's/home\/gbeutner/home\/icinga/' .gdbinit cd icinga2-build || exit 1 @@ -15,7 +15,7 @@ CCACHE_SLOPPINESS="include_file_mtime" export CCACHE_SLOPPINESS if [ ! -e Makefile ]; then - CC="ccache clang" CXX="ccache clang++" cmake ../icinga2 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=~/icinga2-install -DCMAKE_INSTALL_SYSCONFDIR=~/icinga2-config + CC="ccache clang" CXX="ccache clang++" cmake ../icinga2 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$HOME/icinga2-install -DCMAKE_INSTALL_SYSCONFDIR=$HOME/icinga2-config fi -make -j 4 && make install && cgdb -ex set scheduler-locking step -ex r --args ~/icinga2-install/sbin/icinga2 -c ~/icinga2-config/icinga2/icinga2.conf -DUseVfork=0 +make -j 4 && make install && cgdb -ex set scheduler-locking step -ex r --args ../icinga2-install/sbin/icinga2 -c ../icinga2-config/icinga2/icinga2.conf -DUseVfork=0 -- 2.40.0