Browse code

* refinements for mulle-configuration 3.1

Nat! authored on 18-09-2017 17:40:59
Showing 10 changed files
... ...
@@ -1,23 +1,19 @@
1 1
 language: c
2 2
 
3
-dist: precise
3
+dist: trusty
4 4
 sudo: required
5 5
 
6 6
 addons:
7 7
   apt:
8
-    sources:
9
-      - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3
10 8
     packages:
11 9
       - cmake
12 10
       - cmake-data
13 11
 
14 12
 before_install:
15
-   - sudo mkdir -p /home/linuxbrew
16
-   - sudo chown "$USER" /home/linuxbrew
17
-   - git clone https://github.com/Linuxbrew/brew.git /home/linuxbrew/.linuxbrew
18
-   - PATH="/home/linuxbrew/.linuxbrew/bin:$PATH"
19
-   - brew update
20
-   - brew install mulle-kybernetik/software/mulle-build
13
+   - curl -sS "https://www.mulle-kybernetik.com/dists/admin-pub.asc" | sudo apt-key add -
14
+   - sudo echo "deb [arch=all] http://www.mulle-kybernetik.com `lsb_release -c -s` main" > "/etc/apt/sources.list.d/mulle-kybernetik.com-main.list"
15
+   - sudo apt-get update
16
+   - sudo apt-get -y --allow-unauthenticated install mulle-build
21 17
 
22 18
 script:
23 19
    - mulle-build -vv -V --bootstrap
24 20
new file mode 100644
... ...
@@ -0,0 +1,9 @@
1
+if( NOT __MULLE_VARARG_CMAKE_DEPENDENCIES_TXT__)
2
+   set( __MULLE_VARARG_CMAKE_DEPENDENCIES_TXT__ ON)
3
+
4
+   message( STATUS "# Include mulle-vararg CMakeDependencies.txt")
5
+
6
+   # just here for orthogonality to other libraries
7
+endif()
8
+
9
+
... ...
@@ -1,8 +1,6 @@
1
-cmake_minimum_required (VERSION 3.0)
1
+cmake_minimum_required( VERSION 3.0)
2 2
 
3
-project (mulle-vararg C)
4
-
5
-cmake_policy(SET CMP0054 NEW)
3
+project( mulle-vararg C)
6 4
 
7 5
 set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/mulle-configuration/cmake)
8 6
 message(STATUS "CMAKE_MODULE_PATH is ${CMAKE_MODULE_PATH}")
... ...
@@ -13,26 +11,34 @@ else()
13 11
   include( Release)
14 12
 endif()
15 13
 
14
+
16 15
 include( CMakeSourcesAndHeaders.txt)
16
+include( CMakeDependencies.txt)
17
+
18
+
19
+set( PUBLIC_HEADERS
20
+${HEADERS}
21
+CMakeDependencies.txt
22
+)
17 23
 
18 24
 
19 25
 add_library( mulle_vararg
20 26
 ${SOURCES}
27
+${HEADERS}
21 28
 )
22 29
 
23 30
 
24 31
 set( STANDALONE_BASE_NAME "mulle_vararg")
25 32
 set( STANDALONE_NAME "mulle_vararg_standalone")
26
-
27
-set( TARGET_ALL_LOAD_LIBRARIES
33
+set( STANDALONE_DEFINITIONS ${MULLE_VARARG_DEFINITIONS})
34
+set( STANDALONE_ALL_LOAD_LIBRARIES
28 35
 $<TARGET_FILE:mulle_vararg>
29 36
 ${DEPENDENCY_LIBRARIES}
30 37
 )
31 38
 
32 39
 include( Standalone)
33 40
 
34
-INSTALL( TARGETS  DESTINATION "lib")
35
-INSTALL(TARGETS mulle_vararg mulle_vararg_standalone DESTINATION "lib")
36
-INSTALL(FILES ${HEADERS} DESTINATION "include/mulle_vararg")
41
+INSTALL( TARGETS mulle_vararg mulle_vararg_standalone DESTINATION "lib")
42
+INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION "include/mulle_vararg")
37 43
 
38 44
 
... ...
@@ -1,4 +1,4 @@
1
-[comment]: <> (DO NOT EDIT THIS FILE. EDIT THE TEMPLATE "templates/README.md.scion")
1
+<!-- [comment]: <> (DO NOT EDIT THIS FILE. EDIT THE TEMPLATE "templates/README.md.scion") ->
2 2
 # mulle-vararg
3 3
 
4 4
 A variable argument passing scheme written in C (C11). It's an alternative
... ...
@@ -1,3 +1,7 @@
1
+### 0.5.21
2
+
3
+* refinements for mulle-configuration 3.1
4
+
1 5
 ### 0.5.19
2 6
 
3 7
 * modernized to mulle-configuration 3.0
... ...
@@ -1,4 +1,4 @@
1
-[comment]: <> (DO NOT EDIT THIS FILE. EDIT THE TEMPLATE "templates/dox/BUILD.md.scion")
1
+<!-- [comment]: <> (DO NOT EDIT THIS FILE. EDIT THE TEMPLATE "templates/dox/BUILD.md.scion") ->
2 2
 # How to build mulle-vararg
3 3
 
4 4
 
... ...
@@ -121,7 +121,7 @@
121 121
 				41998A401CB6693400D18DD8 /* generate-dot.sh */,
122 122
 				41998A411CB6693400D18DD8 /* update-all-configurations.sh */,
123 123
 			);
124
-			path = "mulle-configuration";
124
+			path = "mulle-configuration/xcode";
125 125
 			sourceTree = "<group>";
126 126
 		};
127 127
 /* End PBXGroup section */
... ...
@@ -14,7 +14,7 @@
14 14
 //
15 15
 // community version is always even
16 16
 //
17
-#define MULLE_VARARG_VERSION  ((0 << 20) | (5 << 8) | 19)
17
+#define MULLE_VARARG_VERSION  ((0 << 20) | (5 << 8) | 21)
18 18
 
19 19
 
20 20
 /*
21 21
new file mode 100644
... ...
@@ -0,0 +1,2 @@
1
+<!-- [comment]: <> ({{COMMENT}}) ->
2
+{% includes TEMPLATE_FILE %}
0 3
deleted file mode 100644
... ...
@@ -1,2 +0,0 @@
1
-[comment]: <> ({{COMMENT}})
2
-{% includes TEMPLATE_FILE %}