Commit 7c4e49ce authored by Ciro Santilli's avatar Ciro Santilli

Untested static build, debug log by default on run

parent 51183ef1
...@@ -5,15 +5,20 @@ ...@@ -5,15 +5,20 @@
# Flags: # Flags:
# -g: install globally instead for all users # -g: install globally instead for all users
# -s: link everything statically, no D-Bus communication. More likely to work!
set -ex set -ex
global=false global=false
while getopts g OPT; do static=''
while getopts gs OPT; do
case "$OPT" in case "$OPT" in
g) g)
global='true' global='true'
;; ;;
s)
static='-DENABLE_STATIC=true'
;;
\?) \?)
exit 1 exit 1
;; ;;
...@@ -54,12 +59,10 @@ cd "${TOP}/lrc" ...@@ -54,12 +59,10 @@ cd "${TOP}/lrc"
mkdir -p build mkdir -p build
cd build cd build
if $global; then if $global; then
cmake .. -DCMAKE_BUILD_TYPE=Debug cmake .. -DCMAKE_BUILD_TYPE=Debug $static
else else
cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${INSTALL}/lrc" -DRING_BUILD_DIR="${DAEMON}/src" cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${INSTALL}/lrc" -DRING_BUILD_DIR="${DAEMON}/src" $static
fi fi
# If we don't use -DENABLE_STATIC here and on the client,
# we'd have to point LD_LIBRARY_PATH to the directory containing libringclient.so
make make
make_install $global make_install $global
...@@ -67,9 +70,9 @@ cd "${TOP}/client-gnome" ...@@ -67,9 +70,9 @@ cd "${TOP}/client-gnome"
mkdir -p build mkdir -p build
cd build cd build
if $global; then if $global; then
cmake .. cmake .. $static
else else
cmake .. -DCMAKE_INSTALL_PREFIX="${INSTALL}/client-gnome" -DLibRingClient_DIR="${INSTALL}/lrc/lib/cmake/LibRingClient" cmake .. -DCMAKE_INSTALL_PREFIX="${INSTALL}/client-gnome" -DLibRingClient_DIR="${INSTALL}/lrc/lib/cmake/LibRingClient" $static
fi fi
make make
make_install $global make_install $global
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Run local install daemon and client that have # Run local install daemon and client that have
# been installed with the install script on the background. # been installed with the install script on the background.
cd "$(dirname "${BASH_SOURCE[0]}")" cd "$(dirname "${BASH_SOURCE[0]}")"
./install/daemon/libexec/dring >>daemon.log 2>&1 & ./install/daemon/libexec/dring -c -d >>daemon.log 2>&1 &
echo $! >daemon.pid echo $! >daemon.pid
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:install/lrc/lib" ./install/client-gnome/bin/gnome-ring >>client-gnome.log 2>&1 & LD_LIBRARY_PATH="$LD_LIBRARY_PATH:install/lrc/lib" ./install/client-gnome/bin/gnome-ring -d >>client-gnome.log 2>&1 &
echo $! >client-gnome.pid echo $! >client-gnome.pid
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment