diff options
author | Günther Wagner <info@gunibert.de> | 2022-02-01 23:15:04 +0000 |
---|---|---|
committer | Günther Wagner <info@gunibert.de> | 2022-02-01 23:15:04 +0000 |
commit | 19862a6803c35e55be5fb7d15f985e4232dede85 (patch) | |
tree | 7098301dd59632bbd1104bb1369be1df5b4877a3 | |
parent | 02735941f6542f08c7dc549f4998f65a60f13bce (diff) | |
parent | 0087ead617a0cec70441bed99ccb534cbb9bffe8 (diff) | |
download | librest-19862a6803c35e55be5fb7d15f985e4232dede85.tar.gz |
Merge branch 'gwagner/flatpak-demo-build' into 'master'
Flatpak demo build
See merge request GNOME/librest!15
-rw-r--r-- | .gitlab-ci.yml | 18 | ||||
-rw-r--r-- | examples/demo/meson.build | 19 | ||||
-rw-r--r-- | examples/demo/org.gnome.RestDemo.desktop.in | 8 | ||||
-rw-r--r-- | examples/demo/po/meson.build | 2 |
4 files changed, 47 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 847253a..a656e19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,12 @@ +include: + - project: 'gnome/citemplates' + file: 'flatpak/flatpak_ci_initiative.yml' + +variables: + MANIFEST_PATH: 'examples/demo/org.gnome.RestDemo.json' + FLATPAK_MODULE: 'librest-demo' + FLATPAK_BUILD_DIR: build + image: fedora:34 stages: @@ -28,6 +37,15 @@ build-librest: - "_build/meson-logs" - "_build/${CI_JOB_NAME}-report.xml" +build-flatpak: + extends: '.flatpak' + stage: build + before_script: [] + variables: + RUNTIME_REPO: 'https://nightly.gnome.org/gnome-nightly.flatpakrepo' + APP_ID: 'org.gnome.RestDemo' + BUNDLE: 'org.gnome.RestDemo.flatpak' + .gidocgen-build: image: fedora:latest before_script: diff --git a/examples/demo/meson.build b/examples/demo/meson.build index 43d77e9..48bbfa3 100644 --- a/examples/demo/meson.build +++ b/examples/demo/meson.build @@ -1,3 +1,5 @@ +subdir('po') + demo_sources = [ 'demo-main.c', 'demo-window.c', @@ -20,6 +22,23 @@ demo_gresources = gnome.compile_resources( c_name: 'demo' ) +desktop_file = i18n.merge_file( + input: 'org.gnome.RestDemo.desktop.in', + output: 'org.gnome.RestDemo.desktop', + type: 'desktop', + po_dir: 'po', + install: true, + install_dir: get_option('datadir') / 'applications' +) + +desktop_utils = find_program('desktop-file-validate', required: false) +if desktop_utils.found() + test('Validate desktop file', desktop_utils, + args: [desktop_file] + ) +endif + + executable('librest-demo', demo_sources + demo_gresources, dependencies: demo_deps, diff --git a/examples/demo/org.gnome.RestDemo.desktop.in b/examples/demo/org.gnome.RestDemo.desktop.in new file mode 100644 index 0000000..d13722b --- /dev/null +++ b/examples/demo/org.gnome.RestDemo.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Librest Demo +Exec=librest-demo +Keywords=librest; +Terminal=false +Type=Application +Categories=GTK; +StartupNotify=true diff --git a/examples/demo/po/meson.build b/examples/demo/po/meson.build new file mode 100644 index 0000000..48c17f6 --- /dev/null +++ b/examples/demo/po/meson.build @@ -0,0 +1,2 @@ +i18n = import('i18n') +i18n.gettext('librest', preset : 'glib') |