Browse code

* make it a C project (to not require CXX)

Nat! authored on 12-10-2017 20:35:27
Showing 9 changed files
... ...
@@ -1,6 +1,7 @@
1 1
 cmake_minimum_required (VERSION 3.0)
2 2
 
3
-project( mulle-bootstrap)
3
+# use C, because otherwise a CXX compiler is required
4
+project( mulle-bootstrap C)
4 5
 
5 6
 #
6 7
 # Primarily used for packaging on Linux
... ...
@@ -16,12 +16,12 @@ set( CPACK_STRIP_FILES false)
16 16
 #
17 17
 # CPackDeb doesn't produce 100% proper debian file unfortunately
18 18
 #
19
-set( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/mulle-objc/${PROJECT_NAME}")
19
+set( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/mulle-nat/${PROJECT_NAME}")
20 20
 # not strictly required
21 21
 #set( CPACK_DEBIAN_PACKAGE_DEPENDS "cmake (>= 3.0.0)")
22 22
 
23 23
 # stuff needed for RPM
24 24
 
25
-set( CPACK_RPM_PACKAGE_VENDOR "mulle-objc community")
25
+set( CPACK_RPM_PACKAGE_VENDOR "Mulle kybernetiK")
26 26
 
27 27
 
... ...
@@ -1,7 +1,7 @@
1 1
 [comment]: <> (DO NOT EDIT THIS FILE. EDIT THE TEMPLATE "templates/README.md.scion")
2 2
 # mulle-bootstrap, cross platform dependency manager using bash
3 3
 
4
-![Last version](https://img.shields.io/github/tag/mulle-objc/mulle-bootstrap.svg)
4
+![Last version](https://img.shields.io/github/tag/mulle-nat/mulle-bootstrap.svg)
5 5
 
6 6
 ... for Linux, OS X, FreeBSD, Windows
7 7
 
... ...
@@ -94,6 +94,6 @@ simplifies shell scripting by an order of magnitude.
94 94
 
95 95
 ## GitHub and Mulle kybernetiK
96 96
 
97
-The development is done on [Mulle kybernetiK](https://www.mulle-kybernetik.com/software/git/mulle-bootstrap/master). Releases and bug-tracking are on [GitHub](https://github.com/mulle-objc/mulle-bootstrap).
97
+The development is done on [Mulle kybernetiK](https://www.mulle-kybernetik.com/software/git/mulle-bootstrap/master). Releases and bug-tracking are on [GitHub](https://github.com/mulle-nat/mulle-bootstrap).
98 98
 
99 99
 
... ...
@@ -347,7 +347,7 @@ The "trick" is to use parameterized branches and urls like so:
347 347
 $ cat .bootstrap/repositories
348 348
 ${MULLE_REPOSITORIES}/mulle-c11;;${MULLE_C11_BRANCH:-release}
349 349
 $ cat .bootstrap/MULLE_REPOSITORIES
350
-https://github.com/mulle-objc
350
+https://github.com/mulle-nat
351 351
 ```
352 352
 
353 353
 This works for the release part. Locally though in the non-committed
... ...
@@ -20,7 +20,7 @@ Here is an example, that installs **mulle-bootstrap** into /tmp:
20 20
 If you have brew you can get the latest released version with
21 21
 
22 22
 ```console
23
-brew install mulle-objc/software/mulle-bootstrap
23
+brew install mulle-kybernetik/software/mulle-bootstrap
24 24
 ```
25 25
 
26 26
 ### Linux/: Install with apt-get
... ...
@@ -30,10 +30,10 @@ Run with sudo:
30 30
 ```
31 31
 sudo -s
32 32
 
33
-curl -sS "https://www.mulle-kybernetik.com/mulle-objc-dists/admin-pub.asc" | apt-key add -
33
+curl -sS "https://www.mulle-kybernetik.com/dists/admin-pub.asc" | apt-key add -
34 34
 
35
-echo "deb [arch=all] http://mulle-objc.mulle-kybernetik.com `lsb_release -c -s` main" \
36
-> "/etc/apt/sources.list.d/mulle-objc.mulle-kybernetik.com.list"
35
+echo "deb [arch=all] http://www.mulle-kybernetik.com `lsb_release -c -s` main" \
36
+> "/etc/apt/sources.list.d/mulle-nat.mulle-kybernetik.com.list"
37 37
 
38 38
 apt-get update
39 39
 apt-get -y --allow-unauthenticated install mulle-bootstrap
... ...
@@ -1,7 +1,7 @@
1 1
 [comment]: <> (DO NOT EDIT THIS FILE. EDIT THE TEMPLATE "templates/dox/mulle-brew/README.md.scion")
2 2
 # mulle-brew, C/C++/Objective-C developer sandboxing with homebrew
3 3
 
4
-![Last version](https://img.shields.io/github/tag/mulle-objc/mulle-bootstrap.svg)
4
+![Last version](https://img.shields.io/github/tag/mulle-nat/mulle-bootstrap.svg)
5 5
 
6 6
 [Homebrew](//brew.sh) is the de facto standard package manager of OS X. It is also
7 7
 available on Linux as [Linuxbrew](linuxbrew.sh).
... ...
@@ -23,7 +23,7 @@ By default homebrew installs packages system-wide into '/usr/local/' (on OS X).
23 23
 Install mulle-brew with brew, it makes sense :) :
24 24
 
25 25
 ```
26
-brew install mulle-objc/software/mulle-brew
26
+brew install mulle-kybernetik/software/mulle-brew
27 27
 ```
28 28
 
29 29
 ## Install and run hello world using **mulle-brew**
... ...
@@ -212,6 +212,6 @@ mulle-brew config -u "clone_cache" "${HOME}/Library/Caches/mulle-brew"
212 212
 
213 213
 ## GitHub and Mulle kybernetiK
214 214
 
215
-The development is done on [Mulle kybernetiK](https://www.mulle-kybernetik.com/software/git/mulle-bootstrap/master). Releases and bug-tracking are on [GitHub](https://github.com/mulle-objc/mulle-bootstrap).
215
+The development is done on [Mulle kybernetiK](https://www.mulle-kybernetik.com/software/git/mulle-bootstrap/master). Releases and bug-tracking are on [GitHub](https://github.com/mulle-nat/mulle-bootstrap).
216 216
 
217 217
 
... ...
@@ -16,11 +16,11 @@ know about this dependency, as you will see shortly:
16 16
 
17 17
 You initialize your repository with `mulle-bootstrap init`, which will
18 18
 create the `.bootstrap` folder for you. Then you place the dependency URL
19
-`https://github.com/mulle-objc/Foobie` into the file `.bootstrap/repositories`.
19
+`https://github.com/mulle-nat/Foobie` into the file `.bootstrap/repositories`.
20 20
 
21 21
 ```console
22 22
 mulle-bootstrap init -n
23
-echo "https://github.com/mulle-objc/Foobie" > .bootstrap/repositories
23
+echo "https://github.com/mulle-nat/Foobie" > .bootstrap/repositories
24 24
 ```
25 25
 
26 26
 You also notice that "Foobie" can be built with either **cmake** or
... ...
@@ -50,7 +50,7 @@ and your `.bootstrap` folder. The preference is for `.bootstrap.local`
50 50
 contents. But since there is no `.bootstap.local` here, `.bootstrap.auto` is a
51 51
 simple copy of `.bootstrap`.
52 52
 
53
-> Ref: [`bootstrap_auto_create`](https://github.com/mulle-objc/mulle-bootstrap/blob/release/src/mulle-bootstrap-auto-update.sh#L214)
53
+> Ref: [`bootstrap_auto_create`](https://github.com/mulle-nat/mulle-bootstrap/blob/release/src/mulle-bootstrap-auto-update.sh#L214)
54 54
 
55 55
 From now `.bootstrap` is no longer used.
56 56
 
... ...
@@ -74,7 +74,7 @@ its own dependencies.
74 74
 Also **mulle-bootstrap** created  (new in 3.0) a `.bootstrap.repos` folder. It
75 75
 memorizes the place, where repositories have been fetched too.
76 76
 
77
-> Ref: [`clone_repositories`](https://github.com/mulle-objc/mulle-bootstrap/blob/release/src/mulle-bootstrap-fetch.sh#L792)
77
+> Ref: [`clone_repositories`](https://github.com/mulle-nat/mulle-bootstrap/blob/release/src/mulle-bootstrap-fetch.sh#L792)
78 78
 
79 79
 
80 80
 ### 3. Refresh
... ...
@@ -88,7 +88,7 @@ The refresh pass now picks up the `repositories` information from the
88 88
 Since Foobie depends on Noobie, it has been properly sorted on top of it.
89 89
 
90 90
 
91
-> Ref: [`refresh_repositories`](https://github.com/mulle-objc/mulle-bootstrap/blob/release/src/mulle-bootstrap-refresh.sh#L447)
91
+> Ref: [`refresh_repositories`](https://github.com/mulle-nat/mulle-bootstrap/blob/release/src/mulle-bootstrap-refresh.sh#L447)
92 92
 
93 93
 
94 94
 ### 4. Fetch
... ...
@@ -30,8 +30,8 @@
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 #
32 32
 MULLE_EXECUTABLE_VERSION_MAJOR=3
33
-MULLE_EXECUTABLE_VERSION_MINOR=13
34
-MULLE_EXECUTABLE_VERSION_PATCH=6
33
+MULLE_EXECUTABLE_VERSION_MINOR=14
34
+MULLE_EXECUTABLE_VERSION_PATCH=0
35 35
 
36 36
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
37 37
 
... ...
@@ -29,10 +29,10 @@ Run with sudo:
29 29
 ```
30 30
 sudo -s
31 31
 
32
-curl -sS "{{PUBLISHER_DEBIAN_GPG_URL}}" | apt-key add -
32
+curl -sS "https://{{PUBLISHER_DEBIAN_GPG_PATH}}" | apt-key add -
33 33
 
34
-echo "deb [arch=all] http://{{PUBLISHER_DEBIAN_SOURCE}} `lsb_release -c -s` main" \
35
-> "/etc/apt/sources.list.d/{{PUBLISHER_DEBIAN_SOURCE}}.list"
34
+echo "deb [arch=all] http://{{PUBLISHER_DEBIAN_DISTS_PATH}} `lsb_release -c -s` main" \
35
+> "/etc/apt/sources.list.d/{{PUBLISHER}}.{{PUBLISHER_DOMAIN}}.list"
36 36
 
37 37
 apt-get update
38 38
 apt-get -y --allow-unauthenticated install mulle-bootstrap