From 1bd1fc1bf461f07911ecf00b4e1791d8fe355ade Mon Sep 17 00:00:00 2001 From: Nat! Date: Tue, 22 Oct 2019 13:12:12 +0200 Subject: [PATCH] modernized mulle-sde --- .gitignore | 7 +++++-- .mulle/etc/project/version-info.sh | 6 +++--- .mulle/etc/sourcetree/config | 2 +- .mulle/share/env/environment-plugin.sh | 2 +- .mulle/share/env/environment.sh | 2 +- .mulle/share/env/tool-extension.windows | 19 +++++++++++++++++++ .mulle/share/env/version | 2 +- .mulle/share/monitor/libexec/source-task.sh | 1 - .../share/monitor/libexec/sourcetree-task.sh | 4 ++-- .mulle/share/sde/version/mulle-c/c | 2 +- .mulle/share/sde/version/mulle-c/c-cmake | 2 +- .mulle/share/sde/version/mulle-c/c-demo | 2 +- .../share/sde/version/mulle-foundation/objc | 2 +- .../sde/version/mulle-foundation/objc-cmake | 2 +- .../sde/version/mulle-foundation/objc-demo | 2 +- .../version/mulle-foundation/objc-developer | 2 +- .mulle/share/sde/version/mulle-objc/objc | 2 +- .../share/sde/version/mulle-objc/objc-cmake | 2 +- .mulle/share/sde/version/mulle-objc/objc-demo | 2 +- .../share/sde/version/mulle-objc/vscode-clang | 2 +- CMakeLists.txt | 2 +- MulleScion.xcodeproj/project.pbxproj | 6 +++--- RELEASENOTES.md | 4 ++++ cmake/_Dependencies.cmake | 2 +- cmake/share/Motd.cmake | 6 ++++-- cmake/share/PostStandaloneAuxC.cmake | 15 +++++++++++++++ cmake/share/StandaloneC.cmake | 6 ++++-- mulle-sde-xcconfig | 1 - 28 files changed, 76 insertions(+), 33 deletions(-) create mode 100644 .mulle/share/env/tool-extension.windows create mode 100644 cmake/share/PostStandaloneAuxC.cmake delete mode 160000 mulle-sde-xcconfig diff --git a/.gitignore b/.gitignore index 5eee219..e623bea 100644 --- a/.gitignore +++ b/.gitignore @@ -5,21 +5,24 @@ *.uncrustify *.xxx *~ +*-workspace .bootstrap.auto/ .bootstrap.local/ .idea/ .repos/ .bootstrap.repos/ +.vscode/ -/addictions +/addiction /bin /include /lib /stashes Build/ build/ -dependencies/ +kitchen/ +dependency/ dox/html/ github*.json google-toolbox-for-mac/ diff --git a/.mulle/etc/project/version-info.sh b/.mulle/etc/project/version-info.sh index 42ad986..78c1164 100755 --- a/.mulle/etc/project/version-info.sh +++ b/.mulle/etc/project/version-info.sh @@ -5,9 +5,9 @@ # no git operations. # -VERSIONFILE='CMakeLists.txt' -VERSIONNAME='PROJECT_VERSION' -WRITE_XCODE_VERSION='YES' + +VERSIONFILE="CMakeLists.txt" +VERSIONNAME="PROJECT_VERSION" # # Other files getting the version written into. Write only. Linefeed separated. diff --git a/.mulle/etc/sourcetree/config b/.mulle/etc/sourcetree/config index 837e950..b9ee1f9 100644 --- a/.mulle/etc/sourcetree/config +++ b/.mulle/etc/sourcetree/config @@ -2,4 +2,4 @@ zlib;tar;no-all-load,no-import,no-inplace,no-os-darwin,no-public,no-rootheader;F google-toolbox-for-mac;git;no-all-load,no-build,no-header,no-import,no-link,no-share;E5C4B17F-BFBA-4146-A0FD-27E4C70E1454;${GOOGLE_TOOLBOX_FOR_MAC_URL:-https://github.com/mulle-nat/google-toolbox-for-mac.git};${GOOGLE_TOOLBOX_FOR_MAC_BRANCH};;; mulle-sde-xcconfig;git;no-all-load,no-build,no-header,no-import,no-link,no-share;246C0369-2BCC-4CF3-82DF-1C8274E2642D;${MULLE_SDE_XCCONFIG_URL:-https://github.com/mulle-nat/mulle-sde-xcconfig.git};${MULLE_SDE_XCCONFIG_BRANCH};;; Foundation;tar;no-fetch-darwin,no-os-darwin;5aed87f4-86d7-42b3-9f76-7ab93f27c910;${FOUNDATION_URL:-https://github.com/MulleFoundation/Foundation/archive/${FOUNDATION_BRANCH:-latest}.tar.gz};;;; -Foundation-startup;${FOUNDATION_STARTUP_NODETYPE:-tar};no-dynamic-link,no-header,no-intermediate-link,no-os-darwin,no-singlephase;ace2c5fd-1613-4eab-b212-abf96bec25a4;${FOUNDATION_STARTUP_URL:-https://github.com/MulleFoundation/Foundation-startup/archive/${MULLE_BRANCH}.tar.gz};${FOUNDATION_STARTUP_BRANCH:-latest};;; +Foundation-startup;${FOUNDATION_STARTUP_NODETYPE:-tar};no-dynamic-link,no-header,no-intermediate-link,no-os-darwin;ace2c5fd-1613-4eab-b212-abf96bec25a4;${FOUNDATION_STARTUP_URL:-https://github.com/MulleFoundation/Foundation-startup/archive/${MULLE_BRANCH}.tar.gz};${FOUNDATION_STARTUP_BRANCH:-latest};;; diff --git a/.mulle/share/env/environment-plugin.sh b/.mulle/share/env/environment-plugin.sh index 636d5b5..a16f491 100644 --- a/.mulle/share/env/environment-plugin.sh +++ b/.mulle/share/env/environment-plugin.sh @@ -41,6 +41,6 @@ export KITCHEN_DIR="${MULLE_VIRTUAL_ROOT}/kitchen" # # # -export MULLE_SDE_INSTALLED_VERSION="0.39.0" +export MULLE_SDE_INSTALLED_VERSION="0.39.4" diff --git a/.mulle/share/env/environment.sh b/.mulle/share/env/environment.sh index 26e4a15..3fa7bb3 100644 --- a/.mulle/share/env/environment.sh +++ b/.mulle/share/env/environment.sh @@ -23,7 +23,7 @@ then MULLE_HOSTNAME="`PATH=/bin:/usr/bin:/sbin:/usr/sbin hostname -s`" if [ "${MULLE_HOSTNAME:0:1}" = '.' ] then - MULLE_HOSTNAME="_walitza" + MULLE_HOSTNAME="_${MULLE_HOSTNAME}" fi export MULLE_HOSTNAME fi diff --git a/.mulle/share/env/tool-extension.windows b/.mulle/share/env/tool-extension.windows new file mode 100644 index 0000000..bf4a893 --- /dev/null +++ b/.mulle/share/env/tool-extension.windows @@ -0,0 +1,19 @@ +lib.exe +cl.exe +link.exe +ifc.exe;optional +ml.exe;optional +bscmake.exe;optional +ml64.exe;optional +cvtres.exe;optional +msbuild.exe;optional +dumpbin.exe;optional +editbin.exe;optional +pgomgr.exe;optional +pgocvt.exe;optional +pgosweep.exe;optional +xdcmake.exe;optional +cmake;remove +cmake.exe +ninja.exe;optional +nmake.exe;optional diff --git a/.mulle/share/env/version b/.mulle/share/env/version index 197c4d5..73462a5 100644 --- a/.mulle/share/env/version +++ b/.mulle/share/env/version @@ -1 +1 @@ -2.4.0 +2.5.1 diff --git a/.mulle/share/monitor/libexec/source-task.sh b/.mulle/share/monitor/libexec/source-task.sh index 62eb0bd..8e00bc8 100644 --- a/.mulle/share/monitor/libexec/source-task.sh +++ b/.mulle/share/monitor/libexec/source-task.sh @@ -37,6 +37,5 @@ source_task_run() exekutor mulle-match-to-cmake \ ${MULLE_TECHNICAL_FLAGS} \ - ${MULLE_MATCH_TO_CMAKE_FLAGS} \ "$@" } diff --git a/.mulle/share/monitor/libexec/sourcetree-task.sh b/.mulle/share/monitor/libexec/sourcetree-task.sh index fbd4c5c..d68dacb 100644 --- a/.mulle/share/monitor/libexec/sourcetree-task.sh +++ b/.mulle/share/monitor/libexec/sourcetree-task.sh @@ -47,7 +47,7 @@ sourcetree_task_run() ;; *) - exekutor mulle-sourcetree-to-cmake ${MULLE_SOURCETREE_TO_CMAKE_FLAGS} "$@" || return $? + exekutor mulle-sourcetree-to-cmake "$@" || return $? ;; esac @@ -56,7 +56,7 @@ sourcetree_task_run() ;; *) - exekutor mulle-sourcetree-to-c ${MULLE_SOURCETREE_TO_C_FLAGS} "$@" || return $? + exekutor mulle-sourcetree-to-c "$@" || return $? ;; esac } diff --git a/.mulle/share/sde/version/mulle-c/c b/.mulle/share/sde/version/mulle-c/c index 5712157..d9df1bb 100644 --- a/.mulle/share/sde/version/mulle-c/c +++ b/.mulle/share/sde/version/mulle-c/c @@ -1 +1 @@ -0.10.1 +0.11.0 diff --git a/.mulle/share/sde/version/mulle-c/c-cmake b/.mulle/share/sde/version/mulle-c/c-cmake index 5712157..d9df1bb 100644 --- a/.mulle/share/sde/version/mulle-c/c-cmake +++ b/.mulle/share/sde/version/mulle-c/c-cmake @@ -1 +1 @@ -0.10.1 +0.11.0 diff --git a/.mulle/share/sde/version/mulle-c/c-demo b/.mulle/share/sde/version/mulle-c/c-demo index 5712157..d9df1bb 100644 --- a/.mulle/share/sde/version/mulle-c/c-demo +++ b/.mulle/share/sde/version/mulle-c/c-demo @@ -1 +1 @@ -0.10.1 +0.11.0 diff --git a/.mulle/share/sde/version/mulle-foundation/objc b/.mulle/share/sde/version/mulle-foundation/objc index a551051..04a373e 100644 --- a/.mulle/share/sde/version/mulle-foundation/objc +++ b/.mulle/share/sde/version/mulle-foundation/objc @@ -1 +1 @@ -0.15.0 +0.16.0 diff --git a/.mulle/share/sde/version/mulle-foundation/objc-cmake b/.mulle/share/sde/version/mulle-foundation/objc-cmake index a551051..04a373e 100644 --- a/.mulle/share/sde/version/mulle-foundation/objc-cmake +++ b/.mulle/share/sde/version/mulle-foundation/objc-cmake @@ -1 +1 @@ -0.15.0 +0.16.0 diff --git a/.mulle/share/sde/version/mulle-foundation/objc-demo b/.mulle/share/sde/version/mulle-foundation/objc-demo index a551051..04a373e 100644 --- a/.mulle/share/sde/version/mulle-foundation/objc-demo +++ b/.mulle/share/sde/version/mulle-foundation/objc-demo @@ -1 +1 @@ -0.15.0 +0.16.0 diff --git a/.mulle/share/sde/version/mulle-foundation/objc-developer b/.mulle/share/sde/version/mulle-foundation/objc-developer index a551051..04a373e 100644 --- a/.mulle/share/sde/version/mulle-foundation/objc-developer +++ b/.mulle/share/sde/version/mulle-foundation/objc-developer @@ -1 +1 @@ -0.15.0 +0.16.0 diff --git a/.mulle/share/sde/version/mulle-objc/objc b/.mulle/share/sde/version/mulle-objc/objc index 4312e0d..04a373e 100644 --- a/.mulle/share/sde/version/mulle-objc/objc +++ b/.mulle/share/sde/version/mulle-objc/objc @@ -1 +1 @@ -0.15.2 +0.16.0 diff --git a/.mulle/share/sde/version/mulle-objc/objc-cmake b/.mulle/share/sde/version/mulle-objc/objc-cmake index 4312e0d..04a373e 100644 --- a/.mulle/share/sde/version/mulle-objc/objc-cmake +++ b/.mulle/share/sde/version/mulle-objc/objc-cmake @@ -1 +1 @@ -0.15.2 +0.16.0 diff --git a/.mulle/share/sde/version/mulle-objc/objc-demo b/.mulle/share/sde/version/mulle-objc/objc-demo index 4312e0d..04a373e 100644 --- a/.mulle/share/sde/version/mulle-objc/objc-demo +++ b/.mulle/share/sde/version/mulle-objc/objc-demo @@ -1 +1 @@ -0.15.2 +0.16.0 diff --git a/.mulle/share/sde/version/mulle-objc/vscode-clang b/.mulle/share/sde/version/mulle-objc/vscode-clang index 4312e0d..04a373e 100644 --- a/.mulle/share/sde/version/mulle-objc/vscode-clang +++ b/.mulle/share/sde/version/mulle-objc/vscode-clang @@ -1 +1 @@ -0.15.2 +0.16.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 39a8742..a4ae54d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ ${MULLE_SCION_PRINTER_HEADERS} include( PostFiles OPTIONAL) -set( PROJECT_VERSION 1859.1.0) +set( PROJECT_VERSION 1859.1.1) add_definitions( -DPROJECT_VERSION={PROJECT_VERSION}) diff --git a/MulleScion.xcodeproj/project.pbxproj b/MulleScion.xcodeproj/project.pbxproj index cfb79f6..0ed2486 100644 --- a/MulleScion.xcodeproj/project.pbxproj +++ b/MulleScion.xcodeproj/project.pbxproj @@ -2023,7 +2023,7 @@ baseConfigurationReference = 413C51611CC284CA00F62468 /* Debug.xcconfig */; buildSettings = { CLANG_WARN_INT_CONVERSION = YES; - CURRENT_PROJECT_VERSION = 1859.1.0; + CURRENT_PROJECT_VERSION = 1859.1.1; DYLIB_COMPATIBILITY_VERSION = 1848.0; DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)"; GCC_OPTIMIZATION_LEVEL = 0; @@ -2055,7 +2055,7 @@ baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */; buildSettings = { CLANG_WARN_INT_CONVERSION = YES; - CURRENT_PROJECT_VERSION = 1859.1.0; + CURRENT_PROJECT_VERSION = 1859.1.1; DYLIB_COMPATIBILITY_VERSION = 1848.0; DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -2124,7 +2124,7 @@ baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */; buildSettings = { CLANG_WARN_INT_CONVERSION = YES; - CURRENT_PROJECT_VERSION = 1859.1.0; + CURRENT_PROJECT_VERSION = 1859.1.1; DYLIB_COMPATIBILITY_VERSION = 1848.0; DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)"; GCC_PREPROCESSOR_DEFINITIONS = ( diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 77ce030..a6a68e2 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,3 +1,7 @@ +### 1859.1.1 + +* updated mulle-sde, improved versioning + # 1859.0.0 chamged versioning to three digits for mulle-project diff --git a/cmake/_Dependencies.cmake b/cmake/_Dependencies.cmake index 9ffd55b..812e590 100644 --- a/cmake/_Dependencies.cmake +++ b/cmake/_Dependencies.cmake @@ -164,7 +164,7 @@ endif() # -# Generated from sourcetree: Foundation-startup;no-dynamic-link,no-header,no-intermediate-link,no-os-darwin,no-singlephase; +# Generated from sourcetree: Foundation-startup;no-dynamic-link,no-header,no-intermediate-link,no-os-darwin; # Disable with: `mulle-sourcetree mark Foundation-startup no-link` # if( NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/cmake/share/Motd.cmake b/cmake/share/Motd.cmake index 2fe0a75..e5686b4 100644 --- a/cmake/share/Motd.cmake +++ b/cmake/share/Motd.cmake @@ -11,11 +11,13 @@ if( NOT __MOTD__CMAKE__) # if( MSVC) find_program( CREATE_MOTD_EXE mulle-create-build-motd.bat - PATHS "${MULLE_VIRTUAL_ROOT}/.mulle/share/env/var/$ENV{MULLE_HOSTNAME}/bin" + PATHS "${MULLE_VIRTUAL_ROOT}/.mulle/var/$ENV{MULLE_HOSTNAME}/env/bin" ) else() + # will fail on WSL if .mulle/var is elsewhere`. should get + # location from `mulle-env vardir env` find_program( CREATE_MOTD_EXE mulle-create-build-motd - PATHS "${MULLE_VIRTUAL_ROOT}/.mulle/share/env/var/$ENV{MULLE_HOSTNAME}/bin" + PATHS "${MULLE_VIRTUAL_ROOT}/.mulle/var/$ENV{MULLE_HOSTNAME}/env/bin" ) endif() diff --git a/cmake/share/PostStandaloneAuxC.cmake b/cmake/share/PostStandaloneAuxC.cmake new file mode 100644 index 0000000..50186c8 --- /dev/null +++ b/cmake/share/PostStandaloneAuxC.cmake @@ -0,0 +1,15 @@ +if( MULLE_TRACE_INCLUDE) + message( STATUS "# Include \"${CMAKE_CURRENT_LIST_FILE}\"" ) +endif() + +# +# only for mulle-clang +# +if( APPLE AND MULLE_OBJC) + target_link_options( "${STANDALONE_LIBRARY_NAME}" + PUBLIC + "SHELL:LINKER:-undefined,dynamic_lookup" + ) +endif() + +include( PostLibraryAuxObjC OPTIONAL) diff --git a/cmake/share/StandaloneC.cmake b/cmake/share/StandaloneC.cmake index c6e2b74..fd94f9f 100644 --- a/cmake/share/StandaloneC.cmake +++ b/cmake/share/StandaloneC.cmake @@ -15,9 +15,9 @@ endif() # include before (!) -include( StandaloneAuxC OPTIONAL) - if( STANDALONE) + include( PreStandaloneAuxC OPTIONAL) + if( NOT LIBRARY_NAME) set( LIBRARY_NAME "${PROJECT_NAME}") endif() @@ -160,6 +160,8 @@ and everybody will be happy") ${STANDALONE_LIBRARY_NAME} ) + include( PostStandaloneAuxC OPTIONAL) + message( STATUS "STANDALONE_LIBRARY_NAME is ${STANDALONE_LIBRARY_NAME}") message( STATUS "STANDALONE_ALL_LOAD_LIBRARIES is ${STANDALONE_ALL_LOAD_LIBRARIES}") message( STATUS "FORCE_STANDALONE_ALL_LOAD_LIBRARIES is ${FORCE_STANDALONE_ALL_LOAD_LIBRARIES}") diff --git a/mulle-sde-xcconfig b/mulle-sde-xcconfig deleted file mode 160000 index 7350092..0000000 --- a/mulle-sde-xcconfig +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 73500925983d9a2150e38445a08126fd47760ae7