Skip to content

Commit

Permalink
* minor bugfix and updates such as version increments
Browse files Browse the repository at this point in the history
  • Loading branch information
mulle-nat committed Nov 19, 2024
1 parent 91467d9 commit 5d8a39e
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dockerfile-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mulle-sde-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ coverage*.html
*.gcda
*.gcno
cola/wilted/
cmake-build-*/
18 changes: 0 additions & 18 deletions .mulle/etc/env/environment-host-ci-prerelease.sh

This file was deleted.

4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions CMakePackage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
set( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
set( CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
set( CPACK_PACKAGE_CONTACT "Nat! <nat@mulle-kybernetik.de>")
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
Expand Down
55 changes: 0 additions & 55 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ 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
# if this is not the case you need to change this on a case per case
# basis
#
if( BUILD_SHARED_LIBS)
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMULLE_INCLUDE_DYNAMIC=1")
add_definitions( "-DMULLE_INCLUDE_DYNAMIC=1" )
endif()

#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion src/mulle-c/c-cmake/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.17.0
0.18.0
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- release
- master
pull_request:
workflow_dispatch:

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/mulle-c/github-actions/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.17.0
0.18.0

0 comments on commit 5d8a39e

Please sign in to comment.