Browse code

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

Nat! authored on 10-11-2016 18:17:10
Showing 10 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+MULLE_REPOSITORIES merge=ours
... ...
@@ -1 +1,8 @@
1
-https://github.com/mulle-objc
1
+# Always merge with --no-commit
2
+#
3
+# git reset HEAD .bootstrap/MULLE_REPOSITORIES
4
+# git checkout -- .bootstrap/MULLE_REPOSITORIES
5
+#
6
+# in case upstream tries to clobber it
7
+#
8
+https://github.com/mulle-nat
... ...
@@ -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
44 49
new file mode 100644
... ...
@@ -0,0 +1,32 @@
1
+This is a BSD-3 style license
2
+-----------------------------
3
+
4
+Copyright (c) 2015 Nat! - Mulle kybernetiK
5
+Copyright © 2015 Codeon GmbH.
6
+All rights reserved.
7
+
8
+Redistribution and use in source and binary forms, with or without
9
+modification, are permitted provided that the following conditions are met:
10
+
11
+Redistributions of source code must retain the above copyright notice, this
12
+list of conditions and the following disclaimer.
13
+
14
+Redistributions in binary form must reproduce the above copyright notice,
15
+this list of conditions and the following disclaimer in the documentation
16
+and/or other materials provided with the distribution.
17
+
18
+Neither the name of Mulle kybernetiK nor the names of its contributors
19
+may be used to endorse or promote products derived from this software
20
+without specific prior written permission.
21
+
22
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
23
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
24
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
25
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
26
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
27
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
28
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
29
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
30
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
31
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32
+POSSIBILITY OF SUCH DAMAGE.
... ...
@@ -1,13 +1,16 @@
1 1
 # mulle-vararg
2 2
 
3 3
 A variable argument passing scheme written in C (C11). It's an alternative
4
-to [stdarg](//en.wikipedia.org/wiki/Stdarg.h) or [varargs](//pubs.opengroup.org/onlinepubs/7908799/xsh/varargs.h.html), but not compatible with either.
4
+to
5
+[stdarg](//en.wikipedia.org/wiki/Stdarg.h) or
6
+[varargs](//pubs.opengroup.org/onlinepubs/7908799/xsh/varargs.h.html),
7
+but not compatible with either.
5 8
 
6
-Fork         | Branch  | Version | Build Status 
7
-[Mulle kybernetiK](//github.com/mulle-nat/mulle-vararg)  | release | ![GitHub version](https://badge.fury.io/gh/mulle-nat%2Fmulle-vararg.svg) | [![Build Status](https://travis-ci.org/mulle-nat/mulle-vararg.svg?branch=release)](https://travis-ci.org/mulle-nat/mulle-vararg)
8
-[Community](https://github.com/mulle-objc/mulle-vararg/tree/release)      | release | ![GitHub version](https://badge.fury.io/gh/mulle-objc%2Fmulle-vararg.svg) |  [![Build Status](https://travis-ci.org/mulle-objc/mulle-vararg.svg?branch=release)](https://travis-ci.org/mulle-objc/mulle-vararg)
9
-[Community](//github.com/mulle-objc/mulle-vararg)    | master | current |  [![Build Status](https://travis-ci.org/mulle-objc/mulle-vararg.svg?branch=master)](https://travis-ci.org/mulle-objc/mulle-vararg)
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)
10 14
 
11 15
 
12 16
 #### Advantages
... ...
@@ -65,7 +68,7 @@ no code to create it.
65 68
 
66 69
 ## API
67 70
 
68
-* [API](dox/API_VARARG.md)
71
+* [Vararg](dox/API_VARARG.md)
69 72
 
70 73
 
71 74
 ## Install
... ...
@@ -1,8 +1,20 @@
1
+0.5.12
2
+===
3
+
4
+* fix README
5
+
6
+
7
+0.5.11
8
+===
9
+
10
+* merge fixes for community release
11
+
1 12
 0.5.10
2 13
 ===
14
+
3 15
 * fixes for community release
4 16
 
5
-0.5.1-0.5.8
17
+0.5.1-0.5.9
6 18
 ===
7 19
 
8 20
 * improve release script and documentation
9 21
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+repository-info.sh merge=ours
... ...
@@ -7,7 +7,7 @@
7 7
 
8 8
 PROJECT="MulleVararg"    # requires camel-case
9 9
 DESC="Access variable arguments in struct layout fashion"
10
-DEPENDENCIES='${REMOTEROOTDIR}/software/mulle-c11' # no camel case, will be evaled later!
10
+DEPENDENCIES='${DEPENDENCY_TAP}/mulle-c11' # no camel case, will be evaled later!
11 11
 LANGUAGE=c               # c,cpp, objc
12 12
 
13 13
 #
... ...
@@ -36,6 +36,7 @@ do
36 36
    esac
37 37
 done
38 38
 
39
+
39 40
 #
40 41
 # these can usually be deduced, if you follow the conventions
41 42
 #
... ...
@@ -44,11 +45,7 @@ HEADER="`get_header_from_name "${NAME}"`"
44 45
 VERSIONNAME="`get_versionname_from_project "${PROJECT}"`"
45 46
 VERSION="`get_header_version "${HEADER}" "${VERSIONNAME}"`"
46 47
 
47
-
48
-# --- HOMEBREW FORMULA ---
49
-# Information needed to construct a proper brew formula
50
-#
51
-HOMEPAGE="${REMOTEURL}/${NAME}"
48
+HOMEPAGE="`eval echo "${HOMEPAGE}"`"
52 49
 
53 50
 
54 51
 # --- 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
 :
... ...
@@ -14,7 +14,7 @@
14 14
 //
15 15
 // community version is always even
16 16
 //
17
-#define MULLE_VARARG_VERSION  ((0 << 20) | (5 << 8) | 10)
17
+#define MULLE_VARARG_VERSION  ((0 << 20) | (5 << 8) | 11)
18 18
 
19 19
 
20 20
 /*