Mercurial > hg > orthanc-python
changeset 165:5bfe975e5c24
back to mainline
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 16 May 2024 23:09:28 +0200 |
parents | 54991a36af1d (diff) 519e285ce627 (current diff) |
children | 6fada29b6759 |
files | Resources/Builders/MinGW32-Python3.12/docker-internal.sh Resources/Builders/MinGW64-Python3.12/docker-internal.sh |
diffstat | 15 files changed, 25 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Thu May 16 23:09:09 2024 +0200 +++ b/CMakeLists.txt Thu May 16 23:09:28 2024 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) project(OrthancPython) -set(PLUGIN_VERSION "4.2") +set(PLUGIN_VERSION "mainline") if (PLUGIN_VERSION STREQUAL "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
--- a/NEWS Thu May 16 23:09:09 2024 +0200 +++ b/NEWS Thu May 16 23:09:28 2024 +0200 @@ -1,3 +1,9 @@ +Pending changes in the mainline +=============================== + +* Added Windows builder for Python 3.12 + + Version 4.2 (2024-05-16) ========================
--- a/Resources/Builders/BuildAllWindows.sh Thu May 16 23:09:09 2024 +0200 +++ b/Resources/Builders/BuildAllWindows.sh Thu May 16 23:09:28 2024 +0200 @@ -41,6 +41,9 @@ bash ${DIR}/MinGW32-Python3.11/docker-compile.sh Release cp ${DIR}/../../docker-build/lib/libOrthancPython.dll ${TARGET}/OrthancPython-Win32-Python3.11-${VERSION}.dll +bash ${DIR}/MinGW32-Python3.12/docker-compile.sh Release +cp ${DIR}/../../docker-build/lib/libOrthancPython.dll ${TARGET}/OrthancPython-Win32-Python3.12-${VERSION}.dll + ## Windows 64 @@ -61,3 +64,6 @@ bash ${DIR}/MinGW64-Python3.11/docker-compile.sh Release cp ${DIR}/../../docker-build/lib/libOrthancPython.dll ${TARGET}/OrthancPython-Win64-Python3.11-${VERSION}.dll + +bash ${DIR}/MinGW64-Python3.12/docker-compile.sh Release +cp ${DIR}/../../docker-build/lib/libOrthancPython.dll ${TARGET}/OrthancPython-Win64-Python3.12-${VERSION}.dll
--- a/Resources/Builders/MinGW32-Python2.7/docker-internal.sh Thu May 16 23:09:09 2024 +0200 +++ b/Resources/Builders/MinGW32-Python2.7/docker-internal.sh Thu May 16 23:09:28 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:09:09 2024 +0200 +++ b/Resources/Builders/MinGW32-Python3.10/docker-internal.sh Thu May 16 23:09:28 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:09:09 2024 +0200 +++ b/Resources/Builders/MinGW32-Python3.11/docker-internal.sh Thu May 16 23:09:28 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:09:09 2024 +0200 +++ b/Resources/Builders/MinGW32-Python3.7/docker-internal.sh Thu May 16 23:09:28 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:09:09 2024 +0200 +++ b/Resources/Builders/MinGW32-Python3.8/docker-internal.sh Thu May 16 23:09:28 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:09:09 2024 +0200 +++ b/Resources/Builders/MinGW32-Python3.9/docker-internal.sh Thu May 16 23:09:28 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:09:09 2024 +0200 +++ b/Resources/Builders/MinGW64-Python2.7/docker-internal.sh Thu May 16 23:09:28 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:09:09 2024 +0200 +++ b/Resources/Builders/MinGW64-Python3.10/docker-internal.sh Thu May 16 23:09:28 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:09:09 2024 +0200 +++ b/Resources/Builders/MinGW64-Python3.11/docker-internal.sh Thu May 16 23:09:28 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:09:09 2024 +0200 +++ b/Resources/Builders/MinGW64-Python3.7/docker-internal.sh Thu May 16 23:09:28 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:09:09 2024 +0200 +++ b/Resources/Builders/MinGW64-Python3.8/docker-internal.sh Thu May 16 23:09:28 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:09:09 2024 +0200 +++ b/Resources/Builders/MinGW64-Python3.9/docker-internal.sh Thu May 16 23:09:28 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 \