Skip to content

Commit

Permalink
Initial meson conversion (part 1)
Browse files Browse the repository at this point in the history
Install the wallpapers with meson along with their background data.
Next step - nuke the icons autotools help

Signed-off-by: Ikey Doherty <[email protected]>
  • Loading branch information
ikeydoherty committed Apr 19, 2018
1 parent fa34562 commit 00ea7d5
Show file tree
Hide file tree
Showing 10 changed files with 424 additions and 93 deletions.
11 changes: 1 addition & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1 @@
Makefile
Makefile.in
aclocal.m4
autom4te.cache/
backgrounds/solus-wallpapers.xml
backgrounds/solus-wallpapers-mate.xml
config.*
configure
install-sh
missing
/build/
13 changes: 0 additions & 13 deletions Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions autogen.sh

This file was deleted.

46 changes: 0 additions & 46 deletions backgrounds/Makefile.am

This file was deleted.

63 changes: 63 additions & 0 deletions backgrounds/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Current wallpaper set

wallpapers = [
'Crags.png',
'Cliffs_of_Moher.png',
'Twigonometry.jpg',
'SolusFresh.png',
'LegendaryBarrels.jpg',
'Excl_Autumn_Leaf.jpg',
'Excl_Lazy_Summer_Leaf.jpg',
'Excl_Lonely_Railway.jpg',
'Excl_Focal_Leaf.jpg',
'Excl_Focal_Spring.jpg',
'Excl_Vintage_Bicycles.jpg',
'Excl_Autumn_Retreat.jpg',
'PubSide.jpg',
'TullamoreGrandCanal.jpg',
'HermiteCrab2560x1600.jpg',
'book.png',
'chalk.jpeg',
'BogFlower.jpg',
'BrittasLake.jpg',
'IMG_0597-solus.JPG',
'IMG_0604-solus.JPG',
'IMG_0608-solus.JPG',
'IMG_0609-solus.JPG',
'Mama.jpg',
'Path.jpg',
'TulipBee.jpg',
'ShannonClonmacnoise.jpg',
'Athlone-Shannon-1920x1080.png',
'Solus-2016-abstract1-1920x1080.jpg',
'Solus-2016UltraBlur-1920x1080.jpg',
]

wallpaper_dir = join_paths(path_datadir, 'backgrounds', 'solus')

install_data(
wallpapers,
install_dir: wallpaper_dir,
)

# Allow configuring the two wallpaper XML files
cdata = configuration_data()
cdata.set('prefix', path_prefix)

# GNOME/Budgie Wallpaper definition
gnome_background_dir = join_paths(path_datadir, 'gnome-background-properties')
configure_file(
input: 'solus-wallpapers.xml.in',
output: 'solus-wallpapers.xml',
configuration: cdata,
install_dir: gnome_background_dir,
)

# MATE Wallpaper definition
mate_background_dir = join_paths(path_datadir, 'mate-background-properties')
configure_file(
input: 'solus-wallpapers-mate.xml.in',
output: 'solus-wallpapers-mate.xml',
configuration: cdata,
install_dir: mate_background_dir,
)
10 changes: 0 additions & 10 deletions configure.ac

This file was deleted.

Empty file added icons/meson.build
Empty file.
31 changes: 31 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
project(
'artwork',
['c'],
version: '18',
license: [
'GPL-2.0',
'CCBY-3.0 ',
'CCBY-SA-4.0',
],
default_options: [
'prefix=/usr',
'sysconfdir=/etc',
],
)

path_prefix = get_option('prefix')
path_datadir = join_paths(path_prefix, get_option('datadir'))

subdir('backgrounds')
subdir('icons')

report = [
' Build configuration:',
' ====================',
'',
' prefix: @0@'.format(path_prefix),
' datadir: @0@'.format(path_datadir),
]

# Output some stuff to validate the build config
message('\n\n\n' + '\n'.join(report) + '\n\n')
Loading

0 comments on commit 00ea7d5

Please sign in to comment.