update build infrastructure

parent 63bd5c20
......@@ -7,10 +7,13 @@ export PKG_CONFIG_PATH=${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib/p
export CMAKE_FLAGS="-DDUNE_PYTHON_VIRTUALENV_EXECUTABLE=python3 -DDUNE_PYTHON_VIRTUALENV_SETUP=FALSE -DDUNE_PYTHON_ALLOW_GET_PIP=FALSE"
export SIMDB_GIT_REPOS=$BASEDIR
export SIMDB_PATH=${BASEDIR}/DATA
# export PIP_DOWNLOAD_CACHE="${DIR}/pip-cache"
echo "${DIR}/venv/dune/bin/activate"
if [ -e "${DIR}/venv/dune/bin/activate" ]; then
source "${DIR}/venv/dune/bin/activate"
if [ "X${OPTS}" == "X" ]; then
echo "You did not define OPTS (export OPTS=gcc-relwithdebinfo), not loading a virtualenv!"
else
echo "WARNING: missing virtualenv, did you call setup.sh?"
if [ -e "${DIR}/venv/dune-${OPTS}/bin/activate" ]; then
source "${DIR}/venv/dune-${OPTS}/bin/activate"
else
echo "WARNING: missing virtualenv for OPTS=${OPTS}, did you call setup.sh?"
fi
fi
......@@ -54,7 +54,7 @@ msgpack==0.6.1
nbconvert==5.6.0
nbformat==4.4.0
notebook==6.0.0
numpy==1.16.0
numpy==1.17.0
packaging==19.1
pandocfilters==1.4.2
parso==0.5.1
......
......@@ -19,9 +19,9 @@ fi
# initialize the virtualenv, if not yet present
export BASEDIR="${PWD}"
mkdir -p e/${DXT_ENVIRONMENT}/venv && \
[ -e e/${DXT_ENVIRONMENT}/venv/dune ] || \
[ -e e/${DXT_ENVIRONMENT}/venv/dune-${OPTS} ] || \
cd e/${DXT_ENVIRONMENT}/venv && \
virtualenv --python=python3 dune
virtualenv --python=python3 dune-${OPTS}
cd "${BASEDIR}"
unset BASEDIR
......@@ -41,6 +41,7 @@ NPROC=$(($(nproc) - 1))
./dune-common/bin/dunecontrol --opts=config.opts/$OPTS --builddir=$INSTALL_PREFIX/build-$OPTS configure
./dune-common/bin/dunecontrol --opts=config.opts/$OPTS --builddir=$INSTALL_PREFIX/build-$OPTS bexec 'make -j$NPROC all'
./dune-common/bin/dunecontrol --opts=config.opts/$OPTS --builddir=$INSTALL_PREFIX/build-$OPTS bexec 'make -j$NPROC bindings || echo no bindings'
./dune-common/bin/dunecontrol --opts=config.opts/$OPTS --builddir=$INSTALL_PREFIX/build-$OPTS bexec 'make install_python'
echo
echo "All done! From now on run"
......
......@@ -3,5 +3,5 @@
export NOTEBOOK_PATH=$PWD/notebooks
export NOTEBOOK_PORT=${EXPOSED_PORT:-18881}
run-in-dune-env jupyter-notebook --ip 0.0.0.0 --no-browser --notebook-dir=$NOTEBOOK_PATH --port=$NOTEBOOK_PORT
jupyter-notebook --ip 0.0.0.0 --no-browser --notebook-dir=$NOTEBOOK_PATH --port=$NOTEBOOK_PORT
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