From 9647010bae69a321828baac1a63ae7417a010fb3 Mon Sep 17 00:00:00 2001 From: Nat! Date: Sat, 13 Jan 2024 16:10:35 +0100 Subject: [PATCH] remove dependencies subsumed by mulle-core, fix README.md --- .mulle/etc/sourcetree/config | 1 - clib.json | 1 - cmake/reflect/_Dependencies.cmake | 82 ------------------- cola/properties.plist | 4 +- src/reflect/_MulleObjCLockFoundation-import.h | 15 ---- src/reflect/objc-loader.inc | 1 - 6 files changed, 2 insertions(+), 102 deletions(-) diff --git a/.mulle/etc/sourcetree/config b/.mulle/etc/sourcetree/config index 5ac035b..3f76c07 100644 --- a/.mulle/etc/sourcetree/config +++ b/.mulle/etc/sourcetree/config @@ -1,3 +1,2 @@ MulleObjCTimeFoundation;${MULLE_OBJC_TIME_FOUNDATION_NODETYPE:-tar};no-singlephase;EC1666C7-1CB1-4471-A1C6-E5A151FE4B89;${MULLE_OBJC_TIME_FOUNDATION_URL:-https://github.com/MulleFoundation/MulleObjCTimeFoundation/archive/${MULLE_TAG}.tar.gz};${MULLE_OBJC_TIME_FOUNDATION_BRANCH};${MULLE_OBJC_TIME_FOUNDATION_TAG:-latest};; -MulleObjC;${MULLE_OBJC_NODETYPE:-tar};no-singlephase;71BFAE94-4F9B-47EF-8B41-0AC012013386;${MULLE_OBJC_URL:-https://github.com/mulle-objc/MulleObjC/archive/${MULLE_TAG}.tar.gz};${MULLE_OBJC_BRANCH};${MULLE_OBJC_TAG:-latest};; mulle-objc-list;${MULLE__OBJC__LIST_NODETYPE:-tar};no-all-load,no-bequeath,no-cmake-inherit,no-header,no-import,no-link;76DA4B0C-CC83-45E5-BBD1-5F4EE7DDE4FE;${MULLE__OBJC__LIST_URL:-https://github.com/mulle-objc/mulle-objc-list/archive/${MULLE_TAG}.tar.gz};${MULLE__OBJC__LIST_BRANCH};${MULLE__OBJC__LIST_TAG:-latest};; diff --git a/clib.json b/clib.json index 4c9e48a..bc0522f 100644 --- a/clib.json +++ b/clib.json @@ -37,7 +37,6 @@ ], "dependencies" : { "MulleFoundation/MulleObjCTimeFoundation": "*", - "mulle-objc/MulleObjC": "*", "mulle-objc/mulle-objc-list": "*" } } diff --git a/cmake/reflect/_Dependencies.cmake b/cmake/reflect/_Dependencies.cmake index 06a1b33..a0d41c8 100644 --- a/cmake/reflect/_Dependencies.cmake +++ b/cmake/reflect/_Dependencies.cmake @@ -91,85 +91,3 @@ if( NOT MULLE_OBJC_TIME_FOUNDATION_LIBRARY) message( FATAL_ERROR "MULLE_OBJC_TIME_FOUNDATION_LIBRARY was not found") endif() endif() - - -# -# Generated from sourcetree: 71BFAE94-4F9B-47EF-8B41-0AC012013386;MulleObjC;no-singlephase; -# Disable with : `mulle-sourcetree mark MulleObjC no-link` -# Disable for this platform: `mulle-sourcetree mark MulleObjC no-cmake-platform-${MULLE_UNAME}` -# Disable for a sdk: `mulle-sourcetree mark MulleObjC no-cmake-sdk-` -# -if( NOT MULLE_OBJC_LIBRARY) - find_library( MULLE_OBJC_LIBRARY NAMES - ${CMAKE_STATIC_LIBRARY_PREFIX}MulleObjC${CMAKE_DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} - ${CMAKE_STATIC_LIBRARY_PREFIX}MulleObjC${CMAKE_STATIC_LIBRARY_SUFFIX} - MulleObjC - NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH - ) - if( NOT MULLE_OBJC_LIBRARY AND NOT DEPENDENCY_IGNORE_SYSTEM_LIBARIES) - find_library( MULLE_OBJC_LIBRARY NAMES - ${CMAKE_STATIC_LIBRARY_PREFIX}MulleObjC${CMAKE_DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} - ${CMAKE_STATIC_LIBRARY_PREFIX}MulleObjC${CMAKE_STATIC_LIBRARY_SUFFIX} - MulleObjC - ) - endif() - message( STATUS "MULLE_OBJC_LIBRARY is ${MULLE_OBJC_LIBRARY}") - # - # The order looks ascending, but due to the way this file is read - # it ends up being descending, which is what we need. - # - if( MULLE_OBJC_LIBRARY) - # - # Add MULLE_OBJC_LIBRARY to ALL_LOAD_DEPENDENCY_LIBRARIES list. - # Disable with: `mulle-sourcetree mark MulleObjC no-cmake-add` - # - list( APPEND ALL_LOAD_DEPENDENCY_LIBRARIES ${MULLE_OBJC_LIBRARY}) - # - # Inherit information from dependency. - # Encompasses: no-cmake-searchpath,no-cmake-dependency,no-cmake-loader - # Disable with: `mulle-sourcetree mark MulleObjC no-cmake-inherit` - # - # temporarily expand CMAKE_MODULE_PATH - get_filename_component( _TMP_MULLE_OBJC_ROOT "${MULLE_OBJC_LIBRARY}" DIRECTORY) - get_filename_component( _TMP_MULLE_OBJC_ROOT "${_TMP_MULLE_OBJC_ROOT}" DIRECTORY) - # - # - # Search for "Definitions.cmake" and "DependenciesAndLibraries.cmake" to include. - # Disable with: `mulle-sourcetree mark MulleObjC no-cmake-dependency` - # - foreach( _TMP_MULLE_OBJC_NAME "MulleObjC") - set( _TMP_MULLE_OBJC_DIR "${_TMP_MULLE_OBJC_ROOT}/include/${_TMP_MULLE_OBJC_NAME}/cmake") - # use explicit path to avoid "surprises" - if( IS_DIRECTORY "${_TMP_MULLE_OBJC_DIR}") - list( INSERT CMAKE_MODULE_PATH 0 "${_TMP_MULLE_OBJC_DIR}") - # - include( "${_TMP_MULLE_OBJC_DIR}/DependenciesAndLibraries.cmake" OPTIONAL) - # - list( REMOVE_ITEM CMAKE_MODULE_PATH "${_TMP_MULLE_OBJC_DIR}") - # - unset( MULLE_OBJC_DEFINITIONS) - include( "${_TMP_MULLE_OBJC_DIR}/Definitions.cmake" OPTIONAL) - list( APPEND INHERITED_DEFINITIONS ${MULLE_OBJC_DEFINITIONS}) - break() - else() - message( STATUS "${_TMP_MULLE_OBJC_DIR} not found") - endif() - endforeach() - # - # Search for "MulleObjCLoader+.h" in include directory. - # Disable with: `mulle-sourcetree mark MulleObjC no-cmake-loader` - # - if( NOT NO_INHERIT_OBJC_LOADERS) - foreach( _TMP_MULLE_OBJC_NAME "MulleObjC") - set( _TMP_MULLE_OBJC_FILE "${_TMP_MULLE_OBJC_ROOT}/include/${_TMP_MULLE_OBJC_NAME}/MulleObjCLoader+${_TMP_MULLE_OBJC_NAME}.h") - if( EXISTS "${_TMP_MULLE_OBJC_FILE}") - list( APPEND INHERITED_OBJC_LOADERS ${_TMP_MULLE_OBJC_FILE}) - break() - endif() - endforeach() - endif() - else() - # Disable with: `mulle-sourcetree mark MulleObjC no-require-link` - message( FATAL_ERROR "MULLE_OBJC_LIBRARY was not found") - endif() -endif() diff --git a/cola/properties.plist b/cola/properties.plist index 1bcb251..5a4f1ac 100644 --- a/cola/properties.plist +++ b/cola/properties.plist @@ -7,7 +7,7 @@ user="MulleFoundation"; repo="MulleObjCLockFoundation"; homepage="https://github.com/MulleFoundation/MulleObjCLockFoundation"; - license="BSD-3-Clause" + license="BSD-3-Clause"; }; dependencies = ( @@ -35,5 +35,5 @@ url="https://github.com/mulle-objc/mulle-objc-list"; user="mulle-objc"; } - ) + ); } diff --git a/src/reflect/_MulleObjCLockFoundation-import.h b/src/reflect/_MulleObjCLockFoundation-import.h index b9f4fbb..59ba340 100644 --- a/src/reflect/_MulleObjCLockFoundation-import.h +++ b/src/reflect/_MulleObjCLockFoundation-import.h @@ -26,21 +26,6 @@ // (use `mulle-sourcetree-to-c --unames` to list known values) #import // MulleObjCTimeFoundation -// To remove the following dependency (headers and library) completely: -// `mulle-sde dependency remove MulleObjC` -// (Use 71BFAE94-4F9B-47EF-8B41-0AC012013386 instead of MulleObjC, if there are duplicate entries) -// -// You can tweak the following #import with these commands: -// remove #import : `mulle-sde dependency mark MulleObjC no-header` -// rename : `mulle-sde dependency|library set MulleObjC include whatever.h` -// reorder : `mulle-sde dependency move MulleObjC ` -// toggle #import : `mulle-sde dependency mark MulleObjC [no-]import` -// toggle public : `mulle-sde dependency mark MulleObjC [no-]public` -// toggle optional : `mulle-sde dependency mark MulleObjC [no-]require` -// remove for platform : `mulle-sde dependency mark MulleObjC no-platform-` -// (use `mulle-sourcetree-to-c --unames` to list known values) -#import // MulleObjC - #ifdef __has_include # if __has_include( "_MulleObjCLockFoundation-include.h") # include "_MulleObjCLockFoundation-include.h" diff --git a/src/reflect/objc-loader.inc b/src/reflect/objc-loader.inc index 5312f6d..d3a839e 100644 --- a/src/reflect/objc-loader.inc +++ b/src/reflect/objc-loader.inc @@ -1,4 +1,3 @@ - { @selector( MulleObjCLoader), @selector( MulleObjCTimeFoundation) }, // 47a9beb6;MulleObjCLoader;cc20d48b;MulleObjCTimeFoundation { @selector( NSCondition), @selector( NSDate) }, // 0397143e;NSCondition;cfcedd21;NSDate { @selector( NSCondition), MULLE_OBJC_NO_CATEGORYID }, // 0397143e;NSCondition;; { @selector( NSConditionLock), @selector( NSDate) }, // 5e0deecf;NSConditionLock;cfcedd21;NSDate