Rename assets folder to screenshots, and improve the build system.

README.md

@@ -8,9 +8,9 @@
 
 * TBA
 
-![episdes_view](./assets/episodes_view.png)
-![shows_view](./assets/shows_view.png)
-![show_widget](./assets/show_widget.png)
+![episdes_view](./screenshots/episodes_view.png)
+![shows_view](./screenshots/shows_view.png)
+![show_widget](./screenshots/show_widget.png)
 
 ## Quick start
 
@@ -112,7 +112,7 @@ There are also some minor tasks tagged with `TODO:` and `FIXME:` in the source c
 
 ```sh
 $ tree -d
-├── assets              # png's used in the README.md
+├── screenshots         # png's used in the README.md
 ├── hammond-data        # Storate related stuff, SQLite, XDG setup, RSS Parser.
 │   ├── migrations      # Diesel SQL migrations.
 │   │   └── ...

configure

@@ -136,9 +136,12 @@ fi
 cat > Makefile <<END
 # Generated by configure; do not edit
 
-all:
+all: rebuild
 	${NINJA} ${NINJA_OPT}
 
+rebuild:
+	rm -f ${builddir}/hammond
+
 install:
 	DESTDIR="\$(DESTDIR)" ${NINJA} ${NINJA_OPT} install
 

hammond-gtk/resources/meson.build

@@ -0,0 +1,4 @@
+# subdir('icons')
+
+install_data('org.gnome.Hammond.desktop', install_dir : datadir + '/applications')
+install_data('org.gnome.Hammond.appdata.xml', install_dir : datadir + '/appdata')

hammond-gtk/resources/org.gnome.Hammond.appdata.xml

@@ -8,12 +8,12 @@
   <summary>GNOME Podcast Client written in Rust</summary>
   <url type="homepage">https://gitlab.gnome.org/alatiera/Hammond</url>
   <description>
-    Hammond is a Fast, Safe and Reliable Gtk+ Podcast client written in Rust
+    Hammond is a Gtk+ Podcast client for the GNOME Desktop written in Rust
   </description>
   <screenshots>
     <screenshot>
-      <image type="source">https://gitlab.gnome.org/alatiera/Hammond/raw/master/assets/podcasts_view.png</image>
-      <image type="source">https://gitlab.gnome.org/alatiera/Hammond/raw/master/assets/podcast_widget.png</image>
+      <image type="source">https://gitlab.gnome.org/alatiera/Hammond/raw/master/screenshots/podcasts_view.png</image>
+      <image type="source">https://gitlab.gnome.org/alatiera/Hammond/raw/master/screenshots/podcast_widget.png</image>
     </screenshot>
   </screenshots>
   <releases>

meson.build

@@ -16,8 +16,9 @@ hammond_version_micro = version_array[2].to_int()
 hammond_prefix = get_option('prefix')
 hammond_bindir = join_paths(hammond_prefix, get_option('bindir'))
 
-install_data('hammond-gtk/resources/org.gnome.Hammond.desktop', install_dir : get_option('datadir') + '/applications')
-install_data('hammond-gtk/resources/org.gnome.Hammond.appdata.xml', install_dir : get_option('datadir') + '/appdata')
+datadir = get_option('datadir')
+icondir = join_paths(datadir, 'icons')
+subdir('hammond-gtk/resources')
 
 cargo = find_program('cargo', required: false)
 gresource = find_program('glib-compile-resources', required: false)
@@ -34,5 +35,4 @@ cargo_release = custom_target('cargo-build',
 
 run_target('release', command: ['scripts/release.sh',
                                 meson.project_name() + '-' + hammond_version
-                               ],
-                                depends: [cargo_release])
+                               ])

org.gnome.Hammond.json

@@ -1,37 +1,37 @@
 {
-    "app-id": "org.gnome.Hammond",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "3.26",
-    "sdk": "org.gnome.Sdk",
-    "sdk-extensions": [
+    "app-id" : "org.gnome.Hammond",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "3.26",
+    "sdk" : "org.gnome.Sdk",
+    "sdk-extensions" : [
         "org.freedesktop.Sdk.Extension.rust-stable"
     ],
-    "command": "hammond",
-    "finish-args": [
+    "command" : "hammond",
+    "finish-args" : [
         "--share=network",
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--talk-name=org.freedesktop.Desktop"
     ],
-    "build-options": {
-        "append-path": "/usr/lib/sdk/rust-stable/bin",
-        "build-args": [
+    "build-options" : {
+        "append-path" : "/usr/lib/sdk/rust-stable/bin",
+        "build-args" : [
             "--share=network"
         ],
-        "env": {
-            "CARGO_HOME": "/run/build/Hammond/cargo"
+        "env" : {
+            "CARGO_HOME" : "/run/build/Hammond/cargo"
         }
     },
-    "modules": [
+    "modules" : [
         {
-            "name": "Hammond",
-            "buildsystem": "meson",
-            "sources": [
+            "name" : "Hammond",
+            "buildsystem" : "meson",
+            "sources" : [
                 {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/alatiera/Hammond.git",
-                    "branch": "master"
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/alatiera/Hammond.git",
+                    "branch" : "master"
                 }
             ]
         }

scripts/cargo.sh

@@ -1,3 +1,5 @@
 #!/bin/sh
 
-cargo build --release -p hammond-gtk && cp $1/target/release/hammond-gtk $2
+export CARGO_HOME=$1/target/cargo-home
+
+cargo build --release -p hammond-gtk && cp $1/target/release/hammond-gtk $2

scripts/release.sh

@@ -18,22 +18,14 @@ cp meson.build $DIST
 cp Hammond.doap $DIST
 cp LICENSE $DIST
 cp README.md $DIST
-cp -rf assets $DIST
+cp -rf screenshots $DIST
 cp -rf scripts $DIST
 
 # cargo vendor
-cargo vendor
 mkdir $DIST/.cargo
-cat <<EOF > $DIST/.cargo/config
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"
-EOF
+cargo vendor > $DIST/.cargo/config
 cp -rf vendor $DIST/
 
 # packaging
 cd $DEST/dist
 tar -cJvf $VERSION.tar.xz $VERSION
-