modernized mulle-sde

.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/

.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.

.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};;;

.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"
 
 

.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

.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

.mulle/share/env/version

@@ -1 +1 @@
-2.4.0
+2.5.1

.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} \
                "$@"
 }

.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
 }

.mulle/share/sde/version/mulle-c/c

@@ -1 +1 @@
-0.10.1
+0.11.0

.mulle/share/sde/version/mulle-c/c-cmake

@@ -1 +1 @@
-0.10.1
+0.11.0

.mulle/share/sde/version/mulle-c/c-demo

@@ -1 +1 @@
-0.10.1
+0.11.0

.mulle/share/sde/version/mulle-foundation/objc

@@ -1 +1 @@
-0.15.0
+0.16.0

.mulle/share/sde/version/mulle-foundation/objc-cmake

@@ -1 +1 @@
-0.15.0
+0.16.0

.mulle/share/sde/version/mulle-foundation/objc-demo

@@ -1 +1 @@
-0.15.0
+0.16.0

.mulle/share/sde/version/mulle-foundation/objc-developer

@@ -1 +1 @@
-0.15.0
+0.16.0

.mulle/share/sde/version/mulle-objc/objc

@@ -1 +1 @@
-0.15.2
+0.16.0

.mulle/share/sde/version/mulle-objc/objc-cmake

@@ -1 +1 @@
-0.15.2
+0.16.0

.mulle/share/sde/version/mulle-objc/objc-demo

@@ -1 +1 @@
-0.15.2
+0.16.0

.mulle/share/sde/version/mulle-objc/vscode-clang

@@ -1 +1 @@
-0.15.2
+0.16.0

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})
 

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 = (

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

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")

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()
 

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)

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}")