diff --git a/.github/release-tag.json b/.github/release-tag.json new file mode 100644 index 00000000000..4722f60db27 --- /dev/null +++ b/.github/release-tag.json @@ -0,0 +1,4 @@ +{ + "message": "xpro version 1.92.0.1 tag", + "tag": "xpv1.92.0.1" +} diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 25962792df9..c539349ee06 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -17,12 +17,15 @@ jobs: uses: externpro/externpro/.github/workflows/build-linux.yml@26.01.5 secrets: automation_token: ${{ secrets.GHCR_TOKEN }} - with: {} + with: + cmake_workflow_preset_suffix: Release macos: uses: externpro/externpro/.github/workflows/build-macos.yml@26.01.5 secrets: inherit - with: {} + with: + cmake_workflow_preset_suffix: Release windows: uses: externpro/externpro/.github/workflows/build-windows.yml@26.01.5 secrets: inherit - with: {} + with: + cmake_workflow_preset_suffix: Release diff --git a/.gitignore b/.gitignore index cfeeaed7f7c..105a9ca4b65 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,7 @@ /.settings/ /.project /.pydevproject +# externpro +.env +_bld*/ +docker-compose.override.yml diff --git a/CMakeLists.txt b/CMakeLists.txt index 76fca29bc7d..7f154e212e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # Distributed under the Boost Software License, Version 1.0. # See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt -cmake_minimum_required(VERSION 3.8...3.16) +cmake_minimum_required(VERSION 3.8...4.3) # The default build type must be set before project() if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) @@ -17,4 +17,4 @@ set(BOOST_SUPERPROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/tools/cmake/include) -include(BoostRoot) +include(xpboost) diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json index 085cdc3e315..439a3ee32e9 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -4,7 +4,10 @@ { "name": "config-base", "hidden": true, - "binaryDir": "${sourceDir}/_bld-${presetName}" + "binaryDir": "${sourceDir}/_bld-${presetName}", + "cacheVariables": { + "XP_BUILD_VERBOSE": "ON" + } } ], "buildPresets": [ diff --git a/tools/boost_install b/tools/boost_install index c437e5c2fce..5aece570b31 160000 --- a/tools/boost_install +++ b/tools/boost_install @@ -1 +1 @@ -Subproject commit c437e5c2fce37ccb06a18b04af0159a74fbbc840 +Subproject commit 5aece570b3138828b17ebe2ae46392f44b4c1abb diff --git a/tools/cmake b/tools/cmake index 7bce8efdc57..8237701f12d 160000 --- a/tools/cmake +++ b/tools/cmake @@ -1 +1 @@ -Subproject commit 7bce8efdc57134dc86e70ac3cd914e390a6cf30d +Subproject commit 8237701f12d036740d873070b21d06599706c309 diff --git a/xprodeps.md b/xprodeps.md new file mode 100644 index 00000000000..8e3d95af1ef --- /dev/null +++ b/xprodeps.md @@ -0,0 +1,23 @@ +# boost dependencies + +|project|license [^_l]|description [dependencies]|version|source|diff [^_d]| +|-------|-------------|--------------------------|-------|------|----------| +|[boost](http://www.boost.org/ 'Boost website')|[BSL-1.0](http://www.boost.org/users/license.html 'Boost Software License')|libraries that give C++ a boost [deps: _bzip2, zlib_]| |[upstream](https://github.com/boostorg/boost 'github.com/boostorg/boost')| [native]| +|[bzip2](https://sourceware.org/bzip2/)|[bzip2-1.0.6](https://spdx.org/licenses/bzip2-1.0.6.html 'BSD-like, modified zlib license')|lossless block-sorting data compression library|[xpv1.0.8.5](https://github.com/externpro/bzip2/releases/tag/xpv1.0.8.5 'release')|[repo](https://github.com/externpro/bzip2 'github.com/externpro/bzip2') [upstream](https://github.com/opencor/bzip2 'github.com/opencor/bzip2')|[diff](https://github.com/externpro/bzip2/compare/bzip2-1.0.8...xpv1.0.8.5 'github.com/externpro/bzip2/compare/bzip2-1.0.8...xpv1.0.8.5') [intro]| +|[zlib](https://zlib.net/ 'zlib website')|[Zlib](https://zlib.net/zlib_license.html 'zlib/libpng license, see https://en.wikipedia.org/wiki/Zlib_License')|a general-purpose lossless data-compression library|[xpv1.3.2.1](https://github.com/externpro/zlib/releases/tag/xpv1.3.2.1 'release')|[repo](https://github.com/externpro/zlib 'github.com/externpro/zlib') [upstream](https://github.com/madler/zlib 'github.com/madler/zlib')|[diff](https://github.com/externpro/zlib/compare/v1.3.2...xpv1.3.2.1 'github.com/externpro/zlib/compare/v1.3.2...xpv1.3.2.1') [patch]| + +![deps](xprodeps.svg 'dependencies') + +Dependency version check: all 2 parent-manifest versions match pinned versions. + +|diff |description| +|------|-----------| +|patch |diff modifies/patches existing cmake| +|intro |diff introduces cmake| +|auto |diff adds cmake to replace autotools/configure/make| +|native|diff adds cmake but uses existing build system| +|bin |diff adds cmake to repackage binaries built elsewhere| +|fetch |diff adds cmake and utilizes FetchContent| + +[^_l]: see [SPDX License List](https://spdx.org/licenses/ '') for a list of commonly found licenses +[^_d]: see table above with description of diff diff --git a/xprodeps.svg b/xprodeps.svg new file mode 100644 index 00000000000..acf6d69f88d --- /dev/null +++ b/xprodeps.svg @@ -0,0 +1,42 @@ + + + + + + +GG + + +boost + +boost + + + +bzip2 + +bzip2 + + + +boost->bzip2 + + + + + +zlib + +zlib + + + +boost->zlib + + + + +