# HG changeset patch # User Sebastien Jodogne # Date 1715892611 -7200 # Node ID a5162d8bd2d480cc0afe22d378b852d301649d6d # Parent 24b68f1977bd3b5895f5b5f2ae15d9dcd171c90b Added Windows builder for Python 3.12 diff -r 24b68f1977bd -r a5162d8bd2d4 NEWS --- a/NEWS Thu May 16 12:21:55 2024 +0200 +++ b/NEWS Thu May 16 22:50:11 2024 +0200 @@ -1,3 +1,9 @@ +Pending changes in the mainline +=============================== + +* Added Windows builder for Python 3.12 + + Version 4.2 (2024-05-16) ======================== diff -r 24b68f1977bd -r a5162d8bd2d4 Resources/Builders/BuildAllWindows.sh --- a/Resources/Builders/BuildAllWindows.sh Thu May 16 12:21:55 2024 +0200 +++ b/Resources/Builders/BuildAllWindows.sh Thu May 16 22:50:11 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 diff -r 24b68f1977bd -r a5162d8bd2d4 Resources/Builders/MinGW32-Python3.12/docker-compile.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/Builders/MinGW32-Python3.12/docker-compile.sh Thu May 16 22:50:11 2024 +0200 @@ -0,0 +1,31 @@ +#!/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/ + +( cd ${ROOT_DIR}/Resources/Builders/ && \ + docker build \ + -f ./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-Python3.12/docker-internal.sh $1 + +ls -lR ${ROOT_DIR}/docker-build/ diff -r 24b68f1977bd -r a5162d8bd2d4 Resources/Builders/MinGW32-Python3.12/docker-internal.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/Builders/MinGW32-Python3.12/docker-internal.sh Thu May 16 22:50:11 2024 +0200 @@ -0,0 +1,37 @@ +#!/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 https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.12.3-win32.zip +unzip python-3.12.3-win32.zip + +if [ "$1" == "Release" ]; then + LIBRARY_NAME=python311.lib +else + LIBRARY_NAME=python311_d.lib +fi + +cmake /tmp/source-writeable/ \ + -DCMAKE_BUILD_TYPE=$1 \ + -DSTATIC_BUILD=ON \ + -DPYTHON_VERSION=3.11 \ + -DPYTHON_LIBRARY_NAME=${LIBRARY_NAME} \ + -DPYTHON_WINDOWS_ROOT=/tmp/build/python-3.12.3-win32/ \ + -DCMAKE_TOOLCHAIN_FILE=/source/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake \ + -DCMAKE_INSTALL_PREFIX=/target + +make -j`nproc` + +if [ "$1" == "Release" ]; then + i686-w64-mingw32-strip ./libOrthancPython.dll +fi + +make install diff -r 24b68f1977bd -r a5162d8bd2d4 Resources/Builders/MinGW64-Python3.12/docker-compile.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/Builders/MinGW64-Python3.12/docker-compile.sh Thu May 16 22:50:11 2024 +0200 @@ -0,0 +1,31 @@ +#!/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/ + +( cd ${ROOT_DIR}/Resources/Builders/ && \ + docker build \ + -f ./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/MinGW64-Python3.12/docker-internal.sh $1 + +ls -lR ${ROOT_DIR}/docker-build/ diff -r 24b68f1977bd -r a5162d8bd2d4 Resources/Builders/MinGW64-Python3.12/docker-internal.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/Builders/MinGW64-Python3.12/docker-internal.sh Thu May 16 22:50:11 2024 +0200 @@ -0,0 +1,37 @@ +#!/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 https://orthanc.uclouvain.be/downloads/third-party-downloads/Python/python-3.12.3-win64.zip +unzip python-3.12.3-win64.zip + +if [ "$1" == "Release" ]; then + LIBRARY_NAME=python311.lib +else + LIBRARY_NAME=python311_d.lib +fi + +cmake /tmp/source-writeable/ \ + -DCMAKE_BUILD_TYPE=$1 \ + -DSTATIC_BUILD=ON \ + -DPYTHON_VERSION=3.11 \ + -DPYTHON_LIBRARY_NAME=${LIBRARY_NAME} \ + -DPYTHON_WINDOWS_ROOT=/tmp/build/python-3.12.3-win64 \ + -DCMAKE_TOOLCHAIN_FILE=/source/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake \ + -DCMAKE_INSTALL_PREFIX=/target + +make -j`nproc` + +if [ "$1" == "Release" ]; then + x86_64-w64-mingw32-strip ./libOrthancPython.dll +fi + +make install