Skip to content

Commit b49362c

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 95cb640 + 7d1cbc4 commit b49362c

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

build_pybindings_for_dev.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ if [[ "$1" == "--only-rebuild-pybind11" ]]; then
1717
echo "Skipping Python requirements."
1818
else
1919
echo "Installing requirements and Python package and cleaning up."
20-
pip install -r py/requirements.txt
21-
pip install --force-reinstall -e ./py
20+
pip3 install -r py/requirements.txt
21+
pip3 install --force-reinstall -e ./py
2222
fi
2323

2424
echo "Validating installation."
25-
python -c "import evergreen; print('Evergreen imports successfully!')"
25+
python3 -c "import evergreen; print('Evergreen imports successfully!')"

configure.sh

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,32 @@
1+
#!/usr/bin/env bash
2+
13
set -e
24

35
cc_standard=20
46

5-
repo_root=$(pwd)
7+
repo_root=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
8+
deps_dir="${repo_root}/third_party"
9+
build_dir="${repo_root}/build"
610

711
# skip dependencies if specified
812
if [[ "$1" == "--skip-deps" ]]; then
913
echo "Skipping third-party dependencies build..."
1014
else
1115
echo "Updating submodules..."
12-
git submodule update --init --recursive
16+
(cd "${repo_root}" && git submodule update --init --recursive)
1317
echo "Building third-party dependencies..."
14-
cd third_party
15-
CC=clang CXX=clang++ ./build_deps.sh
16-
cd "$repo_root"
18+
(cd "${deps_dir}" && CC=clang CXX=clang++ ./build_deps.sh)
1719
fi
1820

19-
mkdir -p build
20-
cd build
21+
22+
2123
echo "Configuring build..."
22-
CC=clang CXX=clang++ cmake \
24+
(mkdir -p "${build_dir}" \
25+
&& cd "${build_dir}" \
26+
&& CC=clang CXX=clang++ cmake \
2327
-DCMAKE_CXX_STANDARD="${cc_standard}" \
2428
-DCMAKE_INSTALL_PREFIX="${repo_root}/install" \
2529
-DCMAKE_BUILD_TYPE=Debug \
2630
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
2731
-GNinja \
28-
..
32+
..)

third_party/build_deps.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#/usr/bin/env bash
2+
13
set -e
24

35
isset() { [[ $(eval echo "\${${1}+1}") ]]; }
@@ -18,7 +20,7 @@ if isunset build_folder_name; then
1820
build_folder_name="build"
1921
fi
2022

21-
python_exec_prefix=$(python -c "import sys; print(sys.exec_prefix)")
23+
python_exec_prefix=$(python3 -c "import sys; print(sys.exec_prefix)")
2224

2325
abseil_install_dir="${third_party_root}/build_deps/abseil-cpp"
2426
boost_install_dir="${third_party_root}/build_deps/boost"
@@ -103,6 +105,7 @@ cmake \
103105
-DCMAKE_CXX_STANDARD="${cc_standard}" \
104106
-DCMAKE_INSTALL_PREFIX="${third_party_root}/build_deps/libzmq" \
105107
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
108+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
106109
-G "Ninja" \
107110
..
108111
cmake --build . --parallel "${parallelism}" --target install
@@ -119,4 +122,4 @@ cmake \
119122
-G "Ninja" \
120123
..
121124
cmake --build . --parallel "${parallelism}" --target install
122-
cd "${third_party_root}"
125+
cd "${third_party_root}"

0 commit comments

Comments
 (0)