Skip to content

Commit

Permalink
update project
Browse files Browse the repository at this point in the history
  • Loading branch information
mulle-nat committed Jan 12, 2024
1 parent 1f23f92 commit c9cff43
Show file tree
Hide file tree
Showing 22 changed files with 144 additions and 30 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@ wilted/
mulle-template-composer-*
mulle-markdown-preview-*.html
build-*
coverage*.html
*.gcda
*.gcno
cola/wilted/
1 change: 1 addition & 0 deletions .mulle/etc/match/match.d/86-header--project-only-headers

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .mulle/share/env/environment-extension.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .mulle/share/env/motd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion .mulle/share/match/match.d/85-header--public-headers

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .mulle/share/match/match.d/86-header--project-only-headers

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .mulle/share/sde/version/mulle-c/c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .mulle/share/sde/version/mulle-c/c-demo

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .mulle/share/sde/version/mulle-objc/objc-demo

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .mulle/share/sde/version/mulle-sde/c-cmake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .mulle/share/sde/version/mulle-sde/c-demo

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 23 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ If you can get by with the limited set of functions, these functions are
preferable to use over their mulle-objc counterparts for the sake of portability
and familiarity.



| Release Version | Release Notes
|-------------------------------------------------------|--------------
| ![Mulle kybernetiK tag](https://img.shields.io/github/tag//mulle-objc-compat.svg?branch=release) [![Build Status](https://github.com//mulle-objc-compat/workflows/CI/badge.svg?branch=release)](//github.com//mulle-objc-compat/actions)| [RELEASENOTES](RELEASENOTES.md) |
| ![Mulle kybernetiK tag](https://img.shields.io/github/tag/mulle-objc/mulle-objc-compat.svg?branch=release) [![Build Status](https://github.com/mulle-objc/mulle-objc-compat/workflows/CI/badge.svg?branch=release)](//github.com/mulle-objc/mulle-objc-compat/actions) | [RELEASENOTES](RELEASENOTES.md) |




Expand All @@ -35,6 +38,12 @@ This library



### You are here

![Overview](overview.dot.svg)



## Requirements

| Requirement | Release Version | Description
Expand All @@ -44,21 +53,28 @@ This 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-objc-compat to your project:

``` sh
mulle-sde add github:/
mulle-sde add github:mulle-objc/mulle-objc-compat
```

To only add the sources of mulle-objc-compat 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-compat
```

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
Expand Down Expand Up @@ -86,8 +102,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



4 changes: 4 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 0.20.4

* Various small improvements

### 0.20.3

* Various small improvements
Expand Down
52 changes: 52 additions & 0 deletions clib.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"name" : "mulle-objc-compat",
"version" : "0.20.3",
"description" : "🍏 Compatibility layer with Apple Objective-C runtime functions",
"keywords" : [],
"license" : "BSD-3-Clause",
"repo" : "mulle-objc/mulle-objc-compat",
"src" : [
"src/class.h",
"src/class.m",
"src/generic/import-private.h",
"src/generic/import.h",
"src/generic/include-private.h",
"src/generic/include.h",
"src/ivar.h",
"src/method.h",
"src/method.m",
"src/mulle-objc-compat-standalone.m",
"src/mulle-objc-compat.h",
"src/mulle-objc-compat.m",
"src/objc.h",
"src/objc/message.h",
"src/objc/objc-abi.h",
"src/objc/objc-api.h",
"src/objc/objc-auto.h",
"src/objc/objc-cache.h",
"src/objc/objc-class.h",
"src/objc/objc-config.h",
"src/objc/objc-env.h",
"src/objc/objc-exception.h",
"src/objc/objc-gdb.h",
"src/objc/objc-internal.h",
"src/objc/objc-runtime.h",
"src/objc/objc-sync.h",
"src/objc/objc.h",
"src/objc/Protocol.h",
"src/objc/runtime.h",
"src/object.h",
"src/object.m",
"src/property.h",
"src/property.m",
"src/protocol.h",
"src/protocol.m",
"src/runtime.h",
"src/runtime.m",
"src/selector.h",
"src/selector.m"
],
"dependencies" : {
"mulle-objc/MulleObjC": "*"
}
}
11 changes: 7 additions & 4 deletions cmake/share/Environment.cmake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 17 additions & 5 deletions cmake/share/ExecutableObjC.cmake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions cmake/share/Headers.cmake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cola/properties.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
user="mulle-objc";
repo="mulle-objc-compat";
homepage="https://github.com/mulle-objc/mulle-objc-compat";
license="UNLICENSED"
license="BSD-3-Clause"
};
dependencies =
(
Expand Down
2 changes: 1 addition & 1 deletion src/mulle-objc-compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* version: major, minor, patch
*/
#define MULLE_OBJC_COMPAT_VERSION ((0 << 20) | (20 << 8) | 3)
#define MULLE_OBJC_COMPAT_VERSION ((0UL << 20) | (20 << 8) | 4)

#include "runtime.h"
#include "method.h"
Expand Down
6 changes: 3 additions & 3 deletions test/.mulle/share/sourcetree/config
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mulle-testallocator;${MULLE__TESTALLOCATOR_NODETYPE:-tar};no-import,no-singlephase;8B3A1281-566A-4870-8C42-11DE6C8F0E2C;${MULLE__TESTALLOCATOR_URL:-https://github.com/mulle-core/mulle-testallocator/archive/${MULLE_TAG}.tar.gz};${MULLE__TESTALLOCATOR_BRANCH};${MULLE__TESTALLOCATOR_TAG:-latest};;
mulle-objc-compat;${MULLE__OBJC__COMPAT_NODETYPE:-tar};;A80DA66B-9195-428F-A6F2-8E32BAE3BC1B;${MULLE__OBJC__COMPAT_URL:-https://github.com/nat/mulle-objc-compat/archive/${MULLE_TAG}.tar.gz};${MULLE__OBJC__COMPAT_BRANCH};${MULLE__OBJC__COMPAT_TAG:-latest};;
Foundation-startup;${FOUNDATION_STARTUP_NODETYPE:-tar};no-dynamic-link,no-header,no-intermediate-link;4C70BD8C-5CB0-4C90-B3ED-694F735452CE;${FOUNDATION_STARTUP_URL:-https://github.com/MulleFoundation/Foundation-startup/archive/${MULLE_TAG}.tar.gz};${FOUNDATION_STARTUP_BRANCH};${FOUNDATION_STARTUP_TAG:-latest};;
mulle-testallocator;${MULLE__TESTALLOCATOR_NODETYPE:-tar};no-import,no-singlephase;70908EAD-6639-4C93-B723-280BA4BE69BB;${MULLE__TESTALLOCATOR_URL:-https://github.com/mulle-core/mulle-testallocator/archive/${MULLE_TAG}.tar.gz};${MULLE__TESTALLOCATOR_BRANCH};${MULLE__TESTALLOCATOR_TAG:-latest};;
mulle-objc-compat;${MULLE__OBJC__COMPAT_NODETYPE:-tar};;116A8C71-AB7E-46EE-8278-D31A8277CA29;${MULLE__OBJC__COMPAT_URL:-https://github.com/nat/mulle-objc-compat/archive/${MULLE_TAG}.tar.gz};${MULLE__OBJC__COMPAT_BRANCH};${MULLE__OBJC__COMPAT_TAG:-latest};;
Foundation-startup;${FOUNDATION_STARTUP_NODETYPE:-tar};no-dynamic-link,no-header,no-intermediate-link;73F0907B-86DC-4973-BB21-6C4696C5A508;${FOUNDATION_STARTUP_URL:-https://github.com/MulleFoundation/Foundation-startup/archive/${MULLE_TAG}.tar.gz};${FOUNDATION_STARTUP_BRANCH};${FOUNDATION_STARTUP_TAG:-latest};;
4 changes: 2 additions & 2 deletions test/03_method/methodListSize.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ int main()
Class classes[CLASSCOUNT];
for (i = 0; i < CLASSCOUNT; i++) {
char *classname;
asprintf(&classname, "GrP_class_%d", i);
mulle_asprintf(&classname, "GrP_class_%d", i);
classes[i] = objc_allocateClassPair(root, classname, 0);
objc_registerClassPair(classes[i]);
free(classname);
Expand All @@ -31,7 +31,7 @@ int main()
SEL selectors[SELCOUNT];
for (i = 0; i < SELCOUNT; i++) {
char *selname;
asprintf(&selname, "GrP_sel_%d", i);
mulle_asprintf(&selname, "GrP_sel_%d", i);
selectors[i] = sel_registerName(selname);
free(selname);
}
Expand Down
6 changes: 3 additions & 3 deletions test/test.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static inline void fail(const char *msg, ...)
{
if (msg) {
char *msg2;
asprintf(&msg2, "BAD: %s\n", msg);
mulle_asprintf(&msg2, "BAD: %s\n", msg);
va_list v;
va_start(v, msg);
vfprintf(stderr, msg2, v);
Expand Down Expand Up @@ -116,7 +116,7 @@ static inline void testprintf(const char *msg, ...)
// VERBOSE=1 prints test harness info only
if (msg && verbose >= 2) {
char *msg2;
asprintf(&msg2, "VERBOSE: %s", msg);
mulle_asprintf(&msg2, "VERBOSE: %s", msg);
va_list v;
va_start(v, msg);
vfprintf(stderr, msg2, v);
Expand All @@ -132,7 +132,7 @@ static inline void testwarn(const char *msg, ...)
{
if (msg) {
char *msg2;
asprintf(&msg2, "WARN: %s\n", msg);
mulle_asprintf(&msg2, "WARN: %s\n", msg);
va_list v;
va_start(v, msg);
vfprintf(stderr, msg2, v);
Expand Down

0 comments on commit c9cff43

Please sign in to comment.