Browse code

updated mulle-sde and mulle-env files

Nat! authored on 20-01-2019 22:10:37
Showing 23 changed files
... ...
@@ -14,3 +14,7 @@ export MULLE_MATCH_PATH="${PROJECT_SOURCE_DIR}:CMakeLists.txt:cmake"
14 14
 export MULLE_MATCH_IGNORE_PATH=
15 15
 
16 16
 
17
+# tell mulle-sde to keep files protected from read/write changes
18
+export MULLE_SDE_PROTECT_PATH="cmake/share"
19
+
20
+
... ...
@@ -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.1"
44
+export MULLE_SDE_INSTALLED_VERSION="0.35.4"
45 45
 
46 46
 
... ...
@@ -21,7 +21,7 @@ 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" = '.' ]
24
+   if [ "${MULLE_HOSTNAME:0:1}" = '.' ]
25 25
    then
26 26
       MULLE_HOSTNAME="_terodde"
27 27
    fi
... ...
@@ -126,8 +126,9 @@ case "${MULLE_SHELL_MODE}" in
126 126
          alias dependency="mulle-sde dependency"
127 127
          alias environment="mulle-sde environment"
128 128
          alias extension="mulle-sde extension"
129
-         alias fetch="mulle-sde show"
130
-         alias show="mulle-sde find"
129
+         alias fetch="mulle-sde fetch"
130
+         alias show="mulle-sde show"
131
+         alias list="mulle-sde list"
131 132
          alias library="mulle-sde library"
132 133
          alias log="mulle-sde log"
133 134
          alias match="mulle-sde match"
134 135
deleted file mode 100644
... ...
@@ -1,27 +0,0 @@
1
-ed
2
-emacs
3
-nano
4
-vi
5
-xargs
6
-curl
7
-inotifywait
8
-mulle-create-build-motd
9
-ssh
10
-tty
11
-uuidgen
12
-wget
13
-zip
14
-ar
15
-as
16
-cc
17
-clang
18
-diff
19
-gcc
20
-ld
21
-nm
22
-valgrind
23
-vgdb
24
-valgrind.bin
25
-ninja
26
-make
27
-mulle-cmake-graphviz-include
... ...
@@ -1,69 +1,18 @@
1
-
2
-awk
3
-base64
4
-basename
5
-bash
6
-cat
7
-chgrp
8
-chmod
9
-chown
10
-clear
11
-cp
12
-cut
13
-date
14
-dd
15
-df
16
-dirname
17
-dmesg
18
-echo
19
-egrep
20
-env
21
-expr
22
-false
23
-fgrep
24
-find
25
-grep
26
-head
27
-hostname
28
-kill
29
-less
30
-ln
31
-login
32
-ls
33
-mkdir
34
-mknod
35
-more
36
-mount
37
-mudo
38
-mv
39
-ps
40
-pwd
41
-readlink
42
-rm
43
-rmdir
44
-sed
45
-sh
46
-sleep
47
-sort
48
-stat
49
-stty
50
-su
51
-sync
52
-tail
53
-tee
54
-test
55
-touch
56
-tr
57
-true
58
-umount
59
-uname
60
-wc
61
-which
62 1
 column
63
-git
64
-gzip
65
-tar
2
+mulle-cmake-graphviz-include
3
+mulle-create-build-motd
4
+curl;optional
5
+git;optional
6
+gzip;optional
7
+inotifywait;optional
8
+ssh;optional
9
+tar;optional
10
+tty;optional
11
+wget;optional
12
+zip;optional
66 13
 mulle-sourcetree-to-c
67 14
 mulle-match-to-cmake
68 15
 mulle-sourcetree-to-cmake
69 16
 cmake
17
+ninja;optional
18
+make;optional
70 19
new file mode 100644
... ...
@@ -0,0 +1,16 @@
1
+inotifywait;remove
2
+fswatch;optional
3
+ar
4
+as
5
+cc;optional
6
+clang;optional
7
+diff
8
+gcc;optional
9
+install_name_tool
10
+ld
11
+nm
12
+otool
13
+ranlib
14
+xcodebuild
15
+xcrun
16
+sw_vers
0 17
new file mode 100644
... ...
@@ -0,0 +1,9 @@
1
+ar
2
+as
3
+cc;optional
4
+clang;optional
5
+diff
6
+gcc;optional
7
+ld
8
+nm
9
+ranlib
0 10
new file mode 100644
... ...
@@ -0,0 +1,11 @@
1
+ar
2
+as
3
+cc;optional
4
+clang;optional
5
+diff
6
+gcc;optional
7
+ld
8
+nm
9
+valgrind;optional
10
+vgdb;optional
11
+valgrind.bin;optional
... ...
@@ -1 +1 @@
1
-2.0.1
1
+2.0.2
... ...
@@ -1 +1 @@
1
-0.9.8
1
+0.9.9
... ...
@@ -1 +1 @@
1
-0.9.8
1
+0.9.9
... ...
@@ -1 +1 @@
1
-0.9.8
1
+0.9.9
... ...
@@ -1 +1 @@
1
-0.14.1
1
+0.14.6
... ...
@@ -1 +1 @@
1
-0.14.1
1
+0.14.6
... ...
@@ -1 +1 @@
1
-0.14.1
1
+0.14.6
... ...
@@ -1 +1 @@
1
-0.14.1
1
+0.14.6
2 2
deleted file mode 100644
... ...
@@ -1,27 +0,0 @@
1
-#
2
-# The following includes include definitions generated
3
-# during `mulle-sde update`. Don't edit those files. They are
4
-# overwritten frequently.
5
-#
6
-# === MULLE-SDE START ===
7
-
8
-include( _Headers)
9
-include( _Sources)
10
-
11
-# === MULLE-SDE END ===
12
-#
13
-
14
-# add ignored headers back in
15
-set( PUBLIC_HEADERS
16
-"src/_mulle-concurrent-include.h"
17
-${PUBLIC_HEADERS}
18
-)
19
-
20
-set( PRIVATE_HEADERS
21
-"src/_mulle-concurrent-include-private.h"
22
-${PRIVATE_HEADERS}
23
-)
24
-
25
-#
26
-# You can put more source and resource file definitions here.
27
-#
... ...
@@ -7,13 +7,10 @@ if( NOT __COMPILER_FLAGS_C_CMAKE__)
7 7
 
8 8
    if( CMAKE_BUILD_TYPE)
9 9
       string( TOUPPER "${CMAKE_BUILD_TYPE}" TMP_CONFIGURATION_NAME)
10
-   else()
11
-      set( TMP_CONFIGURATION_NAME "DEBUG")
12
-   endif()
13
-
14
-   add_definitions( "-D${TMP_CONFIGURATION_NAME}" )
15
-   if( NOT TMP_CONFIGURATION_NAME STREQUAL "DEBUG")
16
-      add_definitions( "-DNDEBUG" )
10
+      add_definitions( "-D${TMP_CONFIGURATION_NAME}" )
11
+      if( NOT TMP_CONFIGURATION_NAME STREQUAL "DEBUG")
12
+         add_definitions( "-DNDEBUG" )
13
+      endif()
17 14
    endif()
18 15
 
19 16
    set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OTHER_C_FLAGS} ${UNWANTED_C_WARNINGS}")
... ...
@@ -7,7 +7,9 @@ endif()
7 7
 if( NOT __STANDALONE_C_CMAKE__)
8 8
    set( __STANDALONE_C_CMAKE__ ON)
9 9
 
10
-   option( STANDALONE "Create standalone library for debugging" OFF)
10
+   if( NOT DEFINED STANDALONE)
11
+      option( STANDALONE "Create standalone library for debugging" OFF)
12
+   endif()
11 13
 endif()
12 14
 
13 15
 
... ...
@@ -5,7 +5,9 @@ if( NOT __UNWANTED_WARNINGS_C_CMAKE__)
5 5
       message( STATUS "# Include \"${CMAKE_CURRENT_LIST_FILE}\"" )
6 6
    endif()
7 7
 
8
-   option( UNWANTED_WARNINGS "Turn off some unwanted compiler warnings" ON)
8
+   if( NOT DEFINED UNWANTED_WARNINGS)
9
+      option( UNWANTED_WARNINGS "Turn off some unwanted compiler warnings" ON)
10
+   endif()
9 11
 
10 12
    if( UNWANTED_WARNINGS)
11 13
       #
... ...
@@ -21,7 +21,7 @@ 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" = '.' ]
24
+   if [ "${MULLE_HOSTNAME:0:1}" = '.' ]
25 25
    then
26 26
       MULLE_HOSTNAME="_terodde"
27 27
    fi
... ...
@@ -126,8 +126,9 @@ case "${MULLE_SHELL_MODE}" in
126 126
          alias dependency="mulle-sde dependency"
127 127
          alias environment="mulle-sde environment"
128 128
          alias extension="mulle-sde extension"
129
-         alias fetch="mulle-sde show"
130
-         alias show="mulle-sde find"
129
+         alias fetch="mulle-sde fetch"
130
+         alias show="mulle-sde show"
131
+         alias list="mulle-sde list"
131 132
          alias library="mulle-sde library"
132 133
          alias log="mulle-sde log"
133 134
          alias match="mulle-sde match"
... ...
@@ -16,7 +16,9 @@ df
16 16
 dirname
17 17
 dmesg
18 18
 echo
19
+ed;optional
19 20
 egrep
21
+emacs;optional
20 22
 env
21 23
 expr
22 24
 false
... ...
@@ -36,6 +38,7 @@ more
36 38
 mount
37 39
 mudo
38 40
 mv
41
+nano;optional
39 42
 ps
40 43
 pwd
41 44
 readlink
... ...
@@ -58,5 +61,7 @@ true
58 61
 umount
59 62
 uname
60 63
 uuidgen
64
+vi;optional
61 65
 wc
62 66
 which
67
+xargs;optional
... ...
@@ -1 +1 @@
1
-2.0.1
1
+2.0.2