From 8898fd6e2f3fcb608b0254130b4bfe7cb97ae037 Mon Sep 17 00:00:00 2001 From: Christopher Davis Date: Mon, 4 Mar 2019 20:09:54 -0500 Subject: [PATCH] build: use build_by_default in cargo-build target build_always_stale is deprecated and build_by_default can be used now that we don't have build.rs. Requires that we list our sources. --- meson.build | 2 ++ podcasts-data/src/meson.build | 19 +++++++++++++++++ podcasts-downloader/src/meson.build | 5 +++++ podcasts-gtk/src/meson.build | 33 ++++++++++++++++++++++++++++- 4 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 podcasts-data/src/meson.build create mode 100644 podcasts-downloader/src/meson.build diff --git a/meson.build b/meson.build index 1ebec4f..140bad4 100644 --- a/meson.build +++ b/meson.build @@ -67,6 +67,8 @@ subdir('podcasts-gtk/resources') cargo_script = find_program('scripts/cargo.sh') test_script = find_program('scripts/test.sh') +subdir('podcasts-data/src') +subdir('podcasts-downloader/src') subdir('podcasts-gtk/src') meson.add_dist_script( diff --git a/podcasts-data/src/meson.build b/podcasts-data/src/meson.build new file mode 100644 index 0000000..fc33b47 --- /dev/null +++ b/podcasts-data/src/meson.build @@ -0,0 +1,19 @@ +data_sources = files( + 'models/episode.rs', + 'models/mod.rs', + 'models/new_episode.rs', + 'models/new_show.rs', + 'models/new_source.rs', + 'models/show.rs', + 'models/source.rs', + 'database.rs', + 'dbqueries.rs', + 'errors.rs', + 'feed.rs', + 'lib.rs', + 'opml.rs', + 'parser.rs', + 'pipeline.rs', + 'schema.rs', + 'utils.rs', +) diff --git a/podcasts-downloader/src/meson.build b/podcasts-downloader/src/meson.build new file mode 100644 index 0000000..120d95a --- /dev/null +++ b/podcasts-downloader/src/meson.build @@ -0,0 +1,5 @@ +downloader_sources = files( + 'downloader.rs', + 'errors.rs', + 'lib.rs' +) diff --git a/podcasts-gtk/src/meson.build b/podcasts-gtk/src/meson.build index edbe8c7..4c02888 100644 --- a/podcasts-gtk/src/meson.build +++ b/podcasts-gtk/src/meson.build @@ -31,8 +31,39 @@ run_command( check: true ) +podcasts_sources = files( + 'stacks/content.rs', + 'stacks/home.rs', + 'stacks/mod.rs', + 'stacks/populated.rs', + 'stacks/show.rs', + 'widgets/aboutdialog.rs', + 'widgets/appnotif.rs', + 'widgets/base_view.rs', + 'widgets/empty.rs', + 'widgets/home_view.rs', + 'widgets/mod.rs', + 'widgets/player.rs', + 'widgets/show.rs', + 'widgets/show_menu.rs', + 'widgets/shows_view.rs', + 'app.rs', + 'headerbar.rs', + 'i18n.rs', + 'main.rs', + 'manager.rs', + 'prefs.rs', + 'settings.rs', + 'utils.rs' +) + cargo_release = custom_target('cargo-build', - build_always_stale: true, + build_by_default: true, + input: [ + data_sources, + downloader_sources, + podcasts_sources, + ], output: ['gnome-podcasts'], install: true, install_dir: podcasts_bindir,