From 9289b9b0ffa8cea7f2c482eb16525d886b97cc30 Mon Sep 17 00:00:00 2001 From: Nat! Date: Wed, 11 Dec 2024 16:32:13 +0100 Subject: [PATCH] * fixed mulleRegisterObject: in NSMutableSet --- .mulle/share/env/environment-plugin.sh | 2 +- .mulle/share/env/version | 2 +- .mulle/share/sde/version/mulle-sde/cmake | 2 +- CMakeLists.txt | 2 +- README.md | 2 +- RELEASENOTES.md | 4 ++++ clib.json | 2 +- cmake/share/InstallRpath.cmake | 13 +++++++++---- src/MulleObjCContainerFoundation.h | 2 +- src/NSSet/_MulleObjCConcreteMutableSet.m | 4 ++-- .../_MulleObjCContainerFoundation-versioncheck.h | 4 ++-- test/.mulle/share/env/environment-plugin.sh | 2 +- test/.mulle/share/env/version | 2 +- .../share/sde/version/mulle-sde/base-test-runtime | 2 +- .../share/sde/version/mulle-sde/c-test-runtime | 2 +- test/.mulle/share/sde/version/mulle-sde/objc-test | 2 +- .../share/sde/version/mulle-sde/objc-test-runtime | 2 +- 17 files changed, 30 insertions(+), 21 deletions(-) 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 c4973bd..f33d72b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required( VERSION 3.15) -project( MulleObjCContainerFoundation VERSION 0.23.0 LANGUAGES C) +project( MulleObjCContainerFoundation VERSION 0.23.1 LANGUAGES C) set( CMAKE_C_DEBUG_FLAGS "${CMAKE_C_DEBUG_FLAGS} -Wuninitialized") diff --git a/README.md b/README.md index 7ea78c7..cba57d8 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ usual containeres expected in a Foundation library. | Release Version | Release Notes |-------------------------------------------------------|-------------- -| ![Mulle kybernetiK tag](https://img.shields.io/github/tag/MulleFoundation/MulleObjCContainerFoundation.svg?branch=release) [![Build Status](https://github.com/MulleFoundation/MulleObjCContainerFoundation/workflows/CI/badge.svg?branch=release)](//github.com/MulleFoundation/MulleObjCContainerFoundation/actions) | [RELEASENOTES](RELEASENOTES.md) | +| ![Mulle kybernetiK tag](https://img.shields.io/github/tag/MulleFoundation/MulleObjCContainerFoundation.svg) [![Build Status](https://github.com/MulleFoundation/MulleObjCContainerFoundation/workflows/CI/badge.svg)](//github.com/MulleFoundation/MulleObjCContainerFoundation/actions) | [RELEASENOTES](RELEASENOTES.md) | ## API diff --git a/RELEASENOTES.md b/RELEASENOTES.md index de7432d..5788c80 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,3 +1,7 @@ +### 0.23.1 + +* fixed mulleRegisterObject: in NSMutableSet + ## 0.23.0 diff --git a/clib.json b/clib.json index 0aa3520..e52e039 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name" : "MulleObjCContainerFoundation", - "version" : "0.23.0", + "version" : "0.23.1", "description" : "🛍 Container classes like NSArray, NSSet, NSDictionary", "keywords" : [], "license" : "BSD-3-Clause", 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/MulleObjCContainerFoundation.h b/src/MulleObjCContainerFoundation.h index 660f146..07af23d 100644 --- a/src/MulleObjCContainerFoundation.h +++ b/src/MulleObjCContainerFoundation.h @@ -34,7 +34,7 @@ // POSSIBILITY OF SUCH DAMAGE. // -#define MULLE_OBJC_CONTAINER_FOUNDATION_VERSION ((0UL << 20) | (23 << 8) | 0) +#define MULLE_OBJC_CONTAINER_FOUNDATION_VERSION ((0UL << 20) | (23 << 8) | 1) #import "import.h" diff --git a/src/NSSet/_MulleObjCConcreteMutableSet.m b/src/NSSet/_MulleObjCConcreteMutableSet.m index 9917a32..90aaf4d 100644 --- a/src/NSSet/_MulleObjCConcreteMutableSet.m +++ b/src/NSSet/_MulleObjCConcreteMutableSet.m @@ -80,8 +80,8 @@ - (id) mulleRegisterObject:(id) obj ivars = _MulleObjCSetGetIvars( self); allocator = MulleObjCInstanceGetAllocator( self); - old = _mulle__set_insert( &ivars->_table, obj, &NSSetCallback, allocator); - return( old == NULL ? obj : old); + old = _mulle__set_register( &ivars->_table, obj, &NSSetCallback, allocator); + return( old); } diff --git a/src/reflect/_MulleObjCContainerFoundation-versioncheck.h b/src/reflect/_MulleObjCContainerFoundation-versioncheck.h index d74509b..b1ef3a2 100644 --- a/src/reflect/_MulleObjCContainerFoundation-versioncheck.h +++ b/src/reflect/_MulleObjCContainerFoundation-versioncheck.h @@ -7,10 +7,10 @@ #if defined( MULLE_OBJC_VERSION) # ifndef MULLE_OBJC_VERSION_MIN -# define MULLE_OBJC_VERSION_MIN ((0UL << 20) | (24 << 8) | 0) +# define MULLE_OBJC_VERSION_MIN ((0UL << 20) | (25 << 8) | 0) # endif # ifndef MULLE_OBJC_VERSION_MAX -# define MULLE_OBJC_VERSION_MAX ((0UL << 20) | (25 << 8) | 0) +# define MULLE_OBJC_VERSION_MAX ((0UL << 20) | (26 << 8) | 0) # endif # if MULLE_OBJC_VERSION < MULLE_OBJC_VERSION_MIN # error "MulleObjC is too old" 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 diff --git a/test/.mulle/share/sde/version/mulle-sde/base-test-runtime b/test/.mulle/share/sde/version/mulle-sde/base-test-runtime index 19b860c..a4c853e 100644 --- a/test/.mulle/share/sde/version/mulle-sde/base-test-runtime +++ b/test/.mulle/share/sde/version/mulle-sde/base-test-runtime @@ -1 +1 @@ -6.4.0 +6.4.2 diff --git a/test/.mulle/share/sde/version/mulle-sde/c-test-runtime b/test/.mulle/share/sde/version/mulle-sde/c-test-runtime index 19b860c..a4c853e 100644 --- a/test/.mulle/share/sde/version/mulle-sde/c-test-runtime +++ b/test/.mulle/share/sde/version/mulle-sde/c-test-runtime @@ -1 +1 @@ -6.4.0 +6.4.2 diff --git a/test/.mulle/share/sde/version/mulle-sde/objc-test b/test/.mulle/share/sde/version/mulle-sde/objc-test index 19b860c..a4c853e 100644 --- a/test/.mulle/share/sde/version/mulle-sde/objc-test +++ b/test/.mulle/share/sde/version/mulle-sde/objc-test @@ -1 +1 @@ -6.4.0 +6.4.2 diff --git a/test/.mulle/share/sde/version/mulle-sde/objc-test-runtime b/test/.mulle/share/sde/version/mulle-sde/objc-test-runtime index 19b860c..a4c853e 100644 --- a/test/.mulle/share/sde/version/mulle-sde/objc-test-runtime +++ b/test/.mulle/share/sde/version/mulle-sde/objc-test-runtime @@ -1 +1 @@ -6.4.0 +6.4.2