proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-14 13:42:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: fix documentation deployement

Browse Source
This commit is contained in:
Mario Limonciello 2022-08-29 15:33:54 -05:00 committed by Mario Limonciello
parent a56b5b2d36
commit 72f19f2a12
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ci/fwupd_setup_helpers.py
View File

@ -17,7 +17,7 @@ ENDC = "\033[0m"
MINIMUM_MARKDOWN = (3, 3, 3) MINIMUM_MARKDOWN = (3, 3, 3)
# Minimum meson required # Minimum meson required
MINIMUM_MESON = "0.60.0" MINIMUM_MESON = "0.61.0"
def get_possible_profiles(): def get_possible_profiles():

2
contrib/fwupd.spec.in
View File

@ -547,6 +547,8 @@ done
%files devel %files devel
%{_datadir}/gir-1.0/Fwupd-2.0.gir %{_datadir}/gir-1.0/Fwupd-2.0.gir
%{_datadir}/gir-1.0/FwupdPlugin-1.0.gir %{_datadir}/gir-1.0/FwupdPlugin-1.0.gir
%{_datadir}/doc/fwupd/libfwupdplugin
%{_datadir}/doc/fwupd/libfwupd
%{_datadir}/doc/libfwupdplugin %{_datadir}/doc/libfwupdplugin
%{_datadir}/doc/libfwupd %{_datadir}/doc/libfwupd
%{_datadir}/vala/vapi %{_datadir}/vala/vapi

17
docs/meson.build
View File

@ -40,7 +40,7 @@ if gidocgen_dep.found() and docs_python_deps.allowed() and gidocgen_app.found()
], ],
build_by_default: true, build_by_default: true,
install: true, install: true,
install_dir: join_paths(datadir, 'doc'), install_dir: join_paths(datadir, 'doc', 'fwupd'),
) )
custom_target('doc-fwupdplugin', custom_target('doc-fwupdplugin',
@ -66,15 +66,24 @@ if gidocgen_dep.found() and docs_python_deps.allowed() and gidocgen_app.found()
], ],
build_by_default: true, build_by_default: true,
install: true, install: true,
install_dir: join_paths(datadir, 'doc'), install_dir: join_paths(datadir, 'doc', 'fwupd'),
) )
install_data(['index.html', 'hsi.html'], install_data(['index.html', 'hsi.html'],
install_dir : join_paths(datadir, 'doc', 'fwupd') install_dir : join_paths(datadir, 'doc', 'fwupd')
) )
install_data(['urlmap_fwupd.js'], install_data(['urlmap_fwupd.js'],
install_dir: join_paths(datadir, 'doc', 'libfwupd') install_dir: join_paths(datadir, 'doc', 'fwupd', 'libfwupd')
) )
install_data(['urlmap_fwupdplugin.js'], install_data(['urlmap_fwupdplugin.js'],
install_dir: join_paths(datadir, 'doc', 'libfwupdplugin') install_dir: join_paths(datadir, 'doc', 'fwupd', 'libfwupdplugin')
)
#make devhelp work
install_symlink('libfwupd',
install_dir: join_paths(datadir, 'doc',),
pointing_to: join_paths('fwupd', 'libfwupd'),
)
install_symlink('libfwupdplugin',
install_dir: join_paths(datadir, 'doc',),
pointing_to: join_paths('fwupd', 'libfwupdplugin'),
) )
endif endif

2
meson.build
View File

@ -1,7 +1,7 @@
project('fwupd', 'c', project('fwupd', 'c',
version: '1.8.4', version: '1.8.4',
license: 'LGPL-2.1+', license: 'LGPL-2.1+',
meson_version: '>=0.60.0', meson_version: '>=0.61.0',
default_options: ['warning_level=2', 'c_std=c99'], default_options: ['warning_level=2', 'c_std=c99'],
) )

2
snap/snapcraft.yaml
View File

@ -74,7 +74,7 @@ parts:
after: [nettle] after: [nettle]
meson: meson:
plugin: python plugin: python
source: https://github.com/mesonbuild/meson/releases/download/0.60.2/meson-0.60.2.tar.gz source: https://github.com/mesonbuild/meson/releases/download/0.61.0/meson-0.61.0.tar.gz
build-packages: build-packages:
- ninja-build - ninja-build
- python3-distutils-extra - python3-distutils-extra