Browse code

Merge github.com:mulle-objc/mulle-vararg

Nat! authored on 19-11-2016 23:29:55
Showing 6 changed files
... ...
@@ -2,21 +2,28 @@
2 2
 *[Bb]uild/
3 3
 .idea/
4 4
 .repos/
5
-xcuserdata/
6 5
 project.xcworkspace/
7 6
 *.old
8 7
 *.exe
9
-.bootstrap.auto/
10
-.bootstrap.local/
11
-dependencies/
12
-mulle-configuration/
8
+*.exe.debug
9
+*.exe.debug.dSYM
10
+xcuserdata/
13 11
 tmp/
14
-research/
15
-addictions/
16
-mulle-tests/
12
+
13
+/.bootstrap.auto/
14
+/.bootstrap.local/
15
+
16
+/addictions/
17
+/dependencies/
18
+
19
+/mulle-configuration
20
+/tests/mulle-tests
21
+/bin/mulle-homebrew
22
+
23
+/research/
17 24
 tests/include/
18 25
 tests/lib/
19
-/bin/mulle-homebrew/
26
+
20 27
 tests/vararg/char/double_char
21 28
 tests/vararg/char/int_char
22 29
 tests/vararg/char/longlong_char
... ...
@@ -39,5 +46,3 @@ tests/vararg/pointer/double_pointer
39 46
 tests/vararg/pointer/int_pointer
40 47
 tests/vararg/pointer/longlong_pointer
41 48
 /tests/mulle-tests/
42
-*.exe.debug
43
-*.exe.debug.dSYM
... ...
@@ -1,13 +1,18 @@
1 1
 # mulle-vararg
2 2
 
3
-[![Build Status](https://travis-ci.org/mulle-objc/mulle-vararg.svg)](https://travis-ci.org/mulle-objc/mulle-vararg)
4
-
5 3
 A variable argument passing scheme written in C (C11). It's an alternative
6 4
 to
7 5
 [stdarg](//en.wikipedia.org/wiki/Stdarg.h) or
8 6
 [varargs](//pubs.opengroup.org/onlinepubs/7908799/xsh/varargs.h.html),
9 7
 but not compatible with either.
10 8
 
9
+
10
+Fork      |  Build Status | Release Version
11
+----------|---------------|-----------------------------------
12
+[Mulle kybernetiK](//github.com/mulle-nat/mulle-vararg) | [![Build Status](https://travis-ci.org/mulle-nat/mulle-vararg.svg?branch=release)](https://travis-ci.org/mulle-nat/mulle-vararg) | ![Mulle kybernetiK tag](https://img.shields.io/github/tag/mulle-nat/mulle-vararg.svg) [![Build Status](https://travis-ci.org/mulle-nat/mulle-vararg.svg?branch=release)](https://travis-ci.org/mulle-nat/mulle-vararg)
13
+[Community](https://github.com/mulle-objc/mulle-vararg/tree/release) | [![Build Status](https://travis-ci.org/mulle-objc/mulle-vararg.svg)](https://travis-ci.org/mulle-objc/mulle-vararg) | ![Community tag](https://img.shields.io/github/tag/mulle-objc/mulle-vararg.svg) [![Build Status](https://travis-ci.org/mulle-objc/mulle-vararg.svg?branch=release)](https://travis-ci.org/mulle-objc/mulle-vararg)
14
+
15
+
11 16
 #### Advantages
12 17
 
13 18
 * Easy to write in C, does not need compiler ABI internals to construct or
... ...
@@ -17,7 +22,7 @@ read. You don't need [libffi](//sourceware.org/libffi/) or some such.
17 22
 
18 23
 #### Disadvantages
19 24
 
20
-* No compiler support - so far :)
25
+* Not compatible with `<stdarg.h>`
21 26
 
22 27
 
23 28
 ## How it works
... ...
@@ -72,15 +77,14 @@ On OS X and Linux you can use [homebrew](//brew.sh), respectively
72 77
 [linuxbrew](//linuxbrew.sh) to install the library:
73 78
 
74 79
 ```
75
-brew tap mulle-kybernetik/software
76
-brew install mulle-vararg
80
+brew install mulle-objc/software/mulle-vararg
77 81
 ```
78 82
 
79 83
 On other platforms you can use **mulle-install** from
80
-[mulle-build](//www.mulle-kybernetik.com/software/git/mulle-build) to install the library:
84
+[mulle-build](//github.com/mulle-nat/mulle-build) to install the library:
81 85
 
82 86
 ```
83
-mulle-install --prefix /usr/local --branch release https://www.mulle-kybernetik.com/repositories/mulle-vararg
87
+mulle-install --prefix /usr/local --branch release https://github.com/mulle-objc/mulle-vararg
84 88
 ```
85 89
 
86 90
 Otherwise read:
... ...
@@ -1,9 +1,23 @@
1
+0.5.13
2
+===
3
+
4
+* merge community release
5
+
6
+
7
+0.5.12
8
+===
9
+
10
+* fix README
11
+
12
+
1 13
 0.5.11
2 14
 ===
15
+
3 16
 * merge fixes for community release
4 17
 
5 18
 0.5.10
6 19
 ===
20
+
7 21
 * fixes for community release
8 22
 
9 23
 0.5.1-0.5.9
10 24
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+repository-info.sh merge=ours
... ...
@@ -68,9 +68,9 @@ brew install mulle-build
68 68
 ### All: Install mulle-build using git
69 69
 
70 70
 ```
71
-git clone https://www.mulle-kybernetik.com/repositories/mulle-bootstrap
71
+git clone https://github.com/mulle-nat/mulle-bootstrap
72 72
 ( cd mulle-bootstrap ; ./install.sh )
73
-git clone https://www.mulle-kybernetik.com/repositories/mulle-build
73
+git clone https://github.com/mulle-nat/mulle-build
74 74
 ( cd mulle-build ; ./install.sh )
75 75
 ```
76 76
 
... ...
@@ -80,7 +80,7 @@ git clone https://www.mulle-kybernetik.com/repositories/mulle-build
80 80
 Grab the latest **mulle-vararg** release and go into the project directory:
81 81
 
82 82
 ```
83
-git clone https://www.mulle-kybernetik.com/repositories/mulle-vararg
83
+git clone https://github.com/mulle-objc/mulle-vararg
84 84
 cd mulle-vararg
85 85
 ```
86 86
 
... ...
@@ -14,7 +14,7 @@
14 14
 //
15 15
 // community version is always even
16 16
 //
17
-#define MULLE_VARARG_VERSION  ((0 << 20) | (5 << 8) | 11)
17
+#define MULLE_VARARG_VERSION  ((0 << 20) | (5 << 8) | 13)
18 18
 
19 19
 
20 20
 /*