Browse code

Merge branch 'release' of github.com:mulle-nat/mulle-concurrent

Nat! authored on 10-11-2016 17:57:13
Showing 8 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+MULLE_REPOSITORIES merge=ours
... ...
@@ -1 +1 @@
1
-https://github.com/mulle-objc
1
+https://github.com/mulle-nat
... ...
@@ -2,37 +2,38 @@
2 2
 *~.*
3 3
 *[Bb]uild/
4 4
 .idea/
5
-mulle_mintomic/
5
+*.dSYM/
6
+*.exe
7
+
6 8
 .repos/
7
-xcuserdata/
8
-project.xcworkspace/
9
-mulle-configuration/
10 9
 .bootstrap.auto/
11 10
 .bootstrap.local/
12
-dependencies/
13
-cityhash/
11
+
12
+xcuserdata/
14 13
 old/
15 14
 tmp/
16
-*.dSYM/
17
-*.exe
18
-mulle-tests/
15
+project.xcworkspace/
16
+
17
+/dependencies/
18
+/addictions/
19 19
 /include/
20 20
 /lib/
21
-/addictions/
22
-/bin/mulle-homebrew/
23
-/addictions/
21
+/cityhash/
22
+
23
+/tests/mulle-tests
24
+/bin/mulle-homebrew
25
+/mulle-configuration
26
+
24 27
 /tests/include/
25 28
 /tests/lib/
26 29
 /tests/pointerarray/pointerarray
27 30
 /tests/pointerarray/simple
28 31
 /tests/hashmap/hashmap
29 32
 /tests/hashmap/othersimple
30
-
31
-/tests/mulle-tests/
32 33
 tests/array/example
33 34
 tests/array/pointerarray
34 35
 tests/array/simple
35 36
 tests/hashmap/example
36 37
 tests/array/example.debug
37 38
 tests/hashmap/example.debug
38
-tests/hashmap/hashmap.debug
39 39
\ No newline at end of file
40
+tests/hashmap/hashmap.debug
... ...
@@ -1,3 +1,13 @@
1
+1.1.4
2
+===
3
+
4
+* improve readme, improved packaging
5
+
6
+1.1.3
7
+===
8
+
9
+* merge community fixes
10
+
1 11
 1.1.2
2 12
 ===
3 13
 
4 14
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+repository-info.sh merge=ours
... ...
@@ -1,17 +1,22 @@
1 1
 #! /bin/sh
2
+#
3
+# (c) 2016 Nat! for Mulle kybernetiK
4
+#
5
+# BSD3-License
6
+#
2 7
 
3 8
 PROJECT="MulleConcurrent"    # requires camel-case
4 9
 DESC="Lock- and Wait-free Hashtable (and an Array too) in C"
5
-DEPENDENCIES='${REMOTEROOTDIR}/software/mulle-c11
6
-${REMOTEROOTDIR}/software/mulle-allocator
7
-${REMOTEROOTDIR}/software/mulle-aba
8
-${REMOTEROOTDIR}/software/mulle-thread'  # no camel case, will be evaled later!
10
+DEPENDENCIES='${DEPENDENCY_TAP}/mulle-allocator
11
+${DEPENDENCY_TAP}/mulle-aba
12
+${DEPENDENCY_TAP}/mulle-thread'  # no camel case, will be evaled later!
9 13
 LANGUAGE=c               # c,cpp, objc
10 14
 
11 15
 #
12 16
 # Ideally you don't hafta change anything below this line
13 17
 #
14 18
 # source mulle-homebrew.sh (clumsily)
19
+MULLE_BOOTSTRAP_FAIL_PREFIX="release.sh"
15 20
 
16 21
 . ./bin/repository-info.sh || exit 1
17 22
 . ./bin/mulle-homebrew/mulle-homebrew.sh || exit 1
... ...
@@ -32,6 +37,7 @@ do
32 37
    esac
33 38
 done
34 39
 
40
+
35 41
 #
36 42
 # these can usually be deduced, if you follow the conventions
37 43
 #
... ...
@@ -40,11 +46,7 @@ HEADER="`get_header_from_name "${NAME}"`"
40 46
 VERSIONNAME="`get_versionname_from_project "${PROJECT}"`"
41 47
 VERSION="`get_header_version "${HEADER}" "${VERSIONNAME}"`"
42 48
 
43
-
44
-# --- HOMEBREW FORMULA ---
45
-# Information needed to construct a proper brew formula
46
-#
47
-HOMEPAGE="${REMOTEURL}/${NAME}"
49
+HOMEPAGE="`eval echo "${HOMEPAGE}"`"
48 50
 
49 51
 
50 52
 # --- HOMEBREW TAP ---
... ...
@@ -1,9 +1,18 @@
1 1
 #! /bin/sh
2 2
 
3
-ORIGIN=origin                                    # git repo to push
4
-REMOTEROOTDIR="mulle-objc"
5
-REMOTEHOST="https://github.com"
6
-REMOTEURL="${REMOTEHOST}/${REMOTEROOTDIR}"
7
-ARCHIVEURL='${REMOTEURL}/${NAME}/archive/${VERSION}.tar.gz'  # ARCHIVEURL will be evaled later! keep it in single quotes
3
+# ARCHIVEURL will be evaled later! keep it in single quotes
4
+# where homebrew grabs the archive off
5
+ARCHIVEURL='https://github.com/mulle-objc/${NAME}/archive/${VERSION}.tar.gz'
8 6
 
7
+# written into formula for homebrew, will be evaled
8
+HOMEPAGE='https://github.com/mulle-objc/${NAME}'
9
+
10
+# git remote to push to, usually origin
11
+ORIGIN='origin'
12
+
13
+# base tap for dependencies
14
+DEPENDENCY_TAP='mulle-objc/software'
15
+
16
+
17
+# keep this
9 18
 :
... ...
@@ -37,7 +37,7 @@
37 37
 //
38 38
 // community version is always even
39 39
 //
40
-#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (1 << 8) | 2)
40
+#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (1 << 8) | 4)
41 41
 
42 42
 #include <mulle_thread/mulle_thread.h>
43 43
 #include <mulle_allocator/mulle_allocator.h>