Skip to content

Commit 92428fb

Browse files
committed
[Release] Release of version 0.07.20
1 parent 321da55 commit 92428fb

File tree

9 files changed

+29
-15
lines changed

9 files changed

+29
-15
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ include (config/project_config_embeddable.cmake)
1010
project (opentrep)
1111
set_project_names (opentrep OpenTREP)
1212
set_project_brief ("C++ Open Travel Request Parsing Library")
13-
set_project_versions (0 07 19)
13+
set_project_versions (0 07 20)
1414

1515
##
1616
# Project options

ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* Wed Dec 24 2025 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 0.07.20:
2+
- Upgraded CMake conf for Python
3+
14
* Tue Dec 16 2025 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 0.07.19:
25
- Fixed a few issues with the doc and man pages
36

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* 2025-12-24:
2+
- Version 0.07.20
3+
- Upgraded CMake conf for Python
4+
15
* 2025-12-16:
26
- Version 0.07.19
37
- Fixed a few issues with the doc and man pages

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ To customize OpenTREP to your environment, you can alter
603603
the installation directory:
604604
```bash
605605
export INSTALL_BASEDIR="${HOME}/dev/deliveries"
606-
export TREP_VER="0.07.19"
606+
export TREP_VER="0.07.20"
607607
```
608608

609609
Then, as usual:

autogen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fi
5151
#
5252
VERSION_MAJOR=0
5353
VERSION_MINOR=07
54-
VERSION_PATCH=19
54+
VERSION_PATCH=20
5555
VERSION_TMP_STRING=`grep "set_project_versions" CMakeLists.txt | sed -e "s/set_project_versions.*\([0-9]\+.\+[0-9]\+.\+[0-9]\+\).\+/\1/"`
5656
VERSION_STRING=`echo "${VERSION_TMP_STRING}" | grep "^[0-9]\+.[0-9]\+.[0-9]\+$"`
5757

config/FindICU.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
2-
# file LICENSE.rst or https://cmake.org/licensing for details.
2+
# file Copyright.txt or https://cmake.org/licensing for details.
33

44
#[=======================================================================[.rst:
55
FindICU
@@ -215,7 +215,7 @@ function(_ICU_FIND)
215215
endif()
216216
if(component STREQUAL "in")
217217
list(APPEND component_libnames "icui18n")
218-
list(APPEND component_debug_libnames "icui18nd") # noqa: spellcheck disable-line
218+
list(APPEND component_debug_libnames "icui18nd")
219219
endif()
220220

221221
if(static_prefix)
@@ -295,7 +295,7 @@ endfunction()
295295

296296
_ICU_FIND()
297297

298-
include(FindPackageHandleStandardArgs)
298+
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
299299
find_package_handle_standard_args(ICU
300300
REQUIRED_VARS
301301
ICU_INCLUDE_DIR

config/FindPython/Support.cmake

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
3030
message (FATAL_ERROR "FindPython: INTERNAL ERROR")
3131
endif()
3232
if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
33-
set(_${_PYTHON_PREFIX}_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
33+
set(_${_PYTHON_PREFIX}_VERSIONS 3.15 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
3434
elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2")
3535
set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
3636
else()
@@ -625,18 +625,16 @@ function (_PYTHON_GET_CONFIG_VAR _PYTHON_PGCV_VALUE NAME)
625625
set (_values "_d")
626626
endif()
627627
elseif (NAME STREQUAL "ABIFLAGS" AND WIN32)
628-
# config var ABIFLAGS does not exist, check GIL specific variable
628+
# config var ABIFLAGS does not exist for version < 3.14, check GIL specific variable
629629
execute_process (COMMAND ${_${_PYTHON_PREFIX}_INTERPRETER_LAUNCHER} "${_${_PYTHON_PREFIX}_EXECUTABLE}" -c
630-
"import sys; import sysconfig; sys.stdout.write(str(sysconfig.get_config_var('Py_GIL_DISABLED')))"
630+
"import sys\nimport sysconfig\ntry:\n sys.stdout.write(sysconfig.get_config_var('ABIFLAGS'))\nexcept Exception:\n sys.stdout.write('t' if sysconfig.get_config_var('Py_GIL_DISABLED') == 1 else '<none>')"
631631
RESULT_VARIABLE _result
632632
OUTPUT_VARIABLE _values
633633
ERROR_QUIET
634634
OUTPUT_STRIP_TRAILING_WHITESPACE)
635-
if (result OR NOT _values EQUAL "1")
635+
if (_result OR NOT _values)
636636
# assume ABI is not supported or GIL is set
637637
set (_values "<none>")
638-
else()
639-
set (_values "t")
640638
endif()
641639
else()
642640
set (config_flag "${NAME}")
@@ -4071,7 +4069,11 @@ if(_${_PYTHON_PREFIX}_CMAKE_ROLE STREQUAL "PROJECT")
40714069
set_property (TARGET ${__name}
40724070
PROPERTY INTERFACE_COMPILE_DEFINITIONS "${${_PYTHON_PREFIX}_DEFINITIONS}")
40734071
endif()
4074-
4072+
if(WIN32)
4073+
# avoid implicit library link (recognized by version 3.14 and upper)
4074+
set_property (TARGET ${__name}
4075+
APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "Py_NO_LINK_LIB")
4076+
endif()
40754077

40764078
if (${_PYTHON_PREFIX}_${_PREFIX}LIBRARY_RELEASE AND ${_PYTHON_PREFIX}_RUNTIME_${_PREFIX}LIBRARY_RELEASE)
40774079
# System manage shared libraries in two parts: import and runtime
@@ -4133,6 +4135,11 @@ if(_${_PYTHON_PREFIX}_CMAKE_ROLE STREQUAL "PROJECT")
41334135
set_property (TARGET ${__name}
41344136
PROPERTY INTERFACE_COMPILE_DEFINITIONS "${${_PYTHON_PREFIX}_DEFINITIONS}")
41354137
endif()
4138+
if(WIN32)
4139+
# avoid implicit library link (recognized by version 3.14 and upper)
4140+
set_property (TARGET ${__name}
4141+
APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "Py_NO_LINK_LIB")
4142+
endif()
41364143

41374144
# When available, enforce shared library generation with undefined symbols
41384145
if (APPLE)

config/FindPythonInterp.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ unset(_Python_NAMES)
6767

6868
set(_PYTHON1_VERSIONS 1.6 1.5)
6969
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
70-
set(_PYTHON3_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
70+
set(_PYTHON3_VERSIONS 3.15 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
7171

7272
if(PythonInterp_FIND_VERSION)
7373
if(PythonInterp_FIND_VERSION_COUNT GREATER 1)

config/FindPythonLibs.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
9999

100100
set(_PYTHON1_VERSIONS 1.6 1.5)
101101
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
102-
set(_PYTHON3_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
102+
set(_PYTHON3_VERSIONS 3.15 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
103103

104104
if(PythonLibs_FIND_VERSION)
105105
if(PythonLibs_FIND_VERSION_COUNT GREATER 1)

0 commit comments

Comments
 (0)