Skip to content

Commit

Permalink
1440 create home directories on startup (#1443)
Browse files Browse the repository at this point in the history
* build: move gamecontrollerdb.txt to controllers directory

* enhancement: create home directories if they don't exist

- After the directories have been decided (data, home, config), create those in the specified HOME directory, if they don't exist
- If they didn't exist, and we had the original contents installed in /usr/share/amiberry/<dir>, copy those over and change permissions. This ensures that the distributed files like the AROS ROMs, the WHDLoad booter and the controllerdb files, are always there in the home dir.

* chore: we no longer need to copy all the directories in the package

Now that we create the home directories on startup, we don't need the empty ones in the package anymore.
Only those that contain something can stay

* build: add stripping of binaries

* chore: ignore .idea folder

* bugfix: WHDLoad booter A1200 config was incorrect

After the additional entries in A1200 configs and models, the booter was set to incorrectly use a config with a Blizzard accelerator. Since that requires a board ROM, which might not be available, it has to change.

Using the default A1200 config instead, and setting Fast RAM to 8MB after that.

* build: install icon in shared location

When preparing the .deb package, the application icon should go in the /usr/share/icons/hicolor/... location, to adhere with established standards

* build: use ~/Amiberry instead of ~/.amiberry

Perhaps it's best to use a non-hidden folder for amiberry directories, make it easier on the users to find it

* refactor: use ~/Amiberry/conf instead of ~/.config/amiberry for config files

* refactor: change desktop file icon reference

Should be possible to use just "amiberry" now, that the icon file is copied in the right location

* chore: fix references to github.com/midwan -> github.com/BlitterStudio

* refactor: move plugins dir to /usr/lib/amiberry in the .deb package

If we are using a system-wide installation, with the .deb package, use /usr/lib/amiberry for plugins.
Check the HOME/Amiberry/plugins next, create it if necessary.
Fallback to the startup directory if that's not available (probably never).

* refactor: only move the abr folder in the destination plugins

When using the .deb package, only the abr folder should be copied in the destination.
Otherwise, we get a plugins directory created there as well

* refactor: Change Kickstarts to Roms

The Kickstarts directory can contain different kind of ROMs, not only kickstarts.
It's best if we rename it accordingly

* build: CPack updates

- Removed unneeded line
- added CPACK_DEBIAN_PACKAGE_ARCHITECTURE
- Added Extended Description
- Fixed description starts with package name

* ci: rename architectures properly

Let's keep the names identical to what dpkg reports

* build: fix some lintian errors

- location of plugins
- section

* build: added copyright and changelog in DEB

* build: fix location of debian files

* build: add copyright notice, fix changelog

* build: changelog should be compressed

* build: extend the description

* build: make the description lines shorter...

* build: description should not be longer than 80 chars

* build: remove timestamp from changelog

Fix another lintian complaint

* build: description again

* bugfix: the plugins dir was not correctly set

* refactor: Updated desktop entry to handle MimeTypes

* build: remove duplicate key in desktop file

* build: add more mimetypes to desktop file
  • Loading branch information
midwan committed Sep 28, 2024
1 parent 2ca9168 commit 40e73ea
Show file tree
Hide file tree
Showing 29 changed files with 318 additions and 664 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ If you haven't already, come find us in one of these platforms:

Bug reporting is an important part of making Amiberry better. If you believe you have found a bug, then please follow these steps:

* **Ensure the bug has not already been reported.** Check the existing Github [Issues](https://github.com/midwan/amiberry/issues).
* **Ensure the bug has not already been reported.** Check the existing Github [Issues](https://github.com/BlitterStudio/amiberry/issues).

* If you're unable to find an open issue that addresses the problem, [open a new one](https://github.com/midwan/amiberry/issues/new).
* If you're unable to find an open issue that addresses the problem, [open a new one](https://github.com/BlitterStudio/amiberry/issues/new).
Be sure to include a **title and clear description**, as much relevant information as possible and **steps to recreate** the problem.

* Please use the relevant **bug report template** to create the issue. It was designed to help you fill in what we need, in order to locate
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
name: amiberry-macOS-64bit-apple-silicon
path: amiberry-${{ github.ref_name }}-macOS-apple-silicon.zip

build-debian-bullseye-x86_64:
build-debian-bullseye-amd64:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -113,10 +113,10 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: amiberry-debian-bullseye-x86_64
name: amiberry-debian-bullseye-amd64
path: amiberry_*.deb

build-debian-bookworm-x86_64:
build-debian-bookworm-amd64:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -133,10 +133,10 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: amiberry-debian-bookworm-x86_64
name: amiberry-debian-bookworm-amd64
path: amiberry_*.deb

build-debian-bookworm-aarch64:
build-debian-bookworm-arm64:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -153,7 +153,7 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: amiberry-debian-bookworm-aarch64
name: amiberry-debian-bookworm-arm64
path: amiberry_*.deb

build-debian-bookworm-armhf:
Expand All @@ -176,7 +176,7 @@ jobs:
name: amiberry-debian-bookworm-armhf
path: amiberry_*.deb

build-debian-bullseye-aarch64:
build-debian-bullseye-arm64:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -193,7 +193,7 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: amiberry-debian-bullseye-aarch64
name: amiberry-debian-bullseye-arm64
path: amiberry_*.deb

build-debian-bullseye-armhf:
Expand All @@ -217,7 +217,7 @@ jobs:
path: amiberry_*.deb

create-release:
needs: [build-macOS-x86_64, build-macOS-Apple-Silicon, build-debian-bookworm-x86_64, build-debian-bookworm-aarch64, build-debian-bookworm-armhf, build-debian-bullseye-x86_64, build-debian-bullseye-aarch64, build-debian-bullseye-armhf]
needs: [build-macOS-x86_64, build-macOS-Apple-Silicon, build-debian-bookworm-amd64, build-debian-bookworm-arm64, build-debian-bookworm-armhf, build-debian-bullseye-amd64, build-debian-bullseye-arm64, build-debian-bullseye-armhf]
runs-on: ubuntu-latest
if: github.ref_type == 'tag' && startsWith(github.ref_name, 'v')
steps:
Expand All @@ -244,15 +244,15 @@ jobs:
artifacts: |
amiberry-macOS-64bit-intel/amiberry-${{ github.ref_name }}-macOS-x86_64.zip
amiberry-macOS-64bit-apple-silicon/amiberry-${{ github.ref_name }}-macOS-apple-silicon.zip
amiberry-debian-bookworm-x86_64/amiberry_*.deb
amiberry-debian-bookworm-aarch64/amiberry_*.deb
amiberry-debian-bookworm-amd64/amiberry_*.deb
amiberry-debian-bookworm-arm64/amiberry_*.deb
amiberry-debian-bookworm-armhf/amiberry_*.deb
amiberry-debian-bullseye-x86_64/amiberry_*.deb
amiberry-debian-bullseye-aarch64/amiberry_*.deb
amiberry-debian-bullseye-amd64/amiberry_*.deb
amiberry-debian-bullseye-arm64/amiberry_*.deb
amiberry-debian-bullseye-armhf/amiberry_*.deb
create-prerelease:
needs: [build-macOS-x86_64, build-macOS-Apple-Silicon, build-debian-bookworm-x86_64, build-debian-bookworm-aarch64, build-debian-bookworm-armhf, build-debian-bullseye-x86_64, build-debian-bullseye-aarch64, build-debian-bullseye-armhf]
needs: [build-macOS-x86_64, build-macOS-Apple-Silicon, build-debian-bookworm-amd64, build-debian-bookworm-arm64, build-debian-bookworm-armhf, build-debian-bullseye-amd64, build-debian-bullseye-arm64, build-debian-bullseye-armhf]
runs-on: ubuntu-latest
if: github.ref_type == 'tag' && startsWith(github.ref_name, 'preview-v')
steps:
Expand Down Expand Up @@ -280,9 +280,9 @@ jobs:
artifacts: |
amiberry-macOS-64bit-intel/amiberry-${{ github.ref_name }}-macOS-x86_64.zip
amiberry-macOS-64bit-apple-silicon/amiberry-${{ github.ref_name }}-macOS-apple-silicon.zip
amiberry-debian-bookworm-x86_64/amiberry_*.deb
amiberry-debian-bookworm-aarch64/amiberry_*.deb
amiberry-debian-bookworm-amd64/amiberry_*.deb
amiberry-debian-bookworm-arm64/amiberry_*.deb
amiberry-debian-bookworm-armhf/amiberry_*.deb
amiberry-debian-bullseye-x86_64/amiberry_*.deb
amiberry-debian-bullseye-aarch64/amiberry_*.deb
amiberry-debian-bullseye-amd64/amiberry_*.deb
amiberry-debian-bullseye-arm64/amiberry_*.deb
amiberry-debian-bullseye-armhf/amiberry_*.deb
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
### Amiberry files ###
conf/*.uae
conf/*.conf
kickstarts/*.rom
kickstarts/*.key
roms/*.rom
roms/*.key
/amiberry*

### VisualGDB ###
Expand Down Expand Up @@ -227,3 +227,4 @@ cmake-build-release-remote-host
cmake-build-debug-opengl
cmake-build-*
_CPack_Packages
.idea
8 changes: 0 additions & 8 deletions .idea/.gitignore

This file was deleted.

Loading

0 comments on commit 40e73ea

Please sign in to comment.