packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build-sys: Add toplevel workspace Cargo.toml 

rust-analyzer is happier with this because it understands
the project structure out of the box.

We aren't actually again adding a dependency on Rust/cargo in the core,
this is only used to make `cargo build` work out of the box to build
the Rust test code.
This commit is contained in:
Colin Walters 2021-04-15 11:13:31 -04:00
parent 36693f064c
commit 46a0911c6d
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml Normal file
View File

@ -0,0 +1,6 @@
# Today, this repository only uses Rust for tests. This
# toplevel Cargo.toml helps tools like rust-analyzer understand
# that this project contains Rust code. We don't otherwise currently
# use `cargo` for any part of the core build.
[workspace]
members = ["tests/inst"]

3
Makefile.am
View File

@ -46,6 +46,9 @@ GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make
# Generated by coreos-assembler build-fast and kola # Generated by coreos-assembler build-fast and kola
GITIGNOREFILES += fastbuild-*.qcow2 _kola_temp/ GITIGNOREFILES += fastbuild-*.qcow2 _kola_temp/
# Rust stuff
GITIGNOREFILES += target/ Cargo.lock
SUBDIRS += . SUBDIRS += .
if ENABLE_GTK_DOC if ENABLE_GTK_DOC

2
tests/inst/.gitignore vendored
View File

@ -1,2 +0,0 @@
target/
Cargo.lock

2
tests/kolainst/Makefile
View File

@ -12,6 +12,6 @@ all:
install: install:
install -D -m 0644 -t $(KOLA_TESTDIR) $(LIBSCRIPTS) install -D -m 0644 -t $(KOLA_TESTDIR) $(LIBSCRIPTS)
for x in $(TESTDIRS); do rsync -rlv ./$${x} $(KOLA_TESTDIR)/; done for x in $(TESTDIRS); do rsync -rlv ./$${x} $(KOLA_TESTDIR)/; done
install -D -m 0755 -t $(KOLA_TESTDIR)/nondestructive-rs ../inst/target/release/ostree-test install -D -m 0755 -t $(KOLA_TESTDIR)/nondestructive-rs ../../target/release/ostree-test
install -D -m 0644 destructive-stamp.ign $(KOLA_TESTDIR)/destructive-rs/config.ign install -D -m 0644 destructive-stamp.ign $(KOLA_TESTDIR)/destructive-rs/config.ign
./install-wrappers.sh destructive-list.txt $(KOLA_TESTDIR)/destructive-rs ./install-wrappers.sh destructive-list.txt $(KOLA_TESTDIR)/destructive-rs