* 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
mulle-objc · Jan 11, 2024 · 8c81b8d · 8c81b8d
1 parent 03b7066
commit 8c81b8d
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 10 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -7,6 +7,7 @@
 
 # remove boring files
 .mulle/**   linguist-generated
+.idea/**    linguist-generated
 .vscode/**  linguist-generated
 cmake/**    linguist-generated
 

diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,7 @@ wilted/
 mulle-template-composer-*
 mulle-markdown-preview-*.html
 build-*
+coverage*.html
+*.gcda
+*.gcno
+cola/wilted/
diff --git a/.mulle/share/env/motd b/.mulle/share/env/motd
diff --git a/README.md b/README.md
@@ -8,33 +8,49 @@ code. As a package **mulle-objc-developer** is also a convenient way to
 install mulle-sde and [mulle-clang](//github.com/Codeon-GmbH/mulle-clang).
 
 
+
+
 | Release Version                                       | Release Notes
 |-------------------------------------------------------|--------------
-| ![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) |
+| ![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) |
+
+
+
+
 
 
+### You are here
+
+![Overview](overview.dot.svg)
 
 
 
 
 
 ## 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-objc-developer to your project:
 
 ``` sh
-mulle-sde add github:/
+mulle-sde add github:mulle-objc/mulle-objc-developer
 ```
 
 To only add the sources of mulle-objc-developer with dependency
 sources use [clib](https://github.com/clibs/clib):
 
 
 ``` sh
-clib install --out src/ /
+clib install --out src/mulle-objc mulle-objc/mulle-objc-developer
 ```
 
-Add `-isystem src/` to your `CFLAGS` and compile all the sources that were downloaded with your project.
+Add `-isystem src/mulle-objc` to your `CFLAGS` and compile all the sources that were downloaded with your project.
 
 
 ## Install
@@ -62,8 +78,10 @@ cmake --build build --config Release &&
 cmake --install build --config Release
 ```
 
+
 ## Author
 
-[Nat!](https://mulle-kybernetik.com/weblog) for Mulle kybernetiK
+[Nat!](https://mulle-kybernetik.com/weblog) for Mulle kybernetiK  
+
 
 
diff --git a/src/mulle-objc/objc-demo/demo/executable/PROJECT_SOURCE_DIR/PROJECT_NAME-version.h b/src/mulle-objc/objc-demo/demo/executable/PROJECT_SOURCE_DIR/PROJECT_NAME-version.h
@@ -5,7 +5,7 @@
  *  You can maintain this file with `mulle-project-version`
  *  version:  major, minor, patch
  */
-#define <|PROJECT_UPCASE_IDENTIFIER|>_VERSION  ((0 << 20) | (7 << 8) | 56)
+#define <|PROJECT_UPCASE_IDENTIFIER|>_VERSION  ((0UL << 20) | (7 << 8) | 56)
 
 
 static inline unsigned int   <|PROJECT_IDENTIFIER|>_get_version_major( void)

diff --git a/src/mulle-objc/objc-demo/demo/executable/PROJECT_SOURCE_DIR/main.PROJECT_EXTENSION b/src/mulle-objc/objc-demo/demo/executable/PROJECT_SOURCE_DIR/main.PROJECT_EXTENSION
@@ -16,7 +16,7 @@
 
 + (void) print
 {
-   printf( "VfL Bochum %d\n", <|PROJECT_UPCASE_IDENTIFIER|>_VERSION);
+   printf( "VfL Bochum %lu\n", <|PROJECT_UPCASE_IDENTIFIER|>_VERSION);
 }
 
 @end

diff --git a/src/mulle-objc/objc-demo/version b/src/mulle-objc/objc-demo/version
@@ -1 +1 @@
-0.22.0
+0.26.0
diff --git a/src/mulle-objc/objc/project-oneshot/all/PROJECT_SOURCE_DIR/generic/import.h b/src/mulle-objc/objc/project-oneshot/all/PROJECT_SOURCE_DIR/generic/import.h
@@ -21,7 +21,7 @@
  *
  * #ifdef __has_include
  * # if __has_include( "_<|PROJECT_NAME|>-include.h")
- * #   include "include-private.h"
+ * #   include "include.h"
  * # endif
  * #endif
  */

diff --git a/src/mulle-objc/objc/share/match/match.d/85-header--public-headers b/src/mulle-objc/objc/share/match/match.d/85-header--public-headers
@@ -2,4 +2,6 @@
 # These are public headers, that are auto-included in the envelope header
 
 *.h
-*.inc
+
+# .inc is by default no longer a public header
+# *.inc
diff --git a/src/mulle-objc/objc/share/match/match.d/86-header--project-only-headers b/src/mulle-objc/objc/share/match/match.d/86-header--project-only-headers
@@ -0,0 +1,6 @@
+# This is the fallback if patterns file with smaller numbers fail.
+# These are project headers, that are not included anywhere so far
+# and not even exported as private!
+
+*.inc
+