Skip to content

Commit 8c81b8d

Browse files
committed
* update version numbers to use unsigned long
* .inc files are no long considered for public headers, but are not project header by default * project headers is now a thing... * fix import.h accidentally including include-private.h
1 parent 03b7066 commit 8c81b8d

File tree

10 files changed

+43
-10
lines changed

10 files changed

+43
-10
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
# remove boring files
99
.mulle/** linguist-generated
10+
.idea/** linguist-generated
1011
.vscode/** linguist-generated
1112
cmake/** linguist-generated
1213

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ wilted/
3333
mulle-template-composer-*
3434
mulle-markdown-preview-*.html
3535
build-*
36+
coverage*.html
37+
*.gcda
38+
*.gcno
39+
cola/wilted/

.mulle/share/env/motd

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,49 @@ code. As a package **mulle-objc-developer** is also a convenient way to
88
install mulle-sde and [mulle-clang](//github.com/Codeon-GmbH/mulle-clang).
99

1010

11+
12+
1113
| Release Version | Release Notes
1214
|-------------------------------------------------------|--------------
13-
| ![Mulle kybernetiK tag](https://img.shields.io/github/tag//mulle-objc-developer.svg?branch=release) [![Build Status](https://github.com//mulle-objc-developer/workflows/CI/badge.svg?branch=release)](//github.com//mulle-objc-developer/actions)| [RELEASENOTES](RELEASENOTES.md) |
15+
| ![Mulle kybernetiK tag](https://img.shields.io/github/tag/mulle-objc/mulle-objc-developer.svg?branch=release) [![Build Status](https://github.com/mulle-objc/mulle-objc-developer/workflows/CI/badge.svg?branch=release)](//github.com/mulle-objc/mulle-objc-developer/actions) | [RELEASENOTES](RELEASENOTES.md) |
16+
17+
18+
19+
1420

1521

22+
### You are here
23+
24+
![Overview](overview.dot.svg)
1625

1726

1827

1928

2029

2130
## Add
2231

32+
**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
33+
individually, unless you specifically do not want to link against
34+
`mulle-core`.**
35+
36+
37+
### Add as an individual component
38+
2339
Use [mulle-sde](//github.com/mulle-sde) to add mulle-objc-developer to your project:
2440

2541
``` sh
26-
mulle-sde add github:/
42+
mulle-sde add github:mulle-objc/mulle-objc-developer
2743
```
2844

2945
To only add the sources of mulle-objc-developer with dependency
3046
sources use [clib](https://github.com/clibs/clib):
3147

3248

3349
``` sh
34-
clib install --out src/ /
50+
clib install --out src/mulle-objc mulle-objc/mulle-objc-developer
3551
```
3652

37-
Add `-isystem src/` to your `CFLAGS` and compile all the sources that were downloaded with your project.
53+
Add `-isystem src/mulle-objc` to your `CFLAGS` and compile all the sources that were downloaded with your project.
3854

3955

4056
## Install
@@ -62,8 +78,10 @@ cmake --build build --config Release &&
6278
cmake --install build --config Release
6379
```
6480

81+
6582
## Author
6683

67-
[Nat!](https://mulle-kybernetik.com/weblog) for Mulle kybernetiK
84+
[Nat!](https://mulle-kybernetik.com/weblog) for Mulle kybernetiK
85+
6886

6987

src/mulle-objc/objc-demo/demo/executable/PROJECT_SOURCE_DIR/PROJECT_NAME-version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* You can maintain this file with `mulle-project-version`
66
* version: major, minor, patch
77
*/
8-
#define <|PROJECT_UPCASE_IDENTIFIER|>_VERSION ((0 << 20) | (7 << 8) | 56)
8+
#define <|PROJECT_UPCASE_IDENTIFIER|>_VERSION ((0UL << 20) | (7 << 8) | 56)
99

1010

1111
static inline unsigned int <|PROJECT_IDENTIFIER|>_get_version_major( void)

src/mulle-objc/objc-demo/demo/executable/PROJECT_SOURCE_DIR/main.PROJECT_EXTENSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
+ (void) print
1818
{
19-
printf( "VfL Bochum %d\n", <|PROJECT_UPCASE_IDENTIFIER|>_VERSION);
19+
printf( "VfL Bochum %lu\n", <|PROJECT_UPCASE_IDENTIFIER|>_VERSION);
2020
}
2121

2222
@end

src/mulle-objc/objc-demo/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.22.0
1+
0.26.0

src/mulle-objc/objc/project-oneshot/all/PROJECT_SOURCE_DIR/generic/import.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* #ifdef __has_include
2323
* # if __has_include( "_<|PROJECT_NAME|>-include.h")
24-
* # include "include-private.h"
24+
* # include "include.h"
2525
* # endif
2626
* #endif
2727
*/

src/mulle-objc/objc/share/match/match.d/85-header--public-headers

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
# These are public headers, that are auto-included in the envelope header
33

44
*.h
5-
*.inc
5+
6+
# .inc is by default no longer a public header
7+
# *.inc
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# This is the fallback if patterns file with smaller numbers fail.
2+
# These are project headers, that are not included anywhere so far
3+
# and not even exported as private!
4+
5+
*.inc
6+

0 commit comments

Comments
 (0)