Mercurial > hg > orthanc-python
changeset 9:8ec973ae8d6c
fix docker builds
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 31 Mar 2020 14:03:30 +0200 |
| parents | dac0f23f85c2 |
| children | 6f639ddfc4bc |
| files | Resources/Builders/DebianStable/docker-internal.sh Resources/Builders/MinGW32-Python2.7/docker-compile.sh Resources/Builders/MinGW32-Python2.7/docker-internal.sh Resources/Builders/Windows32-Python2.7/docker-compile.sh Resources/Builders/Windows32-Python2.7/docker-internal.sh |
| diffstat | 5 files changed, 67 insertions(+), 55 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/Builders/DebianStable/docker-internal.sh Tue Mar 31 12:15:46 2020 +0200 +++ b/Resources/Builders/DebianStable/docker-internal.sh Tue Mar 31 14:03:30 2020 +0200 @@ -1,10 +1,16 @@ #!/bin/bash set -ex +mkdir /tmp/source-writeable + +cp -r /source/CMakeLists.txt /tmp/source-writeable/ +cp -r /source/Sources /tmp/source-writeable/ +cp -r /source/Resources /tmp/source-writeable/ + mkdir /tmp/build cd /tmp/build -cmake /source \ +cmake /tmp/source-writeable/ \ -DCMAKE_BUILD_TYPE=$1 \ -DPYTHON_VERSION=3.7 \ -DSTATIC_BUILD=ON \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/Builders/MinGW32-Python2.7/docker-compile.sh Tue Mar 31 14:03:30 2020 +0200 @@ -0,0 +1,30 @@ +#!/bin/bash + +set -ex + +if [ "$1" != "Debug" -a "$1" != "Release" ]; then + echo "Please provide build type: Debug or Release" + exit -1 +fi + +if [ -t 1 ]; then + # TTY is available => use interactive mode + DOCKER_FLAGS='-i' +fi + +ROOT_DIR=`dirname $(readlink -f $0)`/../../.. + +mkdir -p ${ROOT_DIR}/docker-build/ + +docker build \ + -f ${ROOT_DIR}/Resources/Builders/Dockerfile-MinGW-BuildEnvironment \ + -t mingw-python-build . + +docker run -t ${DOCKER_FLAGS} --rm \ + --user $(id -u):$(id -g) \ + -v ${ROOT_DIR}:/source:ro \ + -v ${ROOT_DIR}/docker-build:/target:rw \ + mingw-python-build \ + bash /source/Resources/Builders/MinGW32-Python2.7/docker-internal.sh $1 + +ls -lR ${ROOT_DIR}/docker-build/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/Builders/MinGW32-Python2.7/docker-internal.sh Tue Mar 31 14:03:30 2020 +0200 @@ -0,0 +1,30 @@ +#!/bin/bash +set -ex + +mkdir /tmp/source-writeable + +cp -r /source/CMakeLists.txt /tmp/source-writeable/ +cp -r /source/Sources /tmp/source-writeable/ +cp -r /source/Resources /tmp/source-writeable/ + +mkdir /tmp/build +cd /tmp/build + +wget http://orthanc.osimis.io/ThirdPartyDownloads/Python/python-2.7.17-win32.tar.bz2 +tar xvfj python-2.7.17-win32.tar.bz2 + +cmake /tmp/source-writeable/ \ + -DCMAKE_BUILD_TYPE=$1 \ + -DSTATIC_BUILD=ON \ + -DPYTHON_VERSION=2.7 \ + -DPYTHON_WINDOWS_ROOT=/tmp/build/python-2.7.17-win32/ \ + -DCMAKE_TOOLCHAIN_FILE=/source/Resources/Orthanc/Resources/MinGW-W64-Toolchain32.cmake \ + -DCMAKE_INSTALL_PREFIX=/target + +make -j`nproc` + +if [ "$1" == "Release" ]; then + i686-w64-mingw32-strip ./libOrthancPython.dll +fi + +make install
--- a/Resources/Builders/Windows32-Python2.7/docker-compile.sh Tue Mar 31 12:15:46 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -#!/bin/bash - -set -ex - -if [ "$1" != "Debug" -a "$1" != "Release" ]; then - echo "Please provide build type: Debug or Release" - exit -1 -fi - -if [ -t 1 ]; then - # TTY is available => use interactive mode - DOCKER_FLAGS='-i' -fi - -ROOT_DIR=`dirname $(readlink -f $0)`/../../.. - -mkdir -p ${ROOT_DIR}/docker-build/ - -docker build \ - -f ${ROOT_DIR}/Resources/Builders/Dockerfile-MinGW-BuildEnvironment \ - -t mingw-python-build . - -docker run -t ${DOCKER_FLAGS} --rm \ - --user $(id -u):$(id -g) \ - -v ${ROOT_DIR}:/source:ro \ - -v ${ROOT_DIR}/docker-build:/target:rw \ - mingw-python-build \ - bash /source/Resources/Builders/Windows32-Python2.7/docker-internal.sh $1 - -ls -lR ${ROOT_DIR}/docker-build/
--- a/Resources/Builders/Windows32-Python2.7/docker-internal.sh Tue Mar 31 12:15:46 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -#!/bin/bash -set -ex - -mkdir /tmp/build -cd /tmp/build - -wget http://orthanc.osimis.io/ThirdPartyDownloads/Python/python-2.7.17-win32.tar.bz2 -tar xvfj python-2.7.17-win32.tar.bz2 - -cmake /source \ - -DCMAKE_BUILD_TYPE=$1 \ - -DSTATIC_BUILD=ON \ - -DPYTHON_VERSION=2.7 \ - -DPYTHON_WINDOWS_ROOT=/tmp/build/python-2.7.17-win32/ \ - -DCMAKE_TOOLCHAIN_FILE=/source/Resources/Orthanc/Resources/MinGW-W64-Toolchain32.cmake \ - -DCMAKE_INSTALL_PREFIX=/target - -make -j`nproc` VERBOSE=1 - -if [ "$1" == "Release" ]; then - i686-w64-mingw32-strip ./libOrthancPython.dll -fi - -make install