tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some of the paths for the Docker scripts. 

Refs #5996
This commit is contained in:
Gunnar Beutner 2014-04-11 12:30:06 +02:00
parent a601911059
commit c9c024c362
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/clean Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
cd `dirname -- $0` || exit 1
rm -Rf .build

8
dev/docker/build
View File

@ -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