Mercurial > hg > orthanc-python

changeset 163:54991a36af1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix mingw builds that are not compatible with boost 1.85.0 in the Docker image
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 16 May 2024 23:06:12 +0200
parents 471811c64e48
children 5bfe975e5c24
files Resources/Builders/MinGW32-Python2.7/docker-internal.sh Resources/Builders/MinGW32-Python3.10/docker-internal.sh Resources/Builders/MinGW32-Python3.11/docker-internal.sh Resources/Builders/MinGW32-Python3.7/docker-internal.sh Resources/Builders/MinGW32-Python3.8/docker-internal.sh Resources/Builders/MinGW32-Python3.9/docker-internal.sh Resources/Builders/MinGW64-Python2.7/docker-internal.sh Resources/Builders/MinGW64-Python3.10/docker-internal.sh Resources/Builders/MinGW64-Python3.11/docker-internal.sh Resources/Builders/MinGW64-Python3.7/docker-internal.sh Resources/Builders/MinGW64-Python3.8/docker-internal.sh Resources/Builders/MinGW64-Python3.9/docker-internal.sh
diffstat 12 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/Builders/MinGW32-Python2.7/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW32-Python2.7/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -16,6 +16,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=2.7 \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/python-2.7.17-win32/ \
       -DCMAKE_TOOLCHAIN_FILE=/source/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake \
--- a/Resources/Builders/MinGW32-Python3.10/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW32-Python3.10/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -22,6 +22,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=3.10 \
       -DPYTHON_LIBRARY_NAME=${LIBRARY_NAME} \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/python-3.10.10-win32/ \
--- a/Resources/Builders/MinGW32-Python3.11/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW32-Python3.11/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -22,6 +22,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=3.11 \
       -DPYTHON_LIBRARY_NAME=${LIBRARY_NAME} \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/python-3.11.2-win32/ \
--- a/Resources/Builders/MinGW32-Python3.7/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW32-Python3.7/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -16,6 +16,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=3.7 \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/python-3.7.7-win32/ \
       -DCMAKE_TOOLCHAIN_FILE=/source/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake \
--- a/Resources/Builders/MinGW32-Python3.8/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW32-Python3.8/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -22,6 +22,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=3.8 \
       -DPYTHON_LIBRARY_NAME=${LIBRARY_NAME} \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/Python-3.8.3-win32/ \
--- a/Resources/Builders/MinGW32-Python3.9/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW32-Python3.9/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -22,6 +22,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=3.9 \
       -DPYTHON_LIBRARY_NAME=${LIBRARY_NAME} \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/python-3.9.13-win32/ \
--- a/Resources/Builders/MinGW64-Python2.7/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW64-Python2.7/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -16,6 +16,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=2.7 \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/Python27/ \
       -DCMAKE_TOOLCHAIN_FILE=/source/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake \
--- a/Resources/Builders/MinGW64-Python3.10/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW64-Python3.10/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -22,6 +22,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=3.10 \
       -DPYTHON_LIBRARY_NAME=${LIBRARY_NAME} \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/python-3.10.10-win64 \
--- a/Resources/Builders/MinGW64-Python3.11/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW64-Python3.11/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -22,6 +22,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=3.11 \
       -DPYTHON_LIBRARY_NAME=${LIBRARY_NAME} \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/python-3.11.2-win64 \
--- a/Resources/Builders/MinGW64-Python3.7/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW64-Python3.7/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -16,6 +16,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=3.7 \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/python-3.7.7-win64/ \
       -DCMAKE_TOOLCHAIN_FILE=/source/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake \
--- a/Resources/Builders/MinGW64-Python3.8/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW64-Python3.8/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -22,6 +22,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=3.8 \
       -DPYTHON_LIBRARY_NAME=${LIBRARY_NAME} \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/python-3.8.3-win64 \
--- a/Resources/Builders/MinGW64-Python3.9/docker-internal.sh	Thu May 16 23:01:33 2024 +0200
+++ b/Resources/Builders/MinGW64-Python3.9/docker-internal.sh	Thu May 16 23:06:12 2024 +0200
@@ -22,6 +22,7 @@
 cmake /tmp/source-writeable/ \
       -DCMAKE_BUILD_TYPE=$1 \
       -DSTATIC_BUILD=ON \
+      -DUSE_LEGACY_BOOST=ON \
       -DPYTHON_VERSION=3.9 \
       -DPYTHON_LIBRARY_NAME=${LIBRARY_NAME} \
       -DPYTHON_WINDOWS_ROOT=/tmp/build/python-3.9.13-win64 \