Skip to content

Commit

Permalink
[Release] Release of the 1.00.7 version
Browse files Browse the repository at this point in the history
  • Loading branch information
da115115 committed Jan 27, 2025
1 parent 56ea02f commit 416d59b
Show file tree
Hide file tree
Showing 13 changed files with 693 additions and 247 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include (config/project_config_embeddable.cmake)
project (simlfs)
set_project_names (simlfs SimLFS)
set_project_brief ("C++ Simulated Low Fare Search (LFS) Library")
set_project_versions (1 00 6)
set_project_versions (1 00 7)

##
# Project options
Expand Down
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Mon Jan 27 2025 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.00.7
- Upgraded CMake support files

* Sat Mar 23 2024 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.00.6
- Upgraded CMake support files

Expand Down
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* 2025-01-27:
- Version 1.00.7
- Upgraded CMake support files

* 2024-03-23:
- Version 1.00.6
- Upgraded CMake support files
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ To customise the following to your environment, you can alter the path
to the installation directory:
```bash
export INSTALL_BASEDIR="${HOME}/dev/deliveries"
export LFS_VER="1.00.6"
export LFS_VER="1.00.7"
if [ -d /usr/lib64 ]; then LIBSUFFIX="64"; fi
export LIBSUFFIX_4_CMAKE="-DLIB_SUFFIX=$LIBSUFFIX"
``
Expand Down
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fi
#
VERSION_MAJOR=1
VERSION_MINOR=00
VERSION_PATCH=6
VERSION_PATCH=7
VERSION_TMP_STRING=`grep "set_project_versions" CMakeLists.txt | sed -e "s/set_project_versions.*\([0-9]\+.\+[0-9]\+.\+[0-9]\+\).\+/\1/"`
VERSION_STRING=`echo "${VERSION_TMP_STRING}" | grep "^[0-9]\+.[0-9]\+.[0-9]\+$"`

Expand Down
3 changes: 1 addition & 2 deletions config/FindDoxygenWrapper.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ if (DOXYGEN_FOUND STREQUAL "YES")
execute_process (
COMMAND ${DOXYGEN_EXECUTABLE} --version
OUTPUT_VARIABLE MY_TMP
OUTPUT_STRIP_TRAILING_WHITESPACE
)
OUTPUT_STRIP_TRAILING_WHITESPACE)
set (DOXYGEN_VERSION ${MY_TMP})

# Check the version requirement only
Expand Down
9 changes: 3 additions & 6 deletions config/FindMySQL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,14 @@ if (UNIX)
execute_process (
COMMAND ${MYSQL_CONFIG} --version
OUTPUT_VARIABLE MY_TMP
OUTPUT_STRIP_TRAILING_WHITESPACE
)
OUTPUT_STRIP_TRAILING_WHITESPACE)
set (MYSQL_VERSION ${MY_TMP})

# Set INCLUDE_DIR
execute_process (
COMMAND ${MYSQL_CONFIG} --include
OUTPUT_VARIABLE MY_TMP
OUTPUT_STRIP_TRAILING_WHITESPACE
)
OUTPUT_STRIP_TRAILING_WHITESPACE)

string (REGEX REPLACE "-I([^ ]*)( .*)?" "\\1" MY_TMP "${MY_TMP}")
set (MYSQL_ADD_INCLUDE_PATH ${MY_TMP} CACHE FILEPATH INTERNAL)
Expand All @@ -44,8 +42,7 @@ if (UNIX)
execute_process (
COMMAND ${MYSQL_CONFIG} --libs_r
OUTPUT_VARIABLE MY_TMP
OUTPUT_STRIP_TRAILING_WHITESPACE
)
OUTPUT_STRIP_TRAILING_WHITESPACE)

set (MYSQL_ADD_LIBRARIES "")
string (REGEX MATCHALL "-l[^ ]*" MYSQL_LIB_LIST "${MY_TMP}")
Expand Down
119 changes: 85 additions & 34 deletions config/FindPython.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,25 @@ This module defines the following :ref:`Imported Targets <Imported Targets>`:
:prop_gbl:`CMAKE_ROLE` is ``PROJECT``.
``Python::Interpreter``
Python interpreter. Target defined if component ``Interpreter`` is found.
Python interpreter. This target is defined only if the ``Interpreter``
component is found.
``Python::InterpreterDebug``
.. versionadded:: 3.30
Python debug interpreter. This target is defined only if the ``Interpreter``
component is found and the ``Python_EXECUTABLE_DEBUG`` variable is defined.
The target is only defined on the ``Windows`` platform.
``Python::InterpreterMultiConfig``
.. versionadded:: 3.30
Python interpreter. The release or debug version of the interpreter will be
used, based on the context (platform, configuration).
This target is defined only if the ``Interpreter`` component is found
``Python::Compiler``
Python compiler. Target defined if component ``Compiler`` is found.
Python compiler. This target is defined only if the ``Compiler`` component is
found.
``Python::Module``
.. versionadded:: 3.15
Expand Down Expand Up @@ -114,6 +130,20 @@ This module will set the following variables in your project
System has the Python interpreter.
``Python_EXECUTABLE``
Path to the Python interpreter.
``Python_EXECUTABLE_DEBUG``
.. versionadded:: 3.30
Path to the debug Python interpreter. It is only defined on the ``Windows``
platform.
``Python_INTERPRETER``
.. versionadded:: 3.30
Path to the Python interpreter, defined as a
:manual:`generator expression <cmake-generator-expressions(7)>` selecting
the ``Python_EXECUTABLE`` or ``Python_EXECUTABLE_DEBUG`` variable based on
the context (platform, configuration).
``Python_INTERPRETER_ID``
A short string unique to the interpreter. Possible values include:
* Python
Expand All @@ -125,38 +155,28 @@ This module will set the following variables in your project
``Python_STDLIB``
Standard platform independent installation directory.
Information returned by
``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=True)``
or else ``sysconfig.get_path('stdlib')``.
Information returned by ``sysconfig.get_path('stdlib')``.
``Python_STDARCH``
Standard platform dependent installation directory.
Information returned by
``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=True)``
or else ``sysconfig.get_path('platstdlib')``.
Information returned by ``sysconfig.get_path('platstdlib')``.
``Python_SITELIB``
Third-party platform independent installation directory.
Information returned by
``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=False)``
or else ``sysconfig.get_path('purelib')``.
Information returned by ``sysconfig.get_path('purelib')``.
``Python_SITEARCH``
Third-party platform dependent installation directory.
Information returned by
``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=False)``
or else ``sysconfig.get_path('platlib')``.
Information returned by ``sysconfig.get_path('platlib')``.
``Python_SOABI``
.. versionadded:: 3.17
Extension suffix for modules.
Information computed from ``distutils.sysconfig.get_config_var('EXT_SUFFIX')``
or ``distutils.sysconfig.get_config_var('SOABI')`` or
``python3-config --extension-suffix``. If package ``distutils.sysconfig`` is
not available, ``sysconfig.get_config_var('EXT_SUFFIX')`` or
``sysconfig.get_config_var('SOABI')`` are used.
Information computed from ``sysconfig.get_config_var('EXT_SUFFIX')`` or
``sysconfig.get_config_var('SOABI')`` or
``python3-config --extension-suffix``.
``Python_SOSABI``
.. versionadded:: 3.26
Expand Down Expand Up @@ -204,6 +224,17 @@ This module will set the following variables in your project
The Python include directories.
``Python_DEFINITIONS``
.. versionadded:: 3.30.3
The Python preprocessor definitions.
``Python_DEBUG_POSTFIX``
.. versionadded:: 3.30
Postfix of debug python module. This variable can be used to define the
:prop_tgt:`DEBUG_POSTFIX` target property.
``Python_LINK_OPTIONS``
.. versionadded:: 3.19
Expand Down Expand Up @@ -284,42 +315,54 @@ Hints
This hint will be honored only when searched for ``Python`` version 3.
.. note::
The ``Python_FIND_ABI`` variable is a 4-tuple specifying, in that order,
``pydebug`` (``d``), ``pymalloc`` (``m``), ``unicode`` (``u``) and
``gil_disabled`` (``t``) flags.
If ``Python_FIND_ABI`` is not defined, any ABI will be searched.
.. versionadded:: 3.30
A fourth element, specifying the ``gil_disabled`` flag (i.e. free
threaded python), is added and is optional. If not specified, the value is
``OFF``.
The ``Python_FIND_ABI`` variable is a 3-tuple specifying, in that order,
``pydebug`` (``d``), ``pymalloc`` (``m``) and ``unicode`` (``u``) flags.
Each element can be set to one of the following:
* ``ON``: Corresponding flag is selected.
* ``OFF``: Corresponding flag is not selected.
* ``ANY``: The two possibilities (``ON`` and ``OFF``) will be searched.
From this 3-tuple, various ABIs will be searched starting from the most
specialized to the most general. Moreover, ``debug`` versions will be
searched **after** ``non-debug`` ones.
.. note::
If ``Python3_FIND_ABI`` is not defined, any ABI, excluding the
``gil_disabled`` flag, will be searched.
From this 4-tuple, various ABIs will be searched starting from the most
specialized to the most general. Moreover, when ``ANY`` is specified for
``pydebug`` and ``gil_disabled``, ``debug`` and ``free threaded`` versions
will be searched **after** ``non-debug`` and ``non-gil-disabled`` ones.
For example, if we have::
set (Python_FIND_ABI "ON" "ANY" "ANY")
set (Python_FIND_ABI "ON" "ANY" "ANY" "ON")
The following flags combinations will be appended, in that order, to the
artifact names: ``dmu``, ``dm``, ``du``, and ``d``.
artifact names: ``tdmu``, ``tdm``, ``tdu``, and ``td``.
And to search any possible ABIs::
set (Python_FIND_ABI "ANY" "ANY" "ANY")
set (Python_FIND_ABI "ANY" "ANY" "ANY" "ANY")
The following combinations, in that order, will be used: ``mu``, ``m``,
``u``, ``<empty>``, ``dmu``, ``dm``, ``du`` and ``d``.
``u``, ``<empty>``, ``dmu``, ``dm``, ``du``, ``d``, ``tmu``, ``tm``, ``tu``,
``t``, ``tdmu``, ``tdm``, ``tdu``, and ``td``.
.. note::
This hint is useful only on ``POSIX`` systems. So, on ``Windows`` systems,
This hint is useful only on ``POSIX`` systems except for the
``gil_disabled`` flag. So, on ``Windows`` systems,
when ``Python_FIND_ABI`` is defined, ``Python`` distributions from
`python.org <https://www.python.org/>`_ will be found only if value for
each flag is ``OFF`` or ``ANY``.
`python.org <https://www.python.org/>`_ will be found only if the value for
each flag is ``OFF`` or ``ANY`` except for the fourth one
(``gil_disabled``).
``Python_FIND_STRATEGY``
.. versionadded:: 3.15
Expand All @@ -335,6 +378,8 @@ Hints
constraints is founded.
This is the default if policy :policy:`CMP0094` is set to ``NEW``.
See also ``Python_FIND_UNVERSIONED_NAMES``.
``Python_FIND_REGISTRY``
.. versionadded:: 3.13
Expand Down Expand Up @@ -406,7 +451,7 @@ Hints
See `IronPython <https://ironpython.net>`_.
* ``PyPy``: This implementation use ``RPython`` language and
``RPython translation toolchain`` to produce the python interpreter.
See `PyPy <https://www.pypy.org>`_.
See `PyPy <https://pypy.org>`_.
The default value is:
Expand Down Expand Up @@ -442,6 +487,8 @@ Hints
This is the default.
* ``NEVER``: The generic name are not searched at all.
See also ``Python_FIND_STRATEGY``.
Artifacts Specification
^^^^^^^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -543,6 +590,10 @@ If the library type is not specified, ``MODULE`` is assumed.
When option ``WITH_SOABI`` is also specified, the module suffix will include
the ``Python_SOSABI`` value, if any.
.. versionadded:: 3.30
For ``MODULE`` type, the :prop_tgt:`DEBUG_POSTFIX` target property is
initialized with the value of ``Python_DEBUG_POSTFIX`` variable if defined.
#]=======================================================================]


Expand Down
Loading

0 comments on commit 416d59b

Please sign in to comment.