Skip to content

Commit

Permalink
Introduction of new tooling to automatically generate our solus-wallp…
Browse files Browse the repository at this point in the history
…apers.xml.in file.

This tooling, written in Go, will check the backgrounds directory and automatically add supported image types, generate XML, and ensure it is wrapped in the appropriate DOCTYPE info. This tooling enables us to no longer need to hand-edit the XML whenever we add a new background.

Other changes:

- Added "A Colorful Chaos"
- Removed Solus-2016-abstract1-1920x1080.jpg and Solus-2016UltraBlur-1920x1080.jpg
- Removed git-archive-all.sh file, this is now shipped in our (Solus) git package.
- Updated README to be more accurate, including copyright dates.
  • Loading branch information
JoshStrobl committed Feb 1, 2019
1 parent 8a1fd51 commit bed24f8
Show file tree
Hide file tree
Showing 12 changed files with 239 additions and 678 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build/
artwork-*.tar*
tooling/generate-wallpaper
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
SHELL = /bin/bash

build:
pushd tooling && \
go build -o generate-wallpaper && \
popd

gen:
./tooling/generate-wallpaper
38 changes: 24 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,36 @@
artwork
=======
# Solus Artwork

Solus Artwork
## Backgrounds

Solus Artwork contains many backgrounds graciously provided by the community for the purposes of inclusion into Solus. Please see the below listing for the appropriate credits and licensing information:

backgrounds:
- Except when declared otherwise, the majority of the photo images in `backgrounds/` have been kindly provided by John McCormack for inclusion into Solus. We are incredibly grateful for the beautiful images he has provided.
- SolusFresh.png, book.png, and chalk.jpeg were kindly provided by Alejandro Seoane and are available under the main package license, GPL-2.0.
- HermiteCrab2560x1600.jpg is kindly provided by Dirk Hohndel and is available under the CC-BY-3.0 license: https://creativecommons.org/licenses/by/3.0/us/
- `Excl_*.jpg` photographs are copyright (© 2016-2019) of Marius Nester, and are availably exclusively for the Solus project per prior agreement. These may only be distributed as part of the official Solus release medium. All rights reserved.
- `IMG_9656.png` and `IMG_9710.png` © 2018-2019 Reetta Piiroinen. These may only be distributed as part of the official Solus release medium.
- `a-colorful-chaos.jpg` is provided by [Joel Filipe](https://unsplash.com/photos/WjnF1Tp-p3I) and licensed under [Unsplash License](https://unsplash.com/license).
- `matador-rocks.jpg` is provided by Mica Semrick and is licensed [CC-BY-SA-4.0](https://creativecommons.org/licenses/by-sa/4.0/).

The photo images in backgrounds/ have kindly been provided by John McCormack for inclusion into Solus. I'm incredibly grateful for the beautiful images he has provided.
## Branding and Logos

SolusFresh.png, book.jpeg, and chalk.jpeg were kindly provided by Alejandro Seoane and are available under the main package license, GPL-2.0
- Copyright © 2015-2019 Solus Project.
- The contents of `icons/` and the Solus logo itself is Copyright © 2016-2019 Solus Project. All Rights Reserved.

HermiteCrab2560x1600.jpg is kindly provided by Dirk Hohndel and is available under the CC BY 3.0 license: https://creativecommons.org/licenses/by/3.0/us/
## Tooling

`Excl_*.jpg` photographs are copyright (© 2016-2018) of Marius Nester, and are availably exclusively for the Solus project per prior agreement. These may only be distributed as part of the official Solus release medium. All rights reserved.
All source code for our wallpaper generators tool, available via `tooling/`, is distributed under GPL-2.0-only.

`matador-rocks.jpg` is provided by Mica Semrick and is licensed [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/).
### Compiling

`IMG_9656.png` and `IMG_9710.png` © 2018 Reetta Piiroinen. These may only be distributed as part of the official Solus release medium.
To compile our wallpaper generators tool, you must have [Go](https://golang.org) installed. If you are using Solus, you can do so by running:

``` bash
sudo eopkg install golang
```

Logo & Branding
----------------
Run `make build` to compile the tool, which will be put into `tooling/generate-wallpaper`

Copyright © 2015-2018 Solus Project.
The Solus logo is Copyright © 2016-2018 Solus Project. All Rights Reserved.
### Usage

To generate a new or updated `solus-wallpapers.xml.in` file, simply run: `make gen`
Binary file removed backgrounds/Solus-2016-abstract1-1920x1080.jpg
Binary file not shown.
Binary file removed backgrounds/Solus-2016UltraBlur-1920x1080.jpg
Binary file not shown.
Binary file added backgrounds/a-colorful-chaos.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 7 additions & 8 deletions backgrounds/meson.build
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# Current wallpaper set

wallpapers = [
'A-Colorful-Chaos.jpg',
'Athlone-Shannon-1920x1080.png',
'BogFlower.jpg',
'book.png',
'BrittasLake.jpg',
'chalk.jpeg',
'Cliffs_of_Moher.png',
'Crags.png',
'Excl_Autumn_Leaf.jpg',
Expand All @@ -20,20 +19,20 @@ wallpapers = [
'IMG_0604-solus.JPG',
'IMG_0608-solus.JPG',
'IMG_0609-solus.JPG',
'IMG_9710.png',
'IMG_9656.png',
'IMG_9710.png',
'LegendaryBarrels.jpg',
'Mama.jpg',
'matador-rocks.jpg',
'Path.jpg',
'PubSide.jpg',
'ShannonClonmacnoise.jpg',
'Solus-2016-abstract1-1920x1080.jpg',
'Solus-2016UltraBlur-1920x1080.jpg',
'SolusFresh.png',
'TulipBee.jpg',
'TullamoreGrandCanal.jpg',
'Twigonometry.jpg',
'book.png',
'chalk.jpeg',
'matador-rocks.jpg',
]

wallpaper_dir = join_paths(path_datadir, 'backgrounds', 'solus')
Expand All @@ -47,7 +46,7 @@ install_data(
cdata = configuration_data()
cdata.set('prefix', path_prefix)

# GNOME/Budgie Wallpaper definition
# Primary Wallpaper Definition
gnome_background_dir = join_paths(path_datadir, 'gnome-background-properties')
configure_file(
input: 'solus-wallpapers.xml.in',
Expand All @@ -59,7 +58,7 @@ configure_file(
# MATE Wallpaper definition
mate_background_dir = join_paths(path_datadir, 'mate-background-properties')
configure_file(
input: 'solus-wallpapers-mate.xml.in',
input: 'solus-wallpapers.xml.in',
output: 'solus-wallpapers-mate.xml',
configuration: cdata,
install_dir: mate_background_dir,
Expand Down
268 changes: 0 additions & 268 deletions backgrounds/solus-wallpapers-mate.xml.in

This file was deleted.

Loading

0 comments on commit bed24f8

Please sign in to comment.