Skip to content

Commit

Permalink
fix dockerfile and README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
mulle-nat committed Dec 28, 2020
1 parent 5c260ca commit ad62a85
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM debian:bullseye-slim
# make it fresh
# add en UTF-8 as a locale
ENV OTHER_PROJECTS \
mulle-sde;mulle-sde-developer; \
mulle-sde/mulle-sde-developer; \
mulle-c/mulle-c-developer; \
mulle-objc/mulle-objc-developer; \
MulleFoundation/mulle-foundation-developer; \
Expand Down
34 changes: 24 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

**foundation-developer** is a collection of *mulle-sde extensions* to support development
with the [MulleFoundation](//github.com/MulleFoundation). You need to install the
compiler [mulle-clang](//github.com/Codeon-GmbH/mulle-clang-project) and the
compiler [mulle-clang](//github.com/Codeon-GmbH/mulle-clang-project) and the
debugger [mulle-gdb](//github.com/Codeon-GmbH/mulle-gdb) separately.

As a package for **homebrew** (OS X) and **apt** (Linux) it is also the most
Expand Down Expand Up @@ -82,9 +82,9 @@ mulle-sde craft

# Install

The initial install will only add *mulle-sde* to your system. The Foundation
itself will be fetched by *mulle-sde*, when you create a new project
(see **Usage** below).
The initial install will only add *mulle-sde* to your system. The Foundation
itself will be fetched by *mulle-sde*, when you create a new project
(see **Usage** above).

There is a variety of installation methods:

Expand All @@ -93,7 +93,6 @@ There is a variety of installation methods:
* **Script**



## Packages

OS | Package manager | Command
Expand Down Expand Up @@ -124,7 +123,7 @@ Package | Comment
apt-get install apt-transport-https gnupg lsb-release sudo wget
```

You need to install the compiler [mulle-clang](//github.com/Codeon-GmbH/mulle-clang-project)
You need to install the compiler [mulle-clang](//github.com/Codeon-GmbH/mulle-clang-project)
and the debugger [mulle-gdb](//github.com/Codeon-GmbH/mulle-gdb) separately.

From here on it's assumed, that sudo is installed. If you don't have *sudo*,
Expand All @@ -136,7 +135,8 @@ edit out the *sudo* from the command lines and run everything as `root`
You can use this one-liner to do all the following steps in one:

```
wget -qO - https://raw.githubusercontent.com/MulleFoundation/foundation-developer/release/bin/apt-installer | sudo sh
wget -qO - https://raw.githubusercontent.com/MulleFoundation/foundation-developer/release/bin/apt-installer \
| sudo sh
```


Expand All @@ -145,13 +145,15 @@ wget -qO - https://raw.githubusercontent.com/MulleFoundation/foundation-develope
Otherwise first add the necessary key to *apt*:

```
wget -qO - "https://www.mulle-kybernetik.com/dists/debian-admin-pub.asc" | sudo apt-key add -
wget -qO - "https://www.mulle-kybernetik.com/dists/debian-admin-pub.asc" \
| sudo apt-key add -
```

#### Add the *apt* repository source list:

```
echo "deb [arch=all] http://www.mulle-kybernetik.com `lsb_release -c -s` main" | sudo tee "/etc/apt/sources.list.d/mulle-kybernetik.com-main.list" > /dev/null
echo "deb [arch=all] http://www.mulle-kybernetik.com `lsb_release -c -s` main" \
| sudo tee "/etc/apt/sources.list.d/mulle-kybernetik.com-main.list" > /dev/null
```

Now you are ready to install *foundation-developer*:
Expand All @@ -161,6 +163,16 @@ sudo apt-get update
sudo apt-get install foundation-developer
```

#### Download and install the mulle-clang compiler

Check the [compiler releases](https://github.com/Codeon-GmbH/mulle-clang-project/releases)
for the proper version to download:

```
curl -L -O "https://github.com/Codeon-GmbH/mulle-clang-project/releases/download/11.0.0.0/mulle-clang-11.0.0.0-bullseye-amd64.deb"
sudo dpkg --install "mulle-clang-11.0.0.0-bullseye-amd64.deb"
```


### Docker

Expand All @@ -171,6 +183,7 @@ sudo docker build -t foundation 'https://raw.githubusercontent.com/MulleFoundati
sudo docker run --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -i -t --rm foundation
```


### Script

*mulle-sde* provides an
Expand All @@ -189,9 +202,10 @@ Prerequisites | Comment
`bsdmainutils` | Needed for `column`. A dependency that should go away...
`less` | Should be optional, but isn't right now

You need to install the compiler [mulle-clang](//github.com/Codeon-GmbH/mulle-clang-project)
You need to install the compiler [mulle-clang](//github.com/Codeon-GmbH/mulle-clang-project)
and the debugger [mulle-gdb](//github.com/Codeon-GmbH/mulle-gdb) separately.


#### Install into /usr/local with sudo

``` sh
Expand Down

0 comments on commit ad62a85

Please sign in to comment.