Skip to content

Commit 5d8a39e

Browse files
committed
* minor bugfix and updates such as version increments
1 parent 91467d9 commit 5d8a39e

File tree

14 files changed

+19
-90
lines changed

14 files changed

+19
-90
lines changed

.github/workflows/dockerfile-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
if: ${{ ! env.ACT }}
1313

1414
- name: Build Docker image

.github/workflows/mulle-sde-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Dump Environment
2727
run: env | sort
2828

29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030

3131
- uses: mulle-sde/github-ci@v1
3232

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ coverage*.html
1919
*.gcda
2020
*.gcno
2121
cola/wilted/
22+
cmake-build-*/

.mulle/etc/env/environment-host-ci-prerelease.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cmake_minimum_required( VERSION 3.14)
22

3-
project( mulle-c-developer NONE)
3+
project( mulle-c-developer VERSION 0.18.0 LANGUAGES NONE)
44

5-
set( PROJECT_VERSION 0.17.1)
5+
set( PROJECT_VERSION 0.18.0)
66

77
set( EXTENSIONS
88
src/ # backslash is important

CMakePackage.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
set( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
77
set( CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
88
set( CPACK_PACKAGE_CONTACT "Nat! <[email protected]>")
9-
set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
9+
set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
1010
set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "🧢 mulle-c developer kit for mulle-sde")
11-
set( CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
11+
set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
1212
set( CPACK_STRIP_FILES false)
1313

1414
# stuff needed for Debian

README.md

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ These templates enable you to:
1818

1919

2020

21-
| Release Version | Release Notes
22-
|-------------------------------------------------------|--------------
23-
| ![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) |
24-
2521

2622

2723
## Usage
@@ -49,59 +45,8 @@ mulle-sde init -d hello-lib -m mulle-c/c-developer library
4945

5046

5147

52-
## Add
53-
54-
**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
55-
individually, unless you specifically do not want to link against
56-
`mulle-core`.**
57-
58-
59-
### Add as an individual component
60-
61-
Use [mulle-sde](//github.com/mulle-sde) to add mulle-c-developer to your project:
62-
63-
``` sh
64-
mulle-sde add github:mulle-c/mulle-c-developer
65-
```
66-
67-
To only add the sources of mulle-c-developer with dependency
68-
sources use [clib](https://github.com/clibs/clib):
69-
70-
71-
``` sh
72-
clib install --out src/mulle-c mulle-c/mulle-c-developer
73-
```
74-
75-
Add `-isystem src/mulle-c` to your `CFLAGS` and compile all the sources that were downloaded with your project.
7648

7749

78-
## Install
79-
80-
### Install with mulle-sde
81-
82-
Use [mulle-sde](//github.com/mulle-sde) to build and install mulle-c-developer:
83-
84-
``` sh
85-
mulle-sde install --prefix /usr/local \
86-
https://github.com/mulle-c/mulle-c-developer/archive/latest.tar.gz
87-
```
88-
89-
### Manual Installation
90-
91-
92-
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.
93-
94-
Install **mulle-c-developer** into `/usr/local` with [cmake](https://cmake.org):
95-
96-
``` sh
97-
cmake -B build \
98-
-DCMAKE_INSTALL_PREFIX=/usr/local \
99-
-DCMAKE_PREFIX_PATH=/usr/local \
100-
-DCMAKE_BUILD_TYPE=Release &&
101-
cmake --build build --config Release &&
102-
cmake --install build --config Release
103-
```
104-
10550

10651
## Author
10752

src/mulle-c/c-cmake/project/all/cmake/share/CMakeTweaksC.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ if( NOT __CMAKE_TWEAKS_C_CMAKE__)
1616
set_property( GLOBAL PROPERTY USE_FOLDERS ON)
1717

1818
if( APPLE)
19-
cmake_minimum_required (VERSION 3.0)
19+
# actually 3.0 but cmake gets pissy then nowadays
20+
# cmake_minimum_required (VERSION 3.5)
2021

2122
# CMAKE_OSX_SYSROOT must be set for CMAKE_OSX_DEPLOYMENT_TARGET (cmake bug)
2223
if( NOT CMAKE_OSX_SYSROOT)
@@ -38,10 +39,10 @@ if( NOT __CMAKE_TWEAKS_C_CMAKE__)
3839
else()
3940
if( WIN32)
4041
# may not be enough though...
41-
cmake_minimum_required( VERSION 3.4)
42+
# cmake_minimum_required( VERSION 3.5)
4243
else()
4344
# UNIXy gcc based
44-
cmake_minimum_required( VERSION 3.0)
45+
# cmake_minimum_required( VERSION 3.5)
4546
endif()
4647
#
4748
# so we build static libs, but they might be linked into code

src/mulle-c/c-cmake/project/all/cmake/share/CompilerFlagsC.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ if( NOT __COMPILER_FLAGS_C_CMAKE__)
2121
endif()
2222

2323
if( MULLE_TEST)
24-
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMULLE_TEST=1")
24+
add_definitions( "-DMULLE_TEST=1" )
2525
endif()
2626

2727
# set this as the default, as we expect shared libs to be included too
2828
# if this is not the case you need to change this on a case per case
2929
# basis
3030
#
3131
if( BUILD_SHARED_LIBS)
32-
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMULLE_INCLUDE_DYNAMIC=1")
32+
add_definitions( "-DMULLE_INCLUDE_DYNAMIC=1" )
3333
endif()
3434

3535
#

src/mulle-c/c-cmake/project/all/cmake/share/CompilerWarningsC.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if( NOT __UNWANTED_WARNINGS_C_CMAKE__)
3939
option( WANTED_WARNINGS "Turn off some desirable compiler warnings" ON)
4040
endif()
4141

42-
if( UNWANTED_WARNINGS)
42+
if( WANTED_WARNINGS)
4343
#
4444
# move this to ObjC
4545
#

0 commit comments

Comments
 (0)