From 44aba089781c858723c1458ec5cbcc9df9eafa91 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 20 Jun 2020 17:12:36 -0400 Subject: [PATCH] Tweaked build tools. --- tools/docker_tools/build_spark | 18 ++++++++++++++---- tools/docker_tools/dspark | 3 +-- tools/docker_tools/execute_in_docker | 4 +--- tools/docker_tools/rdm | 2 +- tools/docker_tools/run_spark | 27 +++++++++++++++++++++++++++ tools/docker_tools/run_spark_helper | 8 ++++++++ tools/docker_tools/setup_builds | 2 +- tools/docker_tools/spark_shell | 3 +-- tools/get_system_includes.sh | 2 +- 9 files changed, 55 insertions(+), 14 deletions(-) create mode 100755 tools/docker_tools/run_spark create mode 100755 tools/docker_tools/run_spark_helper diff --git a/tools/docker_tools/build_spark b/tools/docker_tools/build_spark index d84e212e7..27a026e68 100755 --- a/tools/docker_tools/build_spark +++ b/tools/docker_tools/build_spark @@ -1,10 +1,20 @@ #!/bin/bash - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +DIR="$(dirname "$(readlink -f "$0")")" SRC_ROOT=$DIR/../.. + BUILD_ROOT=`readlink -f $SRC_ROOT/build` -BUILD_TYPE="${1:-clang_debug}" + +case "$1" in + debug) + BUILD_TYPE=ninja_debug + ;; + release) + BUILD_TYPE=ninja_release + ;; + *) + BUILD_TYPE=clang_debug + ;; +esac BUILD_CMD="ninja -C $BUILD_ROOT/$BUILD_TYPE" touch $SRC_ROOT/CMakeLists.txt $DIR/execute_in_docker $BUILD_CMD - diff --git a/tools/docker_tools/dspark b/tools/docker_tools/dspark index 51010fee0..f9e6c7c87 100755 --- a/tools/docker_tools/dspark +++ b/tools/docker_tools/dspark @@ -1,6 +1,5 @@ #!/bin/bash - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +DIR="$(dirname "$(readlink -f "$0")")" SRC_ROOT=$DIR/../.. BUILD_ROOT=`readlink -f $SRC_ROOT/build` cgdb -- -ex start --cd=$BUILD_ROOT/ninja_debug/server --args ./sparkd run diff --git a/tools/docker_tools/execute_in_docker b/tools/docker_tools/execute_in_docker index ae4f2c320..8c6a5a497 100755 --- a/tools/docker_tools/execute_in_docker +++ b/tools/docker_tools/execute_in_docker @@ -1,8 +1,6 @@ #!/bin/bash - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +DIR="$(dirname "$(readlink -f "$0")")" SRC_ROOT=$DIR/../.. - CMD=$@ read -d '' docker_cmd << EOF diff --git a/tools/docker_tools/rdm b/tools/docker_tools/rdm index d81813e37..fa11b671d 100755 --- a/tools/docker_tools/rdm +++ b/tools/docker_tools/rdm @@ -1,5 +1,5 @@ #!/bin/bash -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +DIR="$(dirname "$(readlink -f "$0")")" $DIR/execute_in_docker /usr/local/bin/rdm $@ diff --git a/tools/docker_tools/run_spark b/tools/docker_tools/run_spark new file mode 100755 index 000000000..fd7914774 --- /dev/null +++ b/tools/docker_tools/run_spark @@ -0,0 +1,27 @@ +#!/bin/bash +DIR="$(dirname "$(readlink -f "$0")")" +SRC_ROOT=$DIR/../.. + +BUILD_ROOT=`readlink -f $SRC_ROOT/build` +case "$1" in + debug) + BUILD_TYPE=ninja_debug + BUILD_ARG=debug + SPARK_ARGS="${@:2}" + ;; + release) + BUILD_TYPE=ninja_release + BUILD_ARG=release + SPARK_ARGS="${@:2}" + ;; + *) + BUILD_TYPE=ninja_debug + BUILD_ARG=debug + SPARK_ARGS="${@:1}" + echo + ;; +esac +RUN_CMD="$DIR/run_spark_helper $BUILD_TYPE $SPARK_ARGS" +$DIR/build_spark $BUILD_ARG && $DIR/execute_in_docker $RUN_CMD + + diff --git a/tools/docker_tools/run_spark_helper b/tools/docker_tools/run_spark_helper new file mode 100755 index 000000000..83f511dc9 --- /dev/null +++ b/tools/docker_tools/run_spark_helper @@ -0,0 +1,8 @@ +#!/bin/bash +DIR="$(dirname "$(readlink -f "$0")")" +SRC_ROOT=$DIR/../.. +BUILD_TYPE=$1 +BUILD_ROOT=$SRC_ROOT/build/$BUILD_TYPE +ARGS="${@:2}" +(cd $BUILD_ROOT/server && ./sparkd $ARGS) + diff --git a/tools/docker_tools/setup_builds b/tools/docker_tools/setup_builds index ea6e1bb2b..09245dbb2 100755 --- a/tools/docker_tools/setup_builds +++ b/tools/docker_tools/setup_builds @@ -1,5 +1,5 @@ #!/bin/bash -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +DIR="$(dirname "$(readlink -f "$0")")" CMD="$DIR/../setup_builds.sh" $DIR/execute_in_docker "/bin/bash -c $CMD" diff --git a/tools/docker_tools/spark_shell b/tools/docker_tools/spark_shell index bb4d7d00b..0cbb68baa 100755 --- a/tools/docker_tools/spark_shell +++ b/tools/docker_tools/spark_shell @@ -1,6 +1,5 @@ #!/bin/bash - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +DIR="$(dirname "$(readlink -f "$0")")" SRC_ROOT=$DIR/../ $DIR/execute_in_docker /bin/bash diff --git a/tools/get_system_includes.sh b/tools/get_system_includes.sh index f5724e79e..0aec28e27 100755 --- a/tools/get_system_includes.sh +++ b/tools/get_system_includes.sh @@ -5,7 +5,7 @@ ROOT=$DIR/.. cd $ROOT # stdlib includes -find /usr/include/c++/7 -maxdepth 1 | sed s/\\/usr\\/include\\/c\+\+\\/7\\/// +find /usr/include/c++/7 -type f -maxdepth 1 | sed s/\\/usr\\/include\\/c\+\+\\/7\\/// # external includes find externals/linux/include/ -name "*.h" -or -name "*.hpp" | sed s/externals\\/linux\\/include\\///