Skip to content

Commit

Permalink
Add a Meson build system
Browse files Browse the repository at this point in the history
Resolves: flatpak#2241
Signed-off-by: Simon McVittie <[email protected]>
  • Loading branch information
smcv committed Oct 24, 2022
1 parent ad1dc62 commit 9eb824f
Show file tree
Hide file tree
Showing 47 changed files with 2,435 additions and 1 deletion.
18 changes: 18 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,24 @@ EXTRA_DIST += README.md

EXTRA_DIST += flatpak.png

EXTRA_DIST += \
completion/meson.build \
env.d/meson.build \
meson.build \
meson_options.txt \
po/meson.build \
profile/meson.build \
scripts/meson.build \
subprojects/bubblewrap/meson.build \
subprojects/bubblewrap/meson_options.txt \
subprojects/dbus-proxy/meson.build \
subprojects/dbus-proxy/meson_options.txt \
subprojects/libglnx/meson.build \
subprojects/libglnx/meson_options.txt \
subprojects/libglnx/tests/meson.build \
triggers/meson.build \
$(NULL)

AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-documentation \
--disable-maintainer-mode \
Expand Down
1 change: 1 addition & 0 deletions app/Makefile.am.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ bin_PROGRAMS += \
flatpak \
$(NULL)

EXTRA_DIST += app/meson.build
EXTRA_DIST += app/parse-datetime.y

flatpak_dbus_built_sources = app/flatpak-permission-dbus-generated.c app/flatpak-permission-dbus-generated.h
Expand Down
142 changes: 142 additions & 0 deletions app/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
# Copyright 2022 Collabora Ltd.
# SPDX-License-Identifier: LGPL-2.1-or-later

sources = [
'flatpak-builtins-utils.c',
'flatpak-table-printer.c',
]

parse_datetime = custom_target(
'parse-datetime.c',
input : [
'parse-datetime.y',
],
output : [
'parse-datetime.c',
],
build_by_default : true,
command : [
bison,
'@INPUT@',
'-o', '@OUTPUT@',
],
)

flatpak_permission_gdbus = gnome.gdbus_codegen(
'flatpak-permission-dbus-generated',
sources: [
'../data/org.freedesktop.impl.portal.PermissionStore.xml',
],
interface_prefix : 'org.freedesktop.impl.portal',
namespace : 'XdpDbus',
)

libflatpak_app = static_library(
'libflatpak-app',
sources : sources + [parse_datetime[0]],
dependencies : base_deps + [
appstream_dep,
json_glib_dep,
libglnx_dep,
libostree_dep,
libsystemd_dep,
polkit_agent_dep,
],
include_directories : [
common_include_directories,
include_directories('.'),
],
install : false,
)
libflatpak_app_dep = declare_dependency(
dependencies : [
base_deps,
appstream_dep,
json_glib_dep,
libglnx_dep,
libostree_dep,
libsystemd_dep,
polkit_agent_dep,
],
include_directories : [
common_include_directories,
include_directories('.'),
],
link_with : [
libflatpak_app,
],
)

sources = [
'flatpak-builtins-build-bundle.c',
'flatpak-builtins-build-commit-from.c',
'flatpak-builtins-build-export.c',
'flatpak-builtins-build-finish.c',
'flatpak-builtins-build-import-bundle.c',
'flatpak-builtins-build-init.c',
'flatpak-builtins-build-sign.c',
'flatpak-builtins-build-update-repo.c',
'flatpak-builtins-build.c',
'flatpak-builtins-config.c',
'flatpak-builtins-create-usb.c',
'flatpak-builtins-document-export.c',
'flatpak-builtins-document-info.c',
'flatpak-builtins-document-list.c',
'flatpak-builtins-document-unexport.c',
'flatpak-builtins-enter.c',
'flatpak-builtins-history.c',
'flatpak-builtins-info.c',
'flatpak-builtins-install.c',
'flatpak-builtins-kill.c',
'flatpak-builtins-list.c',
'flatpak-builtins-make-current.c',
'flatpak-builtins-mask.c',
'flatpak-builtins-override.c',
'flatpak-builtins-permission-list.c',
'flatpak-builtins-permission-remove.c',
'flatpak-builtins-permission-reset.c',
'flatpak-builtins-permission-set.c',
'flatpak-builtins-permission-show.c',
'flatpak-builtins-pin.c',
'flatpak-builtins-ps.c',
'flatpak-builtins-remote-add.c',
'flatpak-builtins-remote-delete.c',
'flatpak-builtins-remote-info.c',
'flatpak-builtins-remote-list.c',
'flatpak-builtins-remote-ls.c',
'flatpak-builtins-remote-modify.c',
'flatpak-builtins-repair.c',
'flatpak-builtins-repo.c',
'flatpak-builtins-run.c',
'flatpak-builtins-search.c',
'flatpak-builtins-uninstall.c',
'flatpak-builtins-update.c',
'flatpak-cli-transaction.c',
'flatpak-complete.c',
'flatpak-main.c',
'flatpak-quiet-transaction.c',
]

if build_system_helper
sources += [
'flatpak-polkit-agent-text-listener.c',
]
endif

flatpak_exe = executable(
'flatpak',
dependencies : base_deps + [
appstream_dep,
json_glib_dep,
libflatpak_app_dep,
libflatpak_common_dep,
libflatpak_common_base_dep,
libglnx_dep,
libostree_dep,
libsystemd_dep,
polkit_agent_dep,
],
install : true,
install_dir : get_option('bindir'),
sources : sources + flatpak_gdbus + flatpak_permission_gdbus,
)
1 change: 1 addition & 0 deletions common/Makefile.am.inc
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ common/flatpak-enum-types.c: $(flatpakinclude_HEADERS) common/flatpak-enum-types
common/flatpak-enum-types.c.tmp && mv common/flatpak-enum-types.c.tmp common/flatpak-enum-types.c

EXTRA_DIST += common/flatpak-enum-types.c.template common/flatpak-enum-types.h.template
EXTRA_DIST += common/meson.build

common/flatpak-dbus-generated.c: data/org.freedesktop.Flatpak.xml data/org.freedesktop.Flatpak.Authenticator.xml Makefile
mkdir -p $(builddir)/common
Expand Down
Loading

0 comments on commit 9eb824f

Please sign in to comment.