Browse code

* modernized to new mulle-test

Nat! authored on 11-01-2019 16:13:25 • Nat! committed on 15-01-2019 02:13:59
Showing 35 changed files
1 1
deleted file mode 100644
... ...
@@ -1 +0,0 @@
1
-
2 0
deleted file mode 100644
... ...
@@ -1,64 +0,0 @@
1
-mudo
2
-
3
-cat
4
-chgrp
5
-chmod
6
-chown
7
-cp
8
-date
9
-dd
10
-df
11
-dmesg
12
-echo
13
-false
14
-hostname
15
-kill
16
-ln
17
-login
18
-ls
19
-mkdir
20
-mknod
21
-more
22
-mount
23
-mv
24
-ps
25
-pwd
26
-rm
27
-rmdir
28
-sed
29
-sh
30
-stty
31
-su
32
-sync
33
-true
34
-umount
35
-uname
36
-
37
-awk
38
-basename
39
-base64
40
-bash
41
-clear
42
-command
43
-cut
44
-dirname
45
-ed
46
-egrep
47
-env
48
-expr
49
-find
50
-fgrep
51
-grep
52
-head
53
-less
54
-more
55
-readlink
56
-sleep
57
-sort
58
-stat
59
-tail
60
-test
61
-tr
62
-vi
63
-wc
64
-which
... ...
@@ -1 +1 @@
1
-mulle-c11;tar;no-all-load,no-link,no-recurse,no-singlephase,no-singlephase-link;d2603b05-c4b4-4b2b-895e-4fd5dee12f0e;${MULLE_C11_URL:-https://github.com/mulle-c/mulle-c11/archive/${MULLE_C11_BRANCH:-latest}.tar.gz};;;;
1
+mulle-c11;tar;no-all-load,no-cmakeinherit,no-link,no-recurse,no-singlephase;d2603b05-c4b4-4b2b-895e-4fd5dee12f0e;${MULLE_C11_URL:-https://github.com/mulle-c/mulle-c11/archive/${MULLE_C11_BRANCH:-latest}.tar.gz};;;;
... ...
@@ -41,6 +41,6 @@ export BUILD_DIR="${MULLE_VIRTUAL_ROOT}/build"
41 41
 #
42 42
 #
43 43
 #
44
-export MULLE_SDE_INSTALLED_VERSION="0.35.0"
44
+export MULLE_SDE_INSTALLED_VERSION="0.35.1"
45 45
 
46 46
 
... ...
@@ -21,6 +21,10 @@ fi
21 21
 if [ -z "${MULLE_HOSTNAME}" ]
22 22
 then
23 23
    MULLE_HOSTNAME="`PATH=/bin:/usr/bin:/sbin:/usr/sbin hostname -s`"
24
+   if [ "t" = '.' ]
25
+   then
26
+      MULLE_HOSTNAME="_terodde"
27
+   fi
24 28
    export MULLE_HOSTNAME
25 29
 fi
26 30
 if [ -z "${MULLE_VIRTUAL_ROOT}" ]
... ...
@@ -29,7 +29,7 @@
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 #
32
-[ "${TRACE}" = "YES" ] && set -x && : "$0" "$@"
32
+[ "${TRACE}" = 'YES' -o "${MULLE_ENV_BASH_COMPLETION_SH_TRACE}" = 'YES' ] && set -x && : "$0" "$@"
33 33
 
34 34
 
35 35
 _mulle_env_style_complete()
... ...
@@ -80,7 +80,7 @@ _mulle_env_complete()
80 80
       tool)
81 81
          case "$prev" in
82 82
             remove)
83
-               list="`mulle-env -e tool list`"
83
+               list="`mulle-env tool list`"
84 84
                COMPREPLY=( $( compgen -W "${list}" -- "$cur" ) )
85 85
             ;;
86 86
 
... ...
@@ -98,7 +98,7 @@ _mulle_env_complete()
98 98
 
99 99
       environment)
100 100
          case "$prev" in
101
-            get|set)
101
+            get|remove|set)
102 102
                list="`mulle-env -s environment list | sed 's/^\([^=]*\).*/\1/'`"
103 103
                COMPREPLY=( $( compgen -W "${list}" -- "$cur" ) )
104 104
             ;;
... ...
@@ -107,7 +107,7 @@ _mulle_env_complete()
107 107
             ;;
108 108
 
109 109
             --scope)
110
-               list="`mulle-env -s environment scopes`"
110
+               list="`mulle-env -s environment scope`"
111 111
                COMPREPLY=( $( compgen -W "${list}" -- "$cur" ) )
112 112
             ;;
113 113
 
... ...
@@ -118,7 +118,7 @@ _mulle_env_complete()
118 118
                   ;;
119 119
 
120 120
                   *)
121
-                     COMPREPLY=( $( compgen -W "get list set scopes" -- "$cur" ) )
121
+                     COMPREPLY=( $( compgen -W "get list set scope" -- "$cur" ) )
122 122
                   ;;
123 123
                esac
124 124
             ;;
... ...
@@ -1,12 +1,27 @@
1
-
1
+ed
2
+emacs
3
+nano
4
+vi
5
+xargs
6
+curl
2 7
 inotifywait
8
+mulle-create-build-motd
3 9
 ssh
4
-curl
5
-wget
10
+tty
6 11
 uuidgen
12
+wget
13
+zip
14
+ar
15
+as
7 16
 cc
8 17
 clang
18
+diff
9 19
 gcc
10 20
 ld
21
+nm
22
+valgrind
23
+vgdb
24
+valgrind.bin
11 25
 ninja
12 26
 make
27
+mulle-cmake-graphviz-include
... ...
@@ -1 +1 @@
1
-mulle/wild
1
+mulle/relax
... ...
@@ -1,18 +1,32 @@
1
-mudo
2 1
 
2
+awk
3
+base64
4
+basename
5
+bash
3 6
 cat
4 7
 chgrp
5 8
 chmod
6 9
 chown
10
+clear
7 11
 cp
12
+cut
8 13
 date
9 14
 dd
10 15
 df
16
+dirname
11 17
 dmesg
12 18
 echo
19
+egrep
20
+env
21
+expr
13 22
 false
23
+fgrep
24
+find
25
+grep
26
+head
14 27
 hostname
15 28
 kill
29
+less
16 30
 ln
17 31
 login
18 32
 ls
... ...
@@ -20,48 +34,36 @@ mkdir
20 34
 mknod
21 35
 more
22 36
 mount
37
+mudo
23 38
 mv
24 39
 ps
25 40
 pwd
41
+readlink
26 42
 rm
27 43
 rmdir
28 44
 sed
29 45
 sh
30
-stty
31
-su
32
-sync
33
-true
34
-umount
35
-uname
36
-
37
-awk
38
-basename
39
-base64
40
-bash
41
-clear
42
-command
43
-cut
44
-dirname
45
-ed
46
-egrep
47
-env
48
-expr
49
-find
50
-fgrep
51
-grep
52
-head
53
-less
54
-more
55
-readlink
56 46
 sleep
57 47
 sort
58 48
 stat
49
+stty
50
+su
51
+sync
59 52
 tail
53
+tee
60 54
 test
55
+touch
61 56
 tr
62
-vi
57
+true
58
+umount
59
+uname
63 60
 wc
64 61
 which
65 62
 column
66 63
 git
64
+gzip
65
+tar
66
+mulle-sourcetree-to-c
67
+mulle-match-to-cmake
68
+mulle-sourcetree-to-cmake
67 69
 cmake
... ...
@@ -1 +1 @@
1
-2.0.0
1
+2.0.1
... ...
@@ -1 +1 @@
1
-0.9.7
1
+0.9.8
... ...
@@ -1 +1 @@
1
-0.9.7
1
+0.9.8
... ...
@@ -1 +1 @@
1
-0.9.7
1
+0.9.8
... ...
@@ -1 +1 @@
1
-0.14.0
1
+0.14.1
... ...
@@ -1 +1 @@
1
-0.14.0
1
+0.14.1
... ...
@@ -1 +1 @@
1
-0.14.0
1
+0.14.1
... ...
@@ -1 +1 @@
1
-0.14.0
1
+0.14.1
... ...
@@ -5,6 +5,7 @@ if( MULLE_TRACE_INCLUDE)
5 5
    message( STATUS "# Include \"${CMAKE_CURRENT_LIST_FILE}\"" )
6 6
 endif()
7 7
 
8
+# sourcetree: MULLE_C11;no-all-load,no-cmakeinherit,no-link,no-recurse,no-singlephase;
8 9
 if( NOT MULLE_C11_HEADER)
9 10
    find_file( MULLE_C11_HEADER NAMES mulle-c11/mulle-c11.h mulle-c11.h)
10 11
    message( STATUS "MULLE_C11_HEADER is ${MULLE_C11_HEADER}")
... ...
@@ -19,47 +20,7 @@ if( NOT MULLE_C11_HEADER)
19 20
       CACHE INTERNAL "need to cache this"
20 21
    )
21 22
    if( MULLE_C11_HEADER)
22
-      #
23
-      # Inherit ObjC loader and link dependency info.
24
-      # Disable with: `mark no-cmakeinherit`
25
-      #
26
-      get_filename_component( _TMP_MULLE_C11_ROOT "${MULLE_C11_HEADER}" DIRECTORY)
27
-      get_filename_component( _TMP_MULLE_C11_NAME "${_TMP_MULLE_C11_ROOT}" NAME)
28
-      get_filename_component( _TMP_MULLE_C11_ROOT "${_TMP_MULLE_C11_ROOT}" DIRECTORY)
29
-      get_filename_component( _TMP_MULLE_C11_ROOT "${_TMP_MULLE_C11_ROOT}" DIRECTORY)
30
-      #
31
-      # Search for "DependenciesAndLibraries.cmake" to include.
32
-      # Disable with: `mark no-cmakedependency`
33
-      #
34
-      foreach( _TMP_MULLE_C11_NAME IN LISTS _TMP_MULLE_C11_NAME)
35
-         set( _TMP_MULLE_C11_DIR "${_TMP_MULLE_C11_ROOT}/include/${_TMP_MULLE_C11_NAME}/cmake")
36
-         # use explicit path to avoid "surprises"
37
-         if( EXISTS "${_TMP_MULLE_C11_DIR}/DependenciesAndLibraries.cmake")
38
-            unset( MULLE_C11_DEFINITIONS)
39
-            list( INSERT CMAKE_MODULE_PATH 0 "${_TMP_MULLE_C11_DIR}")
40
-            # we only want top level INHERIT_OBJC_LOADERS, so disable them
41
-            if( NOT NO_INHERIT_OBJC_LOADERS)
42
-               set( NO_INHERIT_OBJC_LOADERS OFF)
43
-            endif()
44
-            list( APPEND _TMP_INHERIT_OBJC_LOADERS ${NO_INHERIT_OBJC_LOADERS})
45
-            set( NO_INHERIT_OBJC_LOADERS ON)
46
-            #
47
-            include( "${_TMP_MULLE_C11_DIR}/DependenciesAndLibraries.cmake")
48
-            #
49
-            list( GET _TMP_INHERIT_OBJC_LOADERS -1 NO_INHERIT_OBJC_LOADERS)
50
-            list( REMOVE_AT _TMP_INHERIT_OBJC_LOADERS -1)
51
-            #
52
-            list( REMOVE_ITEM CMAKE_MODULE_PATH "${_TMP_MULLE_C11_DIR}")
53
-            set( INHERITED_DEFINITIONS
54
-               ${INHERITED_DEFINITIONS}
55
-               ${MULLE_C11_DEFINITIONS}
56
-               CACHE INTERNAL "need to cache this"
57
-            )
58
-            break()
59
-         else()
60
-            message( STATUS "${_TMP_MULLE_C11_DIR}/DependenciesAndLibraries.cmake not found")
61
-         endif()
62
-      endforeach()
23
+      # intentionally left blank
63 24
    else()
64 25
       message( FATAL_ERROR "MULLE_C11_HEADER was not found")
65 26
    endif()
... ...
@@ -7,7 +7,7 @@ endif()
7 7
 
8 8
 set( INCLUDE_DIRS
9 9
 src
10
-) 
10
+)
11 11
 
12 12
 set( PRIVATE_HEADERS
13 13
 src/include-private.h
... ...
@@ -19,5 +19,5 @@ src/include.h
19 19
 src/mulle-align.h
20 20
 src/mulle-vararg-builder.h
21 21
 src/mulle-vararg.h
22
-) 
22
+)
23 23
 
... ...
@@ -23,15 +23,23 @@ if( NOT __ALL_LOAD_C_CMAKE__)
23 23
          set( BEGIN_ALL_LOAD)
24 24
          set( END_ALL_LOAD)
25 25
       else()
26
-         set( BEGIN_ALL_LOAD "-Wl,--whole-archive")
27
-         set( END_ALL_LOAD "-Wl,--no-whole-archive")
26
+         set( BEGIN_ALL_LOAD "-Wl,--whole-archive -Wl,--no-as-needed")
27
+         set( END_ALL_LOAD "-Wl,--as-needed -Wl,--no-whole-archive")
28 28
          set( FORCE_LOAD_PREFIX)
29 29
       endif()
30 30
    endif()
31 31
 
32
+   #
33
+   # for APPLE we mention the library twice, that's because it happens to
34
+   # be a shared library for some reason, that cmake still picks it up
35
+   # to generate an RPATH
36
+   #
32 37
    function( CreateForceAllLoadList listname outputname)
33 38
       set( list ${BEGIN_ALL_LOAD})
34 39
       foreach( library ${${listname}})
40
+         if( APPLE)
41
+            list( APPEND list "${library}")
42
+         endif()
35 43
          list( APPEND list "${FORCE_LOAD_PREFIX}${library}")
36 44
       endforeach()
37 45
       list( APPEND list ${END_ALL_LOAD})
... ...
@@ -5,9 +5,13 @@ if( NOT __COMPILER_FLAGS_C_CMAKE__)
5 5
       message( STATUS "# Include \"${CMAKE_CURRENT_LIST_FILE}\"" )
6 6
    endif()
7 7
 
8
-   string( TOUPPER "${CMAKE_BUILD_TYPE}" TMP_CONFIGURATION_NAME)
9
-   add_definitions( "-D${TMP_CONFIGURATION_NAME}" )
8
+   if( CMAKE_BUILD_TYPE)
9
+      string( TOUPPER "${CMAKE_BUILD_TYPE}" TMP_CONFIGURATION_NAME)
10
+   else()
11
+      set( TMP_CONFIGURATION_NAME "DEBUG")
12
+   endif()
10 13
 
14
+   add_definitions( "-D${TMP_CONFIGURATION_NAME}" )
11 15
    if( NOT TMP_CONFIGURATION_NAME STREQUAL "DEBUG")
12 16
       add_definitions( "-DNDEBUG" )
13 17
    endif()
... ...
@@ -149,6 +149,18 @@ if( NOT __ENVIRONMENT__CMAKE__)
149 149
       set( LINK_PHASE ON)
150 150
    endif()
151 151
 
152
+   #
153
+   # https://stackoverflow.com/questions/32469953/why-is-cmake-designed-so-that-it-removes-runtime-path-when-installing/32470070#32470070
154
+   # MULLE_NO_CMAKE_INSTALL_RPATH can be used to kill this codepath
155
+   #
156
+   if( NOT MULLE_NO_CMAKE_INSTALL_RPATH)
157
+      if( APPLE)
158
+         set( CMAKE_INSTALL_RPATH "@rpath/../lib")
159
+      else()
160
+         set( CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
161
+      endif()
162
+   endif()
163
+
152 164
    include( EnvironmentAux OPTIONAL)
153 165
 
154 166
 endif()
... ...
@@ -35,7 +35,6 @@ set_property( TARGET "_1_${EXECUTABLE_NAME}" PROPERTY CXX_STANDARD 11)
35 35
 
36 36
 
37 37
 if( LINK_PHASE)
38
-
39 38
    add_executable( "${EXECUTABLE_NAME}"
40 39
       ${ALL_OBJECT_FILES}
41 40
       ${PROJECT_HEADERS}
... ...
@@ -28,10 +28,12 @@ add_library( "${FRAMEWORK_NAME}" SHARED
28 28
 include( FrameworkAux OPTIONAL)
29 29
 
30 30
 if( NOT FRAMEWORK_LIBRARY_LIST)
31
-   ${DEPENDENCY_LIBRARIES}
32
-   ${OPTIONAL_DEPENDENCY_LIBRARIES}
33
-   ${OS_SPECIFIC_LIBRARIES}
34
-)
31
+  set( FRAMEWORK_LIBRARY_LIST
32
+    ${DEPENDENCY_LIBRARIES}
33
+    ${OPTIONAL_DEPENDENCY_LIBRARIES}
34
+    ${OS_SPECIFIC_LIBRARIES}
35
+  )
36
+endif()
35 37
 
36 38
 set( SHARED_LIBRARY_LIST ${FRAMEWORK_LIBRARY_LIST})
37 39
 
... ...
@@ -1,12 +1,17 @@
1 1
 /*
2 2
    This file will be regenerated by `mulle-sde update|monitor`.
3 3
    Edits will be lost.
4
-   Suppress this file with MULLE_SDE_INCLUDE_PRIVATE_FILENAME NONE|DISABLE.
4
+   Suppress this file with MULLE_SOURCETREE_TO_C_PRIVATEINCLUDE_FILE NONE|DISABLE.
5
+*/
6
+/*
7
+   This file will be regenerated by `mulle-sde update|monitor`.
8
+   Edits will be lost.
9
+   Suppress this file with MULLE_SOURCETREE_TO_C_IMPORT_FILE NONE|DISABLE.
5 10
 */
6
-
7 11
 #ifndef _mulle_vararg_include_private_h__
8 12
 #define _mulle_vararg_include_private_h__
9 13
 
10 14
 /* no headers */
11 15
 
12 16
 #endif
17
+
... ...
@@ -1,7 +1,12 @@
1 1
 /*
2
-*   This file will be regenerated by `mulle-sde update|monitor`.
3
-* Edits will be lost.
4
-* Suppress this file with MULLE_SDE_INCLUDE_FILENAME NONE|DISABLE.
2
+   This file will be regenerated by `mulle-sde update|monitor`.
3
+   Edits will be lost.
4
+   Suppress this file with MULLE_SOURCETREE_TO_C_INCLUDE_FILE NONE|DISABLE.
5
+*/
6
+/*
7
+   This file will be regenerated by `mulle-sde update|monitor`.
8
+   Edits will be lost.
9
+   Suppress this file with MULLE_SOURCETREE_TO_C_INCLUDE_FILE NONE|DISABLE.
5 10
 */
6 11
 
7 12
 #ifndef _mulle_vararg_include_h__
... ...
@@ -10,3 +15,4 @@
10 15
 # include <mulle-c11/mulle-c11.h>   // mulle-c11
11 16
 
12 17
 #endif
18
+
13 19
deleted file mode 100644
... ...
@@ -1 +0,0 @@
1
-mulle/wild
... ...
@@ -1,2 +1,5 @@
1
-mulle-vararg;tar;no-all-load,no-import,only-standalone;77CDF113-2FAF-413C-9728-1E2B37A85EC5;${MULLE_VARARG_URL:-https://github.com/mulle-c/mulle-vararg/archive/${MULLE_VARARG_BRANCH:-latest}.tar.gz};;;;
2
-mulle-testallocator;tar;no-all-load,no-import;BAC00DC2-8317-4FE5-AEDB-FD6D4FA5147D;${MULLE_TESTALLOCATOR_URL:-https://github.com/mulle-core/mulle-testallocator/archive/${MULLE_TESTALLOCATOR_BRANCH:-latest}.tar.gz};;;;
1
+mulle-testallocator;tar;no-all-load,no-import,no-singlephase,no-static-link,only-os-darwin;D9B33DB2-9A52-4152-9174-67DC61FF2507;${MULLE_TESTALLOCATOR_URL:-https://github.com/mulle-core/mulle-testallocator/archive/${MULLE_TESTALLOCATOR_BRANCH:-latest}.tar.gz};;;;
2
+mulle-vararg;tar;no-all-load,no-import,only-standalone;87BBCDDB-CB6C-4A6F-A9E1-0FA425B7349F;${MULLE_VARARG_URL:-https://github.com/mulle-c/mulle-vararg/archive/${MULLE_VARARG_BRANCH:-latest}.tar.gz};;;;
3
+mulle-testallocator#1;tar;no-import,no-os-darwin,no-singlephase,no-static-link;ADBB4A8A-1068-491D-9117-4D3DE9FBC179;${MULLE_TESTALLOCATOR_URL:-https://github.com/mulle-core/mulle-testallocator/archive/${MULLE_TESTALLOCATOR_BRANCH:-latest}.tar.gz};;;;
4
+mulle-allocator;tar;no-all-load,no-import,no-singlephase,no-static-link;833ACE93-8F01-4092-8954-7C698CB4575C;${MULLE_ALLOCATOR_URL:-https://github.com/mulle-c/mulle-allocator/archive/${MULLE_ALLOCATOR_BRANCH:-latest}.tar.gz};;;;
5
+mulle-stacktrace;tar;no-all-load,no-import,no-singlephase;CFD4F448-F4FA-4046-A65B-289FD52B65D7;${MULLE_STACKTRACE_URL:-https://github.com/mulle-core/mulle-stacktrace/archive/${MULLE_STACKTRACE_BRANCH:-latest}.tar.gz};;;;
3 6
deleted file mode 100644
... ...
@@ -1,6 +0,0 @@
1
-#
2
-#
3
-#
4
-export MULLE_SDE_INSTALLED_VERSION="0.32.0"
5
-
6
-
... ...
@@ -18,6 +18,15 @@ then
18 18
                   PATH=/bin:/usr/bin tr 'A-Z' 'a-z'`"
19 19
    export MULLE_UNAME
20 20
 fi
21
+if [ -z "${MULLE_HOSTNAME}" ]
22
+then
23
+   MULLE_HOSTNAME="`PATH=/bin:/usr/bin:/sbin:/usr/sbin hostname -s`"
24
+   if [ "t" = '.' ]
25
+   then
26
+      MULLE_HOSTNAME="_terodde"
27
+   fi
28
+   export MULLE_HOSTNAME
29
+fi
21 30
 if [ -z "${MULLE_VIRTUAL_ROOT}" ]
22 31
 then
23 32
    MULLE_VIRTUAL_ROOT="`PATH=/bin:/usr/bin pwd -P`"
... ...
@@ -95,12 +104,14 @@ case "${MULLE_SHELL_MODE}" in
95 104
                cat "${MULLE_VIRTUAL_ROOT}/.mulle/share/env/motd"
96 105
             fi
97 106
          fi
98
-      else
99
-         unset NO_MOTD
100 107
       fi
101 108
    ;;
102 109
 esac
103 110
 
111
+# remove some uglies
112
+unset NO_MOTD
113
+unset TRACE
114
+
104 115
 #######
105 116
 ### mulle startup
106 117
 #######
... ...
@@ -80,7 +80,7 @@ _mulle_env_complete()
80 80
       tool)
81 81
          case "$prev" in
82 82
             remove)
83
-               list="`mulle-env -e tool list`"
83
+               list="`mulle-env tool list`"
84 84
                COMPREPLY=( $( compgen -W "${list}" -- "$cur" ) )
85 85
             ;;
86 86
 
... ...
@@ -1 +1,6 @@
1
-
1
+ed
2
+emacs
3
+nano
4
+tar
5
+vi
6
+xargs
... ...
@@ -8,7 +8,6 @@ chgrp
8 8
 chmod
9 9
 chown
10 10
 clear
11
-command
12 11
 cp
13 12
 cut
14 13
 date
... ...
@@ -17,7 +16,6 @@ df
17 16
 dirname
18 17
 dmesg
19 18
 echo
20
-ed
21 19
 egrep
22 20
 env
23 21
 expr
... ...
@@ -52,12 +50,13 @@ stty
52 50
 su
53 51
 sync
54 52
 tail
53
+tee
55 54
 test
55
+touch
56 56
 tr
57 57
 true
58 58
 umount
59 59
 uname
60 60
 uuidgen
61
-vi
62 61
 wc
63 62
 which
... ...
@@ -1 +1 @@
1
-2.0.0
1
+2.0.1
... ...
@@ -1 +1 @@
1
-Mi 12 Dez 2018 14:09:08 CET
1
+Do 10 Jan 2019 00:43:10 CET