Browse code

* fix travis.yml

Nat! authored on 27-05-2018 01:19:47
Showing 12 changed files
... ...
@@ -48,12 +48,16 @@ export MULLE_MATCH_FIND_LOCATIONS="${PROJECT_SOURCE_DIR}:CMakeLists.txt:cmake"
48 48
 
49 49
 # By default assume a project has source and a sourcetree
50 50
 # The order should be sourcetree then source
51
-export MULLE_SDE_UPDATE_CALLBACKS="sourcetree:source"
52 51
 
53 52
 
54 53
 #
55 54
 #
56 55
 #
57
-export MULLE_SDE_INSTALLED_VERSION="0.16.3"
56
+export MULLE_SDE_INSTALLED_VERSION="0.18.1"
57
+
58
+
59
+# By default assume a project has source and a sourcetree
60
+# The order should be sourcetree then source
61
+export MULLE_SDE_UPDATE_CALLBACKS="sourcetree:source"
58 62
 
59 63
 
... ...
@@ -132,31 +132,37 @@ create_headers_file()
132 132
 
133 133
    local text_hdr
134 134
 
135
-   if [ "${MULLE_SDE_CMAKE_HEADERS_FILE}" = "NONE" ]
136
-   then
137
-      MULLE_SDE_CMAKE_HEADERS_FILE=""
135
+   case "${MULLE_SDE_CMAKE_HEADERS_FILE}" in
136
+      "DISABLED")
137
+         log_verbose "Header generation disabled by MULLE_SDE_CMAKE_HEADERS_FILE=DISABLED"
138
+      ;;
138 139
 
139
-      text_hdr="# header generation turned off by MULLE_SDE_CMAKE_HEADERS_FILE"
140
-   else
141
-      local categorized_headers
142
-      local text_hdr1
143
-      local text_hdr2
140
+      "NONE")
141
+         text_hdr2="# Header generation disabled by MULLE_SDE_CMAKE_HEADERS_FILE=NONE"
142
+      ;;
144 143
 
145
-      categorized_headers="`rexekutor egrep '^[^;]*HEADERS;' <<< "${categorized_files}"`"
144
+      *)
145
+         local categorized_headers
146
+         local text_hdr1
147
+         local text_hdr2
146 148
 
147
-      text_hdr1="`emit_common_directories "${categorized_headers}" emit_cmake_var INCLUDE_DIRS` "  || return 1
148
-      text_hdr2="`emit_by_category "${categorized_headers}" emit_cmake_var` "  || return 1
149
+         categorized_headers="`rexekutor egrep '^[^;]*HEADERS;' <<< "${categorized_files}"`"
149 150
 
150
-      if [ -z "${text_hdr2}" ]
151
-      then
152
-         text_hdr2="# no headers"
153
-      fi
151
+         text_hdr1="`emit_common_directories "${categorized_headers}" emit_cmake_var INCLUDE_DIRS` "  || return 1
152
+         text_hdr2="`emit_by_category "${categorized_headers}" emit_cmake_var` "  || return 1
154 153
 
155
-      text_hdr="${text_hdr1}
154
+         if [ -z "${text_hdr2}" ]
155
+         then
156
+            text_hdr2="# no headers"
157
+         fi
156 158
 
157
-${text_hdr2}"
158
-   fi
159
-   MULLE_SDE_CMAKE_HEADERS_FILE="${MULLE_SDE_CMAKE_HEADERS_FILE:-cmake/_Headers.cmake}"
159
+         text_hdr="${text_hdr1}
160
+
161
+      ${text_hdr2}"
162
+
163
+         MULLE_SDE_CMAKE_HEADERS_FILE="${MULLE_SDE_CMAKE_HEADERS_FILE:-cmake/_Headers.cmake}"
164
+      ;;
165
+   esac
160 166
 
161 167
    text_hdr="# ${MULLE_SDE_CMAKE_HEADERS_FILE} is generated by \`mulle-sde\`. Edits will be lost.
162 168
 #
... ...
@@ -185,27 +191,33 @@ create_sources_file()
185 191
 
186 192
    local text_src
187 193
 
188
-   if [ "${MULLE_SDE_CMAKE_SOURCES_FILE}" = "NONE" ]
189
-   then
190
-      MULLE_SDE_CMAKE_SOURCES_FILE=""
194
+   case "${MULLE_SDE_CMAKE_SOURCES_FILE}" in
195
+      "DISABLED")
196
+         log_verbose "Source generation disabled by MULLE_SDE_CMAKE_SOURCES_FILE=DISABLED"
197
+      ;;
191 198
 
192
-      text_src="# source generation turned off by MULLE_SDE_CMAKE_SOURCES_FILE"
193
-   else
194
-      local categorized_sources
199
+      "NONE")
200
+         text_hdr2="# Source generation disabled by MULLE_SDE_CMAKE_SOURCES_FILE=NONE"
201
+      ;;
195 202
 
196
-      categorized_sources="`rexekutor egrep -v '^[^;]*HEADERS;' <<< "${categorized_files}"`"
203
+      *)
204
+         local categorized_sources
197 205
 
198
-      text_src="`emit_by_category "${categorized_sources}" emit_cmake_var`"   || return 1
206
+         categorized_sources="`rexekutor egrep -v '^[^;]*HEADERS;' <<< "${categorized_files}"`"
199 207
 
200
-      if [ -z "${text_src}" ]
201
-      then
202
-         #
203
-         # header only libraries are tricky to do portably
204
-         #
205
-         text_src="message( ERROR \" No sources found. \`mulle-sde environment set MULLE_SDE_CMAKE_SOURCES_FILE NONE\`, if this is intentional\")"
206
-      fi
207
-   fi
208
-   MULLE_SDE_CMAKE_SOURCES_FILE="${MULLE_SDE_CMAKE_SOURCES_FILE:-cmake/_Sources.cmake}"
208
+         text_src="`emit_by_category "${categorized_sources}" emit_cmake_var`"   || return 1
209
+
210
+         if [ -z "${text_src}" ]
211
+         then
212
+            #
213
+            # header only libraries are tricky to do portably
214
+            #
215
+            text_src="message( ERROR \" No sources found. \`mulle-sde environment set MULLE_SDE_CMAKE_SOURCES_FILE NONE\`, if this is intentional\")"
216
+         fi
217
+
218
+         MULLE_SDE_CMAKE_SOURCES_FILE="${MULLE_SDE_CMAKE_SOURCES_FILE:-cmake/_Sources.cmake}"
219
+      ;;
220
+   esac
209 221
 
210 222
    text_src="# ${MULLE_SDE_CMAKE_SOURCES_FILE} is generated by \`mulle-sde\`. Edits will be lost.
211 223
 #
... ...
@@ -1 +1 @@
1
-0.4.1
1
+0.4.3
... ...
@@ -1 +1 @@
1
-0.4.1
1
+0.4.3
... ...
@@ -1 +1 @@
1
-0.4.1
1
+0.4.3
... ...
@@ -1 +1 @@
1
-0.6.3
1
+0.6.7
... ...
@@ -1 +1 @@
1
-0.6.3
1
+0.6.7
... ...
@@ -1 +1 @@
1
-0.6.3
1
+0.6.7
... ...
@@ -1 +1 @@
1
-0.6.3
1
+0.6.7
... ...
@@ -5,16 +5,19 @@ sudo: required
5 5
 
6 6
 addons:
7 7
   apt:
8
+    sources:
9
+      - sourceline: 'ppa:george-edison55/cmake-3.x'
10
+
8 11
     packages:
9 12
       - cmake
10 13
       - cmake-data
11 14
 
12 15
 before_install:
13
-   - curl -sS "https://www.mulle-kybernetik.com/dists/admin-pub.asc" | sudo apt-key add -
16
+   - curl -sS "https://www.mulle-kybernetik.com/dists/debian-admin-pub.asc" | sudo apt-key add -
14 17
    - echo "deb [arch=all] http://www.mulle-kybernetik.com `lsb_release -c -s` main" | sudo tee "/etc/apt/sources.list.d/mulle-kybernetik.com-main.list" > /dev/null
15 18
    - sudo apt-get update
16
-   - sudo apt-get -y --allow-unauthenticated install mulle-sde mulle-test
19
+   - sudo apt-get -y install mulle-sde mulle-test
17 20
 
18
-script:
19
-   - mulle-sde craft -vvv project
20
-   - [ -d test ] && mulle-test -vvv
21
+script: |
22
+   mulle-sde -vvv craft
23
+   [ -d test ] && mulle-test -vvv
... ...
@@ -1,3 +1,7 @@
1
+### 2.0.2
2
+
3
+* fix travis.yml
4
+
1 5
 ### 2.0.1
2 6
 
3 7
 * Various small improvements
... ...
@@ -34,7 +34,7 @@
34 34
 #ifndef mulle_concurrent_h__
35 35
 #define mulle_concurrent_h__
36 36
 
37
-#define MULLE_CONCURRENT_VERSION  ((2 << 20) | (0 << 8) | 1)
37
+#define MULLE_CONCURRENT_VERSION  ((2 << 20) | (0 << 8) | 2)
38 38
 
39 39
 #include "dependencies.h"
40 40