From 7c13f009f289199ae822fd1116bd6b1b7b51d403 Mon Sep 17 00:00:00 2001 From: Jan Kotanski Date: Wed, 7 May 2025 13:29:13 +0200 Subject: [PATCH 1/2] bump the version to 0.7.1 --- CMakeLists.txt | 4 ++-- README.md | 2 +- doc/design/source/conf.py | 4 ++-- doc/source/conf.py.in | 2 +- doc/source/users_guide/installing.rst | 4 ++-- doc/source/users_guide/using.rst | 6 +++--- src/h5cpp/meson.build | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9f181d99c..5b3ae3dc47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.10) project(h5cpp LANGUAGES CXX C - # VERSION 0.7.0 + VERSION 0.7.1 # documentation for VERSION with one '.' is stored as v:latest (see doc/conf.py.in) - VERSION 0.7 + # VERSION 0.7 ) diff --git a/README.md b/README.md index ee62494a3e..2a03b238bf 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ cmake -DCMAKE_INSTALL_PREFIX=/home/user1/some/path .. ``` and accordingly, when building the client program: ```bash -cmake -Dh5cpp_DIR=/home/user1/some/path/lib/cmake/h5cpp-0.7.0 path/to/your/source +cmake -Dh5cpp_DIR=/home/user1/some/path/lib/cmake/h5cpp-0.7.1 path/to/your/source ``` where version number may vary. diff --git a/doc/design/source/conf.py b/doc/design/source/conf.py index 988b4be22a..bc7b12c460 100644 --- a/doc/design/source/conf.py +++ b/doc/design/source/conf.py @@ -61,9 +61,9 @@ # built documents. # # The short X.Y version. -version = u'0.7.0' +version = u'0.7.1' # The full version, including alpha/beta/rc tags. -release = u'0.7.0' +release = u'0.7.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/source/conf.py.in b/doc/source/conf.py.in index 320eb1b9d1..5da0723893 100644 --- a/doc/source/conf.py.in +++ b/doc/source/conf.py.in @@ -196,7 +196,7 @@ html_sidebars = { html_context = { "docs_versions" : [ - "v0.7.0", + "v0.7.1", "v0.7.0", "v0.6.1", "v0.6.0", "v0.5.2", "v0.5.1", "v0.5.0", "v0.4.1", "v0.3.3"] } diff --git a/doc/source/users_guide/installing.rst b/doc/source/users_guide/installing.rst index 25fd3427b1..ebfdf8d155 100644 --- a/doc/source/users_guide/installing.rst +++ b/doc/source/users_guide/installing.rst @@ -147,7 +147,7 @@ to update your package list and .. code-block:: bash - $ apt-get install libh5cpp0.7.0 libh5cpp0.7.0-dbg libh5cpp0.7.0-doc libh5cpp0.7.0-dev + $ apt-get install libh5cpp0.7.1 libh5cpp0.7.1-dbg libh5cpp0.7.1-doc libh5cpp0.7.1-dev -to install the library of v0.7.0. Dependencies will be resolved automatically so you can +to install the library of v0.7.1. Dependencies will be resolved automatically so you can start with working right after the installation has finished. diff --git a/doc/source/users_guide/using.rst b/doc/source/users_guide/using.rst index 67bf73efc5..b1cfca4a37 100644 --- a/doc/source/users_guide/using.rst +++ b/doc/source/users_guide/using.rst @@ -7,7 +7,7 @@ Using *h5cpp* with :program:`cmake` *h5cpp* not only uses *CMake* as a build system but also provides a *CMake* package which makes using the library with *CMake* quite simple. -The *CMake* package is installed below :file:`PREFIX/lib/cmake/h5cpp-0.7.0` +The *CMake* package is installed below :file:`PREFIX/lib/cmake/h5cpp-0.7.1` where :envvar:`PREFIX` expands to the installation prefix used in the inital cmake call of the installation procedure. @@ -41,7 +41,7 @@ the following :file:`CMakeLists.txt` fiel is sufficient cmake_minimum_required(VERSION 3.5.0) project(h5cpp_test LANGUAGES C CXX - VERSION 0.7.0) + VERSION 0.7.1) set(CMAKE_CXX_STANDARD 11) find_package(h5cpp REQUIRED) @@ -56,7 +56,7 @@ You can build the code with h5cpp_test:$ mkdir build h5cpp_test:$ cd build - h5cpp_test:$ cmake -Dh5cpp_DIR=/lib/cmake/h5cpp-0.7.0 ../ + h5cpp_test:$ cmake -Dh5cpp_DIR=/lib/cmake/h5cpp-0.7.1 ../ h5cpp_test:$ make The cmake variable :envvar:`h5cpp_DIR` tells :program:`cmake` where to look diff --git a/src/h5cpp/meson.build b/src/h5cpp/meson.build index 20d7073771..ff71e2ef91 100644 --- a/src/h5cpp/meson.build +++ b/src/h5cpp/meson.build @@ -24,7 +24,7 @@ subdir('utilities') h5cpp_lib = library('h5cpp',sources, dependencies:h5cpp_dependencies, include_directories:[srcinc], - version: '0.7.0', + version: '0.7.1', soversion:'1', install:true, install_mode:'r--r--r--') From e7e0e7d2509605883fcfe30206e6ad807fbb15ed Mon Sep 17 00:00:00 2001 From: Jan Kotanski Date: Wed, 7 May 2025 13:37:14 +0200 Subject: [PATCH 2/2] remove ./src in docs if exists --- .github/workflows/cmake-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml index 897a5a7fc6..bbae98758d 100644 --- a/.github/workflows/cmake-build.yml +++ b/.github/workflows/cmake-build.yml @@ -315,6 +315,7 @@ jobs: docker exec build /bin/bash -c "find ./ -name \"Makefile\" -exec rm -rf {} \\;" docker exec build /bin/bash -c "find ./ -name \"*.cmake\" -exec rm -rf {} \\;" docker exec build /bin/bash -c "rm -rf ./latest/_sources" + docker exec build /bin/bash -c "rm -rf ./src" - name: Extract the code version from the branch name if: startsWith(github.ref, 'refs/heads/docs_') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12' @@ -340,6 +341,7 @@ jobs: docker exec build /bin/bash -c "find ./ -name \"Makefile\" -exec rm -rf {} \\;" docker exec build /bin/bash -c "find ./ -name \"*.cmake\" -exec rm -rf {} \\;" docker exec build /bin/bash -c "rm -rf ./${{ steps.extract_docver.outputs.docver }}/_sources" + docker exec build /bin/bash -c "rm -rf ./src" - name: Deploy documentation if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/docs_')) && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12'