From 5d8a39ef4ba48420d4e98e4e693a43f2496ada8c Mon Sep 17 00:00:00 2001 From: Nat! Date: Sat, 16 Nov 2024 19:36:14 +0100 Subject: [PATCH] * minor bugfix and updates such as version increments --- .github/workflows/dockerfile-ci.yml | 2 +- .github/workflows/mulle-sde-ci.yml | 2 +- .gitignore | 1 + .../etc/env/environment-host-ci-prerelease.sh | 18 ------ CMakeLists.txt | 4 +- CMakePackage.cmake | 4 +- README.md | 55 ------------------- .../all/cmake/share/CMakeTweaksC.cmake | 7 ++- .../all/cmake/share/CompilerFlagsC.cmake | 4 +- .../all/cmake/share/CompilerWarningsC.cmake | 2 +- .../project/all/cmake/share/PreLibrary.cmake | 2 +- src/mulle-c/c-cmake/version | 2 +- .../all/.github/workflows/mulle-sde-ci.yml | 4 +- src/mulle-c/github-actions/version | 2 +- 14 files changed, 19 insertions(+), 90 deletions(-) delete mode 100644 .mulle/etc/env/environment-host-ci-prerelease.sh diff --git a/.github/workflows/dockerfile-ci.yml b/.github/workflows/dockerfile-ci.yml index c800398..90eb3fd 100644 --- a/.github/workflows/dockerfile-ci.yml +++ b/.github/workflows/dockerfile-ci.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 if: ${{ ! env.ACT }} - name: Build Docker image diff --git a/.github/workflows/mulle-sde-ci.yml b/.github/workflows/mulle-sde-ci.yml index 1877eca..a158bab 100644 --- a/.github/workflows/mulle-sde-ci.yml +++ b/.github/workflows/mulle-sde-ci.yml @@ -26,7 +26,7 @@ jobs: - name: Dump Environment run: env | sort - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: mulle-sde/github-ci@v1 diff --git a/.gitignore b/.gitignore index 640e2a7..245ae95 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ coverage*.html *.gcda *.gcno cola/wilted/ +cmake-build-*/ diff --git a/.mulle/etc/env/environment-host-ci-prerelease.sh b/.mulle/etc/env/environment-host-ci-prerelease.sh deleted file mode 100644 index 28bbbe8..0000000 --- a/.mulle/etc/env/environment-host-ci-prerelease.sh +++ /dev/null @@ -1,18 +0,0 @@ -# -# -# -export MULLE_DATA_NODETYPE="git" - - -# -# -# -export MULLE_DATA_BRANCH="prerelease" - - -# -# -# -export MULLE_DATA_URL="https://github.com/mulle-c/mulle-data.git" - - diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a6f20b..8e563c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required( VERSION 3.14) -project( mulle-c-developer NONE) +project( mulle-c-developer VERSION 0.18.0 LANGUAGES NONE) -set( PROJECT_VERSION 0.17.1) +set( PROJECT_VERSION 0.18.0) set( EXTENSIONS src/ # backslash is important diff --git a/CMakePackage.cmake b/CMakePackage.cmake index 1040926..d47df74 100644 --- a/CMakePackage.cmake +++ b/CMakePackage.cmake @@ -6,9 +6,9 @@ set( CPACK_PACKAGE_NAME "${PROJECT_NAME}") set( CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") set( CPACK_PACKAGE_CONTACT "Nat! ") -set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") +set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "🧢 mulle-c developer kit for mulle-sde") -set( CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") +set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") set( CPACK_STRIP_FILES false) # stuff needed for Debian diff --git a/README.md b/README.md index 439741f..aeba07a 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,6 @@ These templates enable you to: -| Release Version | Release Notes -|-------------------------------------------------------|-------------- -| ![Mulle kybernetiK tag](https://img.shields.io/github/tag/mulle-c/mulle-c-developer.svg?branch=release) [![Build Status](https://github.com/mulle-c/mulle-c-developer/workflows/CI/badge.svg?branch=release)](//github.com/mulle-c/mulle-c-developer/actions) | [RELEASENOTES](RELEASENOTES.md) | - ## Usage @@ -49,59 +45,8 @@ mulle-sde init -d hello-lib -m mulle-c/c-developer library -## Add - -**This project is a component of the [mulle-core](//github.com/mulle-core/mulle-core) library. As such you usually will *not* add or install it -individually, unless you specifically do not want to link against -`mulle-core`.** - - -### Add as an individual component - -Use [mulle-sde](//github.com/mulle-sde) to add mulle-c-developer to your project: - -``` sh -mulle-sde add github:mulle-c/mulle-c-developer -``` - -To only add the sources of mulle-c-developer with dependency -sources use [clib](https://github.com/clibs/clib): - - -``` sh -clib install --out src/mulle-c mulle-c/mulle-c-developer -``` - -Add `-isystem src/mulle-c` to your `CFLAGS` and compile all the sources that were downloaded with your project. -## Install - -### Install with mulle-sde - -Use [mulle-sde](//github.com/mulle-sde) to build and install mulle-c-developer: - -``` sh -mulle-sde install --prefix /usr/local \ - https://github.com/mulle-c/mulle-c-developer/archive/latest.tar.gz -``` - -### Manual Installation - - -Download the latest [tar](https://github.com/mulle-c/mulle-c-developer/archive/refs/tags/latest.tar.gz) or [zip](https://github.com/mulle-c/mulle-c-developer/archive/refs/tags/latest.zip) archive and unpack it. - -Install **mulle-c-developer** into `/usr/local` with [cmake](https://cmake.org): - -``` sh -cmake -B build \ - -DCMAKE_INSTALL_PREFIX=/usr/local \ - -DCMAKE_PREFIX_PATH=/usr/local \ - -DCMAKE_BUILD_TYPE=Release && -cmake --build build --config Release && -cmake --install build --config Release -``` - ## Author diff --git a/src/mulle-c/c-cmake/project/all/cmake/share/CMakeTweaksC.cmake b/src/mulle-c/c-cmake/project/all/cmake/share/CMakeTweaksC.cmake index 3104824..3bbb51e 100644 --- a/src/mulle-c/c-cmake/project/all/cmake/share/CMakeTweaksC.cmake +++ b/src/mulle-c/c-cmake/project/all/cmake/share/CMakeTweaksC.cmake @@ -16,7 +16,8 @@ if( NOT __CMAKE_TWEAKS_C_CMAKE__) set_property( GLOBAL PROPERTY USE_FOLDERS ON) if( APPLE) - cmake_minimum_required (VERSION 3.0) + # actually 3.0 but cmake gets pissy then nowadays + # cmake_minimum_required (VERSION 3.5) # CMAKE_OSX_SYSROOT must be set for CMAKE_OSX_DEPLOYMENT_TARGET (cmake bug) if( NOT CMAKE_OSX_SYSROOT) @@ -38,10 +39,10 @@ if( NOT __CMAKE_TWEAKS_C_CMAKE__) else() if( WIN32) # may not be enough though... - cmake_minimum_required( VERSION 3.4) + # cmake_minimum_required( VERSION 3.5) else() # UNIXy gcc based - cmake_minimum_required( VERSION 3.0) + # cmake_minimum_required( VERSION 3.5) endif() # # so we build static libs, but they might be linked into code diff --git a/src/mulle-c/c-cmake/project/all/cmake/share/CompilerFlagsC.cmake b/src/mulle-c/c-cmake/project/all/cmake/share/CompilerFlagsC.cmake index eac2127..487b277 100644 --- a/src/mulle-c/c-cmake/project/all/cmake/share/CompilerFlagsC.cmake +++ b/src/mulle-c/c-cmake/project/all/cmake/share/CompilerFlagsC.cmake @@ -21,7 +21,7 @@ if( NOT __COMPILER_FLAGS_C_CMAKE__) endif() if( MULLE_TEST) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMULLE_TEST=1") + add_definitions( "-DMULLE_TEST=1" ) endif() # set this as the default, as we expect shared libs to be included too @@ -29,7 +29,7 @@ if( NOT __COMPILER_FLAGS_C_CMAKE__) # basis # if( BUILD_SHARED_LIBS) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMULLE_INCLUDE_DYNAMIC=1") + add_definitions( "-DMULLE_INCLUDE_DYNAMIC=1" ) endif() # diff --git a/src/mulle-c/c-cmake/project/all/cmake/share/CompilerWarningsC.cmake b/src/mulle-c/c-cmake/project/all/cmake/share/CompilerWarningsC.cmake index c6643fa..0ce36fc 100644 --- a/src/mulle-c/c-cmake/project/all/cmake/share/CompilerWarningsC.cmake +++ b/src/mulle-c/c-cmake/project/all/cmake/share/CompilerWarningsC.cmake @@ -39,7 +39,7 @@ if( NOT __UNWANTED_WARNINGS_C_CMAKE__) option( WANTED_WARNINGS "Turn off some desirable compiler warnings" ON) endif() - if( UNWANTED_WARNINGS) + if( WANTED_WARNINGS) # # move this to ObjC # diff --git a/src/mulle-c/c-cmake/project/all/cmake/share/PreLibrary.cmake b/src/mulle-c/c-cmake/project/all/cmake/share/PreLibrary.cmake index 76e5a61..3ab6229 100644 --- a/src/mulle-c/c-cmake/project/all/cmake/share/PreLibrary.cmake +++ b/src/mulle-c/c-cmake/project/all/cmake/share/PreLibrary.cmake @@ -9,7 +9,7 @@ if( MULLE_TRACE_INCLUDE) endif() include( CompilerDetectionC) -include( CompilerWarningsC) # after detection, before flags +include( CompilerWarningsC) # after detection, before flags include( CompilerFlagsC) include( PreLibraryAuxC OPTIONAL) diff --git a/src/mulle-c/c-cmake/version b/src/mulle-c/c-cmake/version index c5523bd..6633391 100644 --- a/src/mulle-c/c-cmake/version +++ b/src/mulle-c/c-cmake/version @@ -1 +1 @@ -0.17.0 +0.18.0 diff --git a/src/mulle-c/github-actions/project/all/.github/workflows/mulle-sde-ci.yml b/src/mulle-c/github-actions/project/all/.github/workflows/mulle-sde-ci.yml index 79e2256..84a4088 100644 --- a/src/mulle-c/github-actions/project/all/.github/workflows/mulle-sde-ci.yml +++ b/src/mulle-c/github-actions/project/all/.github/workflows/mulle-sde-ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - release + - master pull_request: workflow_dispatch: @@ -31,7 +31,7 @@ jobs: - name: Dump Environment run: env | sort - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: mulle-sde/github-ci@v1 diff --git a/src/mulle-c/github-actions/version b/src/mulle-c/github-actions/version index c5523bd..6633391 100644 --- a/src/mulle-c/github-actions/version +++ b/src/mulle-c/github-actions/version @@ -1 +1 @@ -0.17.0 +0.18.0