MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Amiga: Cleanup build process

Browse source 
1. Run Docker as the current user instead of root,
   removing the need to chown directories.
2. Copy `devilutionx.info` via CMake, removing the need to do it
   manually.
3. Cleanup `prep.sh` somewhat.
This commit is contained in:
Gleb Mazovetskiy 2021-04-01 18:55:40 +01:00 • committed by Anders Jenbo
commit 5986a081c3
4 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
docs/building.md
View file

@ -336,28 +336,18 @@ docker build -f Packaging/amiga/Dockerfile -t devilutionx-amiga .
### Build DevilutionX Amiga binary
~~~ bash
docker run --rm -v "${PWD}:/work" devilutionx-amiga
sudo chown -R "${USER}:" build-amiga
docker run -u "$(id -u "$USER"):$(id -g "$USER")" --rm -v "${PWD}:/work" devilutionx-amiga
~~~
The command above builds DevilutionX in release mode.
For other build options, you can run the container interactively:
~~~ bash
docker run -ti --rm -v "${PWD}:/work" devilutionx-amiga bash
docker run -u "$(id -u "$USER"):$(id -g "$USER")" -ti --rm -v "${PWD}:/work" devilutionx-amiga bash
~~~
See the `CMD` in `Packaging/amiga/Dockerfile` for reference.
### Copy the necessary files
Outside of the Docker container, from the DevilutionX directory, run:
~~~ bash
sudo chown -R "${USER}:" build-amiga
cp Packaging/amiga/devilutionx.info build-amiga/
~~~
To actually start DevilutionX, increase the stack size to 50KiB in Amiga.
You can do this by selecting the DevilutionX icon, then hold right mouse button and
select Icons -> Information in the top menu.