Browse code

default pulls only from github

Nat! authored on 19/10/2016 13:00:11
Showing 6 changed files
... ...
@@ -1 +1 @@
1
-https://github.com/
1
+https://github.com
... ...
@@ -1 +1 @@
1
-https://www.mulle-kybernetik.com/repositories/
1
+https://github.com/mulle-nat
... ...
@@ -1,7 +1,10 @@
1 1
 #
2
-# overide the branches with e.g.
3
-# `echo "master" > .bootstrap.local/MULLE_TESTS_BRANCH`
2
+# override the repositories like so:
3
+#    echo "https://www.mulle-kybernetik.com/repositories" > .bootstrap.local/MULLE_REPOSITORIES
4
+#
5
+# override the branches like so:
6
+#    echo "master" > .bootstrap.local/MULLE_THREAD_BRANCH
4 7
 
5
-${MULLE_REPOSITORIES}mulle-tests;tests/mulle-tests;${MULLE_TESTS_BRANCH:-release}
6
-${MULLE_REPOSITORIES}mulle-homebrew;bin/mulle-homebrew;${MULLE_HOMEBREW_BRANCH:-release}
7
-${MULLE_REPOSITORIES}mulle-configuration;;${MULLE_CONFIGURATION_BRANCH:-release}
8
+${MULLE_REPOSITORIES}/mulle-tests;tests/mulle-tests;${MULLE_TESTS_BRANCH:-release}
9
+${MULLE_REPOSITORIES}/mulle-homebrew;bin/mulle-homebrew;${MULLE_HOMEBREW_BRANCH:-release}
10
+${MULLE_REPOSITORIES}/mulle-configuration;;${MULLE_CONFIGURATION_BRANCH:-release}
... ...
@@ -1,7 +1,10 @@
1 1
 #
2
-# overide the branches with e.g.
3
-# `echo "master" > .bootstrap.local/MULLE_THREAD_BRANCH`
2
+# override the repositories like so:
3
+#    echo "https://www.mulle-kybernetik.com/repositories" > .bootstrap.local/MULLE_REPOSITORIES
4
+#
5
+# override the branches like so:
6
+#    echo "master" > .bootstrap.local/MULLE_THREAD_BRANCH
4 7
 
5
-${MULLE_REPOSITORIES}mulle-thread;;${MULLE_THREAD_BRANCH:-release}
6
-${MULLE_REPOSITORIES}mulle-allocator;;${MULLE_ALLOCATOR_BRANCH:-release}
7
-${MULLE_REPOSITORIES}mulle-aba;;${MULLE_ABA_BRANCH:-release}
8
+${MULLE_REPOSITORIES}/mulle-thread;;${MULLE_THREAD_BRANCH:-release}
9
+${MULLE_REPOSITORIES}/mulle-allocator;;${MULLE_ALLOCATOR_BRANCH:-release}
10
+${MULLE_REPOSITORIES}/mulle-aba;;${MULLE_ABA_BRANCH:-release}
... ...
@@ -1,4 +1,4 @@
1
-1.0.1-1.0.2
1
+1.0.1-1.0.3
2 2
 ===
3 3
 
4 4
 * fix packaging
... ...
@@ -35,7 +35,7 @@
35 35
 #define mulle_concurrent_h__
36 36
 
37 37
 
38
-#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (0 << 8) | 2)
38
+#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (0 << 8) | 3)
39 39
 
40 40
 #include <mulle_thread/mulle_thread.h>
41 41
 #include <mulle_allocator/mulle_allocator.h>