diff --git a/.mulle/share/env/environment-plugin.sh b/.mulle/share/env/environment-plugin.sh index e35d3a2..33b0fbb 100644 --- a/.mulle/share/env/environment-plugin.sh +++ b/.mulle/share/env/environment-plugin.sh @@ -22,6 +22,6 @@ export MULLE_SOURCETREE_SYMLINK='YES' # # # -export MULLE_SDE_INSTALLED_VERSION="3.2.0" +export MULLE_SDE_INSTALLED_VERSION="3.2.2" diff --git a/.mulle/share/env/version b/.mulle/share/env/version index 03f488b..c7cb131 100644 --- a/.mulle/share/env/version +++ b/.mulle/share/env/version @@ -1 +1 @@ -5.3.0 +5.3.1 diff --git a/.mulle/share/sde/version/mulle-sde/cmake b/.mulle/share/sde/version/mulle-sde/cmake index 697f087..48f7a71 100644 --- a/.mulle/share/sde/version/mulle-sde/cmake +++ b/.mulle/share/sde/version/mulle-sde/cmake @@ -1 +1 @@ -0.28.0 +0.28.1 diff --git a/CMakeLists.txt b/CMakeLists.txt index ba160e9..29673b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required( VERSION 3.1) -project( MulleObjCPlistFoundation VERSION 0.20.5 LANGUAGES C) +project( MulleObjCPlistFoundation VERSION 0.20.6 LANGUAGES C) set( CMAKE_C_DEBUG_FLAGS "${CMAKE_C_DEBUG_FLAGS} -Wuninitialized") diff --git a/README.md b/README.md index 490504d..412e4a6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ which looks like this: | Release Version | Release Notes |-------------------------------------------------------|-------------- -| ![Mulle kybernetiK tag](https://img.shields.io/github/tag/MulleFoundation/MulleObjCPlistFoundation.svg?branch=release) [![Build Status](https://github.com/MulleFoundation/MulleObjCPlistFoundation/workflows/CI/badge.svg?branch=release)](//github.com/MulleFoundation/MulleObjCPlistFoundation/actions) | [RELEASENOTES](RELEASENOTES.md) | +| ![Mulle kybernetiK tag](https://img.shields.io/github/tag/MulleFoundation/MulleObjCPlistFoundation.svg) [![Build Status](https://github.com/MulleFoundation/MulleObjCPlistFoundation/workflows/CI/badge.svg)](//github.com/MulleFoundation/MulleObjCPlistFoundation/actions) | [RELEASENOTES](RELEASENOTES.md) | ## API diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 8a54964..4ca998d 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,3 +1,7 @@ +### 0.20.6 + +Various small improvements + ### 0.20.5 Various small improvements diff --git a/cmake/share/InstallRpath.cmake b/cmake/share/InstallRpath.cmake index dbdae7f..8e03fcb 100644 --- a/cmake/share/InstallRpath.cmake +++ b/cmake/share/InstallRpath.cmake @@ -27,10 +27,15 @@ if( MULLE_NO_CMAKE_INSTALL_RPATH) set( CMAKE_SKIP_BUILD_RPATH ON) else() if( APPLE) - set( CMAKE_INSTALL_RPATH - "@loader_path/../lib/" - "@loader_path/../Frameworks/" - ) + if( CMAKE_VERSION VERSION_GREATER_EQUAL 3.20) + # Modern CMake handles lib path automatically + set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks/") + else() + set(CMAKE_INSTALL_RPATH + "@loader_path/../lib/" + "@loader_path/../Frameworks/" + ) + endif() else() set( CMAKE_INSTALL_RPATH "\$ORIGIN/../lib") endif() diff --git a/src/MulleObjCPlistFoundation.h b/src/MulleObjCPlistFoundation.h index 1b73589..dea4cc8 100644 --- a/src/MulleObjCPlistFoundation.h +++ b/src/MulleObjCPlistFoundation.h @@ -37,7 +37,7 @@ #import "import.h" // keep this in sync with MULLE_OBJC_VERSION, else pain! (why ?) -#define MULLE_OBJC_PLIST_FOUNDATION_VERSION ((0UL << 20) | (20 << 8) | 5) +#define MULLE_OBJC_PLIST_FOUNDATION_VERSION ((0UL << 20) | (20 << 8) | 6) // we do it manually... diff --git a/src/reflect/_MulleObjCPlistFoundation-versioncheck.h b/src/reflect/_MulleObjCPlistFoundation-versioncheck.h index ab81203..51122b7 100644 --- a/src/reflect/_MulleObjCPlistFoundation-versioncheck.h +++ b/src/reflect/_MulleObjCPlistFoundation-versioncheck.h @@ -7,7 +7,7 @@ #if defined( MULLE_OBJC_STANDARD_FOUNDATION_VERSION) # ifndef MULLE_OBJC_STANDARD_FOUNDATION_VERSION_MIN -# define MULLE_OBJC_STANDARD_FOUNDATION_VERSION_MIN ((0UL << 20) | (22 << 8) | 0) +# define MULLE_OBJC_STANDARD_FOUNDATION_VERSION_MIN ((0UL << 20) | (22 << 8) | 1) # endif # ifndef MULLE_OBJC_STANDARD_FOUNDATION_VERSION_MAX # define MULLE_OBJC_STANDARD_FOUNDATION_VERSION_MAX ((0UL << 20) | (23 << 8) | 0) diff --git a/src/reflect/objc-loader.inc b/src/reflect/objc-loader.inc index e06ddd0..f2bdd83 100644 --- a/src/reflect/objc-loader.inc +++ b/src/reflect/objc-loader.inc @@ -1,3 +1,7 @@ + { @selector( MulleObjCLoader), @selector( MulleObjCContainerFoundation) }, // 47a9beb6;MulleObjCLoader;2132102f;MulleObjCContainerFoundation + { @selector( MulleObjCLoader), @selector( MulleObjCStandardFoundation) }, // 47a9beb6;MulleObjCLoader;ed704a42;MulleObjCStandardFoundation + { @selector( MulleObjCLoader), @selector( MulleObjCTimeFoundation) }, // 47a9beb6;MulleObjCLoader;cc20d48b;MulleObjCTimeFoundation + { @selector( MulleObjCLoader), @selector( MulleObjCValueFoundation) }, // 47a9beb6;MulleObjCLoader;535d5103;MulleObjCValueFoundation { @selector( MulleObjCBufferedInputStream), MULLE_OBJC_NO_CATEGORYID }, // 0d289418;MulleObjCBufferedInputStream;; { @selector( MulleObjCBufferedOutputStream), MULLE_OBJC_NO_CATEGORYID }, // f919266f;MulleObjCBufferedOutputStream;; { @selector( MulleObjCInMemoryInputStream), MULLE_OBJC_NO_CATEGORYID }, // c11e0f43;MulleObjCInMemoryInputStream;; diff --git a/test/.mulle/share/env/environment-plugin.sh b/test/.mulle/share/env/environment-plugin.sh index e35d3a2..33b0fbb 100644 --- a/test/.mulle/share/env/environment-plugin.sh +++ b/test/.mulle/share/env/environment-plugin.sh @@ -22,6 +22,6 @@ export MULLE_SOURCETREE_SYMLINK='YES' # # # -export MULLE_SDE_INSTALLED_VERSION="3.2.0" +export MULLE_SDE_INSTALLED_VERSION="3.2.2" diff --git a/test/.mulle/share/env/version b/test/.mulle/share/env/version index 03f488b..c7cb131 100644 --- a/test/.mulle/share/env/version +++ b/test/.mulle/share/env/version @@ -1 +1 @@ -5.3.0 +5.3.1