From 5e6dd5751803ae077ee45f9da7a25499cab9226a Mon Sep 17 00:00:00 2001 From: Roy Keene Date: Mon, 1 Oct 2018 09:19:16 -0500 Subject: [PATCH 1/8] Renamed Ubuntu build prep to be in-line with other build prep --- .gitlab-ci.yml | 2 +- ci/ubuntu_prep.sh => util/build_prep/ubuntu/prep.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename ci/ubuntu_prep.sh => util/build_prep/ubuntu/prep.sh (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eefa7c1b2d..db9a10fed7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,7 @@ Arch Linux: FLAVOR: trusty before_script: - - ./ci/ubuntu_prep.sh + - ./util/build_prep/ubuntu/prep.sh - ./ci/bootstrap_boost.sh diff --git a/ci/ubuntu_prep.sh b/util/build_prep/ubuntu/prep.sh similarity index 100% rename from ci/ubuntu_prep.sh rename to util/build_prep/ubuntu/prep.sh From 57925aa243c7881c1c2a5ba588949365f3440951 Mon Sep 17 00:00:00 2001 From: Roy Keene Date: Mon, 1 Oct 2018 09:20:54 -0500 Subject: [PATCH 2/8] Update build_prep scripts --- util/build_prep/macosx/prep.sh | 144 +++++++++++++++++++++++++++++++++ util/build_prep/ubuntu/prep.sh | 25 ++++-- 2 files changed, 163 insertions(+), 6 deletions(-) create mode 100755 util/build_prep/macosx/prep.sh diff --git a/util/build_prep/macosx/prep.sh b/util/build_prep/macosx/prep.sh new file mode 100755 index 0000000000..8b6d4cf93d --- /dev/null +++ b/util/build_prep/macosx/prep.sh @@ -0,0 +1,144 @@ +#! /usr/bin/env bash + +# ----BEGIN COMMON.SH----- +function boost_version () { + local boost_version + boost_version="$( + set -o pipefail + echo $'#include \nBOOST_LIB_VERSION' | cc -E - 2>/dev/null | tail -n 1 | sed 's@"@@g;s@_@.@g' + )" || boost_version='' + + echo "${boost_version}" +} + +function check_create_boost () { + local boost_version + boost_version="$(boost_version)" + + if [ -n "${boost_version}" ]; then + function boost () { + local arg + local version + + arg="$1" + + version="$(boost_version)" + if [ -z "${version}" ]; then + return 1 + fi + + case "${arg}" in + '') + return 0 + ;; + '--version') + echo "${version}" + return 0 + ;; + '--install-prefix') + echo '#include ' | cc -v -E - 2>/dev/null | grep '/version.hpp' | sed 's@^[^"]*"@@;s@/version\.hpp".*$@@' + return 0 + ;; + esac + + return 1 + } + fi +} + +function have () { + local program + + program="$1" + + check_create_boost + + type -t "${program}" >/dev/null 2>/dev/null +} + +function version_min () { + local version_command below_min_version + local check_version + + version_command="$1" + below_min_version="$2" + + check_version="$( + ( + eval "${version_command}" | awk '{ print $NF }' | grep '^[0-9]' + echo "${below_min_version}" + ) | sort -rV | head -n 1 + )" + + if [ "${check_version}" = "${below_min_version}" ]; then + return 1 + fi + + return 0 +} +# -----END COMMON.SH----- + +# Ensure we have a new enough CMake +if ! have cmake; then + brew install cmake || exit 1 + brew link cmake || exit 1 +fi + +if ! have cmake; then + echo "Unable to install cmake" >&2 + + exit 1 +fi + +if ! version_min 'cmake --version' 3.3.999; then + echo "cmake version too low (3.4+ required)" >&2 + + exit 1 +fi + +# Ensure we have a new enough Boost +if ! have boost; then + brew install boost --without-single || exit 1 + brew link boost || exit 1 +fi + +if ! have boost; then + echo "Unable to install boost" >&2 + + exit 1 +fi + +if ! version_min 'boost --version' 1.65.999; then + echo "boost version too low (1.66.0+ required)" >&2 + + exit 1 +fi +boost_dir="$(boost --install-prefix)" + +# Ensure we have a new enough Qt5 +PATH="${PATH}:/usr/local/opt/qt/bin" +export PATH +if ! have qtpaths; then + brew install qt5 || exit 1 +fi + +if ! have qtpaths; then + echo "Unable to install qt5" >&2 + + exit 1 +fi + +if ! version_min 'qtpaths --qt-version' 4.999; then + echo "qt5 version too low (5.0+ required)" >&2 + + exit 1 +fi +qt5_dir="$(qtpaths --install-prefix)" + +echo "All verified." +echo "" +echo "Next steps:" +echo " cmake -DBOOST_ROOT=${boost_dir} -DRAIBLOCKS_GUI=ON -DQt5_DIR=${qt5_dir}/lib/cmake/Qt5 " +echo " cpack -G \"DragNDrop\"" + +exit 0 diff --git a/util/build_prep/ubuntu/prep.sh b/util/build_prep/ubuntu/prep.sh index 7762109bb4..db0272908e 100755 --- a/util/build_prep/ubuntu/prep.sh +++ b/util/build_prep/ubuntu/prep.sh @@ -1,14 +1,27 @@ -#!/bin/bash +#! /usr/bin/env bash export DEBIAN_FRONTEND=noninteractive set -euo pipefail -apt-get update -apt-get --yes --force-yes install git cmake ninja-build autotools-dev \ +apt-get update --yes +apt-get --yes install git cmake ninja-build autotools-dev \ build-essential g++ clang python-dev \ - libicu-dev libbz2-dev libboost-all-dev \ + libicu-dev libbz2-dev \ locales wget curl apt-utils \ lsb-release -apt-get --yes --force-yes install xorg xvfb xauth xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic -apt-get --yes --force-yes install libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler +apt-get --yes install xorg xvfb xauth xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic +apt-get --yes install libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler +apt remove --yes libboost-all-dev +apt autoremove --yes + +# XXX:TODO: Use common.sh +boost_dir=/usr/local/boost + +echo "All verified." +echo "" +echo "Next steps:" +echo " cmake -DBOOST_ROOT=${boost_dir} -DRAIBLOCKS_GUI=ON " +echo " cpack -G \"TBZ2\"" + +exit 0 From cd4d362313eba80db5bb7af7c1cca1a1fa03021d Mon Sep 17 00:00:00 2001 From: Roy Keene Date: Mon, 1 Oct 2018 09:21:05 -0500 Subject: [PATCH 3/8] Update boost bootstrap --- ci/bootstrap_boost.sh | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/ci/bootstrap_boost.sh b/ci/bootstrap_boost.sh index c963c496c1..d14a93c9a0 100755 --- a/ci/bootstrap_boost.sh +++ b/ci/bootstrap_boost.sh @@ -4,29 +4,50 @@ set -o errexit set -o xtrace bootstrapArgs=() -while getopts 'm' OPT; do +useClang='false' +while getopts 'mc' OPT; do case "${OPT}" in m) bootstrapArgs+=('--with-libraries=thread,log,filesystem,program_options') ;; + c) + useClang='true' + ;; esac done +if ! c++ --version >/dev/null 2>/dev/null; then + useClang='true' + + if ! clang++ --version >/dev/null 2>/dev/null; then + echo "Unable to find a usable toolset" >&2 + + exit 1 + fi +fi + +if [ "${useClang}" = 'true' ]; then + bootstrapArgs+=(--with-toolset=clang) +fi + BOOST_BASENAME=boost_1_66_0 BOOST_ROOT=${BOOST_ROOT-/usr/local/boost} BOOST_URL=https://downloads.sourceforge.net/project/boost/boost/1.66.0/${BOOST_BASENAME}.tar.bz2 BOOST_ARCHIVE="${BOOST_BASENAME}.tar.bz2" BOOST_ARCHIVE_SHA256='5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9' -wget --quiet -O "${BOOST_ARCHIVE}.new" "${BOOST_URL}" -checkHash="$(openssl dgst -sha256 "${BOOST_ARCHIVE}.new" | sed 's@^.*= *@@')" -if [ "${checkHash}" != "${BOOST_ARCHIVE_SHA256}" ]; then - echo "Checksum mismatch. Expected ${BOOST_ARCHIVE_SHA256}, got ${checkHash}" >&2 +if [ ! -f "${BOOST_ARCHIVE}" ]; then + wget --quiet -O "${BOOST_ARCHIVE}.new" "${BOOST_URL}" + checkHash="$(openssl dgst -sha256 "${BOOST_ARCHIVE}.new" | sed 's@^.*= *@@')" + if [ "${checkHash}" != "${BOOST_ARCHIVE_SHA256}" ]; then + echo "Checksum mismatch. Expected ${BOOST_ARCHIVE_SHA256}, got ${checkHash}" >&2 - exit 1 + exit 1 + fi + mv "${BOOST_ARCHIVE}.new" "${BOOST_ARCHIVE}" || exit 1 fi -mv "${BOOST_ARCHIVE}.new" "${BOOST_ARCHIVE}" +rm -rf ${BOOST_BASENAME} tar xf "${BOOST_ARCHIVE}" cd ${BOOST_BASENAME} ./bootstrap.sh "${bootstrapArgs[@]}" From e3cc66fac6c7e68e1a0e7266828d9c4cf92aeae4 Mon Sep 17 00:00:00 2001 From: Roy Keene Date: Mon, 1 Oct 2018 09:40:39 -0500 Subject: [PATCH 4/8] Fixed typo --- util/build_prep/macosx/prep.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/build_prep/macosx/prep.sh b/util/build_prep/macosx/prep.sh index 8b6d4cf93d..6c32265f90 100755 --- a/util/build_prep/macosx/prep.sh +++ b/util/build_prep/macosx/prep.sh @@ -1,6 +1,6 @@ #! /usr/bin/env bash -# ----BEGIN COMMON.SH----- +# -----BEGIN COMMON.SH----- function boost_version () { local boost_version boost_version="$( From aeb2ca1c0659e86f937b314a60cf29e62a52019f Mon Sep 17 00:00:00 2001 From: Roy Keene Date: Mon, 1 Oct 2018 09:41:18 -0500 Subject: [PATCH 5/8] Added script to separate out the common parts --- util/build_prep/common.sh | 75 ++++++++++++++++++++++++++++++++ util/build_prep/ubuntu/prep.sh | 78 ++++++++++++++++++++++++++++++++++ util/build_prep/update-common | 47 ++++++++++++++++++++ 3 files changed, 200 insertions(+) create mode 100644 util/build_prep/common.sh create mode 100755 util/build_prep/update-common diff --git a/util/build_prep/common.sh b/util/build_prep/common.sh new file mode 100644 index 0000000000..fe578e185f --- /dev/null +++ b/util/build_prep/common.sh @@ -0,0 +1,75 @@ +function boost_version () { + local boost_version + boost_version="$( + set -o pipefail + echo $'#include \nBOOST_LIB_VERSION' | cc -E - 2>/dev/null | tail -n 1 | sed 's@"@@g;s@_@.@g' + )" || boost_version='' + + echo "${boost_version}" +} + +function check_create_boost () { + local boost_version + boost_version="$(boost_version)" + + if [ -n "${boost_version}" ]; then + function boost () { + local arg + local version + + arg="$1" + + version="$(boost_version)" + if [ -z "${version}" ]; then + return 1 + fi + + case "${arg}" in + '') + return 0 + ;; + '--version') + echo "${version}" + return 0 + ;; + '--install-prefix') + echo '#include ' | cc -v -E - 2>/dev/null | grep '/version.hpp' | sed 's@^[^"]*"@@;s@/version\.hpp".*$@@' + return 0 + ;; + esac + + return 1 + } + fi +} + +function have () { + local program + + program="$1" + + check_create_boost + + type -t "${program}" >/dev/null 2>/dev/null +} + +function version_min () { + local version_command below_min_version + local check_version + + version_command="$1" + below_min_version="$2" + + check_version="$( + ( + eval "${version_command}" | awk '{ print $NF }' | grep '^[0-9]' + echo "${below_min_version}" + ) | sort -rV | head -n 1 + )" + + if [ "${check_version}" = "${below_min_version}" ]; then + return 1 + fi + + return 0 +} diff --git a/util/build_prep/ubuntu/prep.sh b/util/build_prep/ubuntu/prep.sh index db0272908e..b4dbd1b8fc 100755 --- a/util/build_prep/ubuntu/prep.sh +++ b/util/build_prep/ubuntu/prep.sh @@ -1,5 +1,83 @@ #! /usr/bin/env bash +# -----BEGIN COMMON.SH----- +function boost_version () { + local boost_version + boost_version="$( + set -o pipefail + echo $'#include \nBOOST_LIB_VERSION' | cc -E - 2>/dev/null | tail -n 1 | sed 's@"@@g;s@_@.@g' + )" || boost_version='' + + echo "${boost_version}" +} + +function check_create_boost () { + local boost_version + boost_version="$(boost_version)" + + if [ -n "${boost_version}" ]; then + function boost () { + local arg + local version + + arg="$1" + + version="$(boost_version)" + if [ -z "${version}" ]; then + return 1 + fi + + case "${arg}" in + '') + return 0 + ;; + '--version') + echo "${version}" + return 0 + ;; + '--install-prefix') + echo '#include ' | cc -v -E - 2>/dev/null | grep '/version.hpp' | sed 's@^[^"]*"@@;s@/version\.hpp".*$@@' + return 0 + ;; + esac + + return 1 + } + fi +} + +function have () { + local program + + program="$1" + + check_create_boost + + type -t "${program}" >/dev/null 2>/dev/null +} + +function version_min () { + local version_command below_min_version + local check_version + + version_command="$1" + below_min_version="$2" + + check_version="$( + ( + eval "${version_command}" | awk '{ print $NF }' | grep '^[0-9]' + echo "${below_min_version}" + ) | sort -rV | head -n 1 + )" + + if [ "${check_version}" = "${below_min_version}" ]; then + return 1 + fi + + return 0 +} +# -----END COMMON.SH----- + export DEBIAN_FRONTEND=noninteractive set -euo pipefail diff --git a/util/build_prep/update-common b/util/build_prep/update-common new file mode 100755 index 0000000000..0a7c47bd1c --- /dev/null +++ b/util/build_prep/update-common @@ -0,0 +1,47 @@ +#! /usr/bin/env bash + +cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 + +for file in */prep.sh; do + if ! grep '^#* *-----BEGIN COMMON\.SH-----$' "${file}" >/dev/null 2>/dev/null; then + echo "Skipping \"${file}\"..." + + continue + fi + + echo "Updating \"${file}\"..." + + rm -f "${file}.new" + awk -v insideCommon=0 ' + /^#* *-----BEGIN COMMON\.SH-----$/{ + insideCommon = 1; + print; + } + + /^#* *-----END COMMON\.SH-----$/{ + # Save the current line + terminator = $0; + + # Print out the common script + while (getline <"common.sh") { + print; + } + close("common.sh"); + + insideCommon = 0; + + $0 = terminator; + } + + { + # Skip over the existing contents + if (insideCommon == 1) { + next; + } + + print; + } + ' < "${file}" > "${file}.new" + cat "${file}.new" > "${file}" + rm -f "${file}.new" +done From c8132b93ab7ece95e600d0f3755f7e84ef00995e Mon Sep 17 00:00:00 2001 From: Roy Keene Date: Mon, 1 Oct 2018 09:57:41 -0500 Subject: [PATCH 6/8] Better handling of boost on Ubuntu --- .gitlab-ci.yml | 21 +++++++-------------- {ci => util/build_prep}/bootstrap_boost.sh | 0 util/build_prep/common.sh | 2 ++ util/build_prep/macosx/prep.sh | 2 ++ util/build_prep/ubuntu/prep.sh | 20 ++++++++++++++++++-- 5 files changed, 29 insertions(+), 16 deletions(-) rename {ci => util/build_prep}/bootstrap_boost.sh (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db9a10fed7..57b874e1c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,6 @@ Arch Linux: before_script: - ./util/build_prep/ubuntu/prep.sh - - ./ci/bootstrap_boost.sh Ubuntu Linux Artful: @@ -63,8 +62,7 @@ Ubuntu Linux Artful: FLAVOR: artful before_script: - - ./ci/ubuntu_prep.sh - - ./ci/bootstrap_boost.sh + - ./util/build_prep/ubuntu/prep.sh Ubuntu Linux Xenial: <<: *linux_cfg @@ -74,8 +72,7 @@ Ubuntu Linux Xenial: FLAVOR: xenial before_script: - - ./ci/ubuntu_prep.sh - - ./ci/bootstrap_boost.sh + - ./util/build_prep/ubuntu/prep.sh Ubuntu Linux Xenial Beta: <<: *linux_cfg @@ -86,8 +83,7 @@ Ubuntu Linux Xenial Beta: BETA: 1 before_script: - - ./ci/ubuntu_prep.sh - - ./ci/bootstrap_boost.sh + - ./util/build_prep/ubuntu/prep.sh Xenial OPTIMIZED: <<: *linux_cfg @@ -98,8 +94,7 @@ Xenial OPTIMIZED: SIMD: 1 before_script: - - ./ci/ubuntu_prep.sh - - ./ci/bootstrap_boost.sh + - ./util/build_prep/ubuntu/prep.sh Artful OPTIMIZED: <<: *linux_cfg @@ -110,8 +105,7 @@ Artful OPTIMIZED: SIMD: 1 before_script: - - ./ci/ubuntu_prep.sh - - ./ci/bootstrap_boost.sh + - ./util/build_prep/ubuntu/prep.sh # DISABLED for now @@ -123,8 +117,7 @@ Artful OPTIMIZED: FLAVOR: zesty_asan before_script: - - ./ci/ubuntu_prep.sh - - ./ci/bootstrap_boost.sh + - ./util/build_prep/ubuntu/prep.sh @@ -137,7 +130,7 @@ Artful OPTIMIZED: FLAVOR: zesty_tsan before_script: - - ./ci/ubuntu_prep.sh + - ./util/build_prep/ubuntu/prep.sh diff --git a/ci/bootstrap_boost.sh b/util/build_prep/bootstrap_boost.sh similarity index 100% rename from ci/bootstrap_boost.sh rename to util/build_prep/bootstrap_boost.sh diff --git a/util/build_prep/common.sh b/util/build_prep/common.sh index fe578e185f..8df4d5fd49 100644 --- a/util/build_prep/common.sh +++ b/util/build_prep/common.sh @@ -1,3 +1,5 @@ +scriptDirectory="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || exit 1 + function boost_version () { local boost_version boost_version="$( diff --git a/util/build_prep/macosx/prep.sh b/util/build_prep/macosx/prep.sh index 6c32265f90..06493e91cf 100755 --- a/util/build_prep/macosx/prep.sh +++ b/util/build_prep/macosx/prep.sh @@ -1,6 +1,8 @@ #! /usr/bin/env bash # -----BEGIN COMMON.SH----- +scriptDirectory="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || exit 1 + function boost_version () { local boost_version boost_version="$( diff --git a/util/build_prep/ubuntu/prep.sh b/util/build_prep/ubuntu/prep.sh index b4dbd1b8fc..2aaf69a0b2 100755 --- a/util/build_prep/ubuntu/prep.sh +++ b/util/build_prep/ubuntu/prep.sh @@ -1,6 +1,8 @@ #! /usr/bin/env bash # -----BEGIN COMMON.SH----- +scriptDirectory="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || exit 1 + function boost_version () { local boost_version boost_version="$( @@ -93,8 +95,22 @@ apt-get --yes install libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5- apt remove --yes libboost-all-dev apt autoremove --yes -# XXX:TODO: Use common.sh -boost_dir=/usr/local/boost +if ! have boost; then + "${scriptDirectory}/../bootstrap_boost.sh" -m +fi + +if ! have boost; then + echo "Unable to install boost" >&2 + + exit 1 +fi + +if ! version_min 'boost --version' 1.65.999; then + echo "boost version too low (1.66.0+ required)" >&2 + exit 1 +fi + +boost_dir="$(boost --install-prefix)" echo "All verified." echo "" From c6208a442cb68305b16959998bd26d0304f926fd Mon Sep 17 00:00:00 2001 From: Roy Keene Date: Mon, 1 Oct 2018 10:08:21 -0500 Subject: [PATCH 7/8] Ensure boost is searched for in various paths --- util/build_prep/common.sh | 2 +- util/build_prep/macosx/prep.sh | 3 ++- util/build_prep/ubuntu/prep.sh | 3 ++- util/build_prep/update-common | 4 ++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/util/build_prep/common.sh b/util/build_prep/common.sh index 8df4d5fd49..90bffd06e0 100644 --- a/util/build_prep/common.sh +++ b/util/build_prep/common.sh @@ -4,7 +4,7 @@ function boost_version () { local boost_version boost_version="$( set -o pipefail - echo $'#include \nBOOST_LIB_VERSION' | cc -E - 2>/dev/null | tail -n 1 | sed 's@"@@g;s@_@.@g' + echo $'#include \nBOOST_LIB_VERSION' | cc -I/usr/local/boost/include -E - 2>/dev/null | tail -n 1 | sed 's@"@@g;s@_@.@g' )" || boost_version='' echo "${boost_version}" diff --git a/util/build_prep/macosx/prep.sh b/util/build_prep/macosx/prep.sh index 06493e91cf..0b700bb4bb 100755 --- a/util/build_prep/macosx/prep.sh +++ b/util/build_prep/macosx/prep.sh @@ -1,13 +1,14 @@ #! /usr/bin/env bash # -----BEGIN COMMON.SH----- +# DO NOT EDIT THIS SECTION, INSTEAD EDIT ../common.sh scriptDirectory="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || exit 1 function boost_version () { local boost_version boost_version="$( set -o pipefail - echo $'#include \nBOOST_LIB_VERSION' | cc -E - 2>/dev/null | tail -n 1 | sed 's@"@@g;s@_@.@g' + echo $'#include \nBOOST_LIB_VERSION' | cc -I/usr/local/boost/include -E - 2>/dev/null | tail -n 1 | sed 's@"@@g;s@_@.@g' )" || boost_version='' echo "${boost_version}" diff --git a/util/build_prep/ubuntu/prep.sh b/util/build_prep/ubuntu/prep.sh index 2aaf69a0b2..fe8b47feaa 100755 --- a/util/build_prep/ubuntu/prep.sh +++ b/util/build_prep/ubuntu/prep.sh @@ -1,13 +1,14 @@ #! /usr/bin/env bash # -----BEGIN COMMON.SH----- +# DO NOT EDIT THIS SECTION, INSTEAD EDIT ../common.sh scriptDirectory="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || exit 1 function boost_version () { local boost_version boost_version="$( set -o pipefail - echo $'#include \nBOOST_LIB_VERSION' | cc -E - 2>/dev/null | tail -n 1 | sed 's@"@@g;s@_@.@g' + echo $'#include \nBOOST_LIB_VERSION' | cc -I/usr/local/boost/include -E - 2>/dev/null | tail -n 1 | sed 's@"@@g;s@_@.@g' )" || boost_version='' echo "${boost_version}" diff --git a/util/build_prep/update-common b/util/build_prep/update-common index 0a7c47bd1c..bf024f7bf1 100755 --- a/util/build_prep/update-common +++ b/util/build_prep/update-common @@ -22,6 +22,10 @@ for file in */prep.sh; do # Save the current line terminator = $0; + # Print out a notification to not edit the + # individual scripts + print "# DO NOT EDIT THIS SECTION, INSTEAD EDIT ../common.sh"; + # Print out the common script while (getline <"common.sh") { print; From 0d3bca552703211e286777638a074a4367183052 Mon Sep 17 00:00:00 2001 From: Roy Keene Date: Mon, 1 Oct 2018 10:11:06 -0500 Subject: [PATCH 8/8] Update Docker file --- docker/node/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile index ece9f9a4b3..68c48130a3 100644 --- a/docker/node/Dockerfile +++ b/docker/node/Dockerfile @@ -5,13 +5,14 @@ ARG NETWORK=live ENV BOOST_ROOT=/tmp/boost_install ADD ci /tmp/ci +ADD util /tmp/util RUN apt-get update -qq && apt-get install -yqq \ build-essential \ cmake \ g++ \ wget && \ - /tmp/ci/bootstrap_boost.sh -m + /tmp/util/build_prep/bootstrap_boost.sh -m ADD ./ /tmp/src