d218f27188
We now have bidirectional calling between Rust and C++, but we are generating two static libraries that we then link together with a tiny C++ `main.cxx`. Let's make another huge leap towards oxdiation by having Rust be the entrypoint. This way cargo natively takes care of linking the internal Rust library, and our C++ internals become the library. In other words, we've now fully inverted from "C app with internal Rust library" to "Rust binary with internal C++ library". In order to make this work though we have to finally kill the C unit tests. But mostly everything covered there is either being converted to Rust, or covered elsewhere anyways. Now as the doc comments in `main.rs` say...this is a bit awkward because all the CLI code is still in C++. Porting stuff to use e.g. `structopt` natively would be a bit of a slog. For now, we basically rely on the fact that the Rust-native CLIs are all hidden commands. Update submodule: libdnf
156 lines
6.0 KiB
Plaintext
156 lines
6.0 KiB
Plaintext
# Copyright (C) 2013 Colin Walters <walters@verbum.org>
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2 of the License, or (at your option) any later version.
|
|
#
|
|
# This library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with this library; if not, write to the
|
|
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
# Boston, MA 02111-1307, USA.
|
|
|
|
noinst_LTLIBRARIES += librpmostreeinternals.la
|
|
|
|
librpmostreeinternals_la_SOURCES = \
|
|
src/app/libmain.cxx \
|
|
src/app/rpmostree-builtins.h \
|
|
src/app/rpmostree-db-builtins.h \
|
|
src/app/rpmostree-compose-builtins.h \
|
|
src/app/rpmostree-builtin-upgrade.cxx \
|
|
src/app/rpmostree-builtin-rollback.cxx \
|
|
src/app/rpmostree-builtin-deploy.cxx \
|
|
src/app/rpmostree-builtin-reload.cxx \
|
|
src/app/rpmostree-builtin-rebase.cxx \
|
|
src/app/rpmostree-builtin-cancel.cxx \
|
|
src/app/rpmostree-builtin-cleanup.cxx \
|
|
src/app/rpmostree-builtin-cliwrap.cxx \
|
|
src/app/rpmostree-builtin-initramfs.cxx \
|
|
src/app/rpmostree-builtin-initramfs-etc.cxx \
|
|
src/app/rpmostree-builtin-livefs.cxx \
|
|
src/app/rpmostree-builtin-usroverlay.cxx \
|
|
src/app/rpmostree-builtin-override.cxx \
|
|
src/app/rpmostree-builtin-refresh-md.cxx \
|
|
src/app/rpmostree-builtin-reset.cxx \
|
|
src/app/rpmostree-pkg-builtins.cxx \
|
|
src/app/rpmostree-builtin-status.cxx \
|
|
src/app/rpmostree-builtin-ex.cxx \
|
|
src/app/rpmostree-builtin-testutils.cxx \
|
|
src/app/rpmostree-builtin-shlib-backend.cxx \
|
|
src/app/rpmostree-builtin-db.cxx \
|
|
src/app/rpmostree-builtin-start-daemon.cxx \
|
|
src/app/rpmostree-builtin-finalize-deployment.cxx \
|
|
src/app/rpmostree-db-builtin-diff.cxx \
|
|
src/app/rpmostree-db-builtin-list.cxx \
|
|
src/app/rpmostree-db-builtin-version.cxx \
|
|
src/app/rpmostree-dbus-helpers.cxx \
|
|
src/app/rpmostree-dbus-helpers.h \
|
|
src/app/rpmostree-override-builtins.h \
|
|
src/app/rpmostree-override-builtins.cxx \
|
|
src/app/rpmostree-libbuiltin.cxx \
|
|
src/app/rpmostree-libbuiltin.h \
|
|
src/app/rpmostree-polkit-agent.cxx \
|
|
src/app/rpmostree-polkit-agent.h \
|
|
src/app/rpmostree-builtin-kargs.cxx \
|
|
src/app/rpmostree-compose-builtin-tree.cxx \
|
|
src/app/rpmostree-composeutil.cxx \
|
|
src/app/rpmostree-composeutil.h \
|
|
src/app/rpmostree-builtin-compose.cxx \
|
|
$(librpmostreed_sources) \
|
|
$(librpmostreepriv_sources) \
|
|
$(NULL)
|
|
|
|
if BUILDOPT_ROJIG
|
|
librpmostreeinternals_la_SOURCES += \
|
|
src/app/rpmostree-ex-builtin-commit2rojig.cxx \
|
|
src/app/rpmostree-ex-builtin-rojig2commit.cxx \
|
|
src/app/rpmostree-compose-builtin-rojig.cxx \
|
|
$(NULL)
|
|
endif
|
|
|
|
nodist_librpmostreeinternals_la_SOURCES = $(dbus_built_sources) $(nodist_librpmostreepriv_sources)
|
|
|
|
rpmostree_common_cflags = -I$(srcdir)/src/app -I$(srcdir)/src/daemon \
|
|
-I$(srcdir)/src/lib -I$(srcdir)/src/libpriv -I$(libglnx_srcpath) \
|
|
-DG_LOG_DOMAIN=\"rpm-ostreed\" \
|
|
-DLIBDIR=\"$(libdir)\" -DPKGLIBDIR=\"$(pkglibdir)\" \
|
|
-I $(top_srcdir)/libdnf -I $(top_srcdir)/libdnf-build \
|
|
$(PKGDEP_RPMOSTREE_CFLAGS) $(PKGDEP_RPMOSTREE_RS_CFLAGS)
|
|
rpmostree_bin_common_cflags = $(rpmostree_common_cflags)
|
|
rpmostree_common_libs = $(CAP_LIBS) libglnx.la librpmostree-1.la librpmostreecxxrs.la $(PKGDEP_RPMOSTREE_RS_LIBS) $(PKGDEP_RPMOSTREE_LIBS) -L$(top_srcdir)/libdnf-build/libdnf -ldnf -lstdc++ -lrt
|
|
|
|
rpmostree_bin_common_libs = librpmostreeinternals.la $(rpmostree_common_libs)
|
|
librpmostreeinternals_la_CFLAGS = $(AM_CFLAGS) $(rpmostree_common_cflags)
|
|
librpmostreeinternals_la_CXXFLAGS = $(AM_CXXFLAGS) $(rpmostree_common_cflags)
|
|
librpmostreeinternals_la_LIBADD = $(rpmostree_common_libs)
|
|
|
|
privdatadir=$(pkglibdir)
|
|
privdata_DATA = src/app/rpm-ostree-0-integration.conf
|
|
|
|
# Propagate automake verbose mode
|
|
cargo_build = $(cargo) build $(if $(subst 0,,$(V)),--verbose,)
|
|
if BUILDOPT_PREBUILT_BINDINGS
|
|
cargo_build += "--offline"
|
|
endif
|
|
|
|
if BUILDOPT_ENABLE_SQLITE_RPMDB_DEFAULT
|
|
cargo_build += --features sqlite-rpmdb-default
|
|
endif
|
|
|
|
if RUST_DEBUG
|
|
cargo_target_dir=debug
|
|
else
|
|
cargo_target_dir=release
|
|
endif
|
|
LIBRPMOSTREE_RUST_SRCS = $(shell find rust/src/ -name '*.rs') Cargo.toml Cargo.lock cbindgen.toml
|
|
# FIXME - build all this code in a rpmostree-sys crate, or just move all the C/C++ build
|
|
# to Rust. Currently this forces build system serialization
|
|
rpm-ostree: Makefile $(LIBRPMOSTREE_RUST_SRCS) librpmostreeinternals.la
|
|
$(cargo_build) $(CARGO_RELEASE_ARGS)
|
|
ln -sfr target/$(cargo_target_dir)/rpm-ostree $@
|
|
EXTRA_DIST += $(LIBRPMOSTREE_RUST_SRCS)
|
|
ALL_LOCAL_HOOKS += rpm-ostree
|
|
CLEANFILES += rpm-ostree
|
|
|
|
# cbindgen + cxx.rs
|
|
binding_generated_sources = rpmostree-rust.h rpmostree-cxxrs.h rpmostree-cxxrs.cxx rust/cxx.h
|
|
if BUILDOPT_PREBUILT_BINDINGS
|
|
# In this case we shipped prebuilt versions in the source tarball
|
|
rpmostree-rust.h:
|
|
ln -sfr rpmostree-rust-prebuilt.h $@
|
|
rpmostree-cxxrs.h:
|
|
ln -sfr rpmostree-cxxrs-prebuilt.h $@
|
|
rpmostree-cxxrs.cxx:
|
|
ln -sfr rpmostree-cxxrs-prebuilt.cxx $@
|
|
rust/cxx.h:
|
|
ln -sfr rust/cxx-prebuilt.h $@
|
|
else
|
|
include Makefile.bindings
|
|
endif
|
|
|
|
noinst_LTLIBRARIES += librpmostreecxxrs.la
|
|
librpmostreecxxrs_la_SOURCES = rpmostree-cxxrs.h rpmostree-cxxrs.cxx
|
|
# Suppress missing-declarations because https://github.com/dtolnay/cxx/issues/590
|
|
librpmostreecxxrs_la_CXXFLAGS = $(AM_CXXFLAGS) $(rpmostree_common_cflags) -Wno-missing-declarations
|
|
librpmostreecxxrs_la_LIBADD = -lstdc++
|
|
GITIGNOREFILES += $(binding_generated_sources)
|
|
BUILT_SOURCES += $(binding_generated_sources)
|
|
|
|
# And install our binary
|
|
install-rpmostree-hook:
|
|
install -d -m 0755 $(DESTDIR)$(bindir)
|
|
install -m 0755 -t $(DESTDIR)$(bindir) target/release/rpm-ostree
|
|
INSTALL_EXEC_HOOKS += install-rpmostree-hook
|
|
|
|
# Wraps `cargo test`. This is always a debug non-release build;
|
|
# the main thing here is we still drop the `target` dir in our build
|
|
# directory, since we nominally support srcdir != builddir.
|
|
rust-test:
|
|
cd $(top_srcdir)/rust && CARGO_TARGET_DIR=@abs_top_builddir@/target cargo test
|
|
.PHONY: rust-test
|