This is an automated email from the ASF dual-hosted git repository.
klueska pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push:
new 0e709d3 Updated 'Makefile.am' to make new CLI build step more
reliable.
0e709d3 is described below
commit 0e709d31a42c0daf5a19c2ffac883a56b761fdfd
Author: Armand Grillet <agril...@mesosphere.io>
AuthorDate: Tue Dec 4 10:12:33 2018 -0500
Updated 'Makefile.am' to make new CLI build step more reliable.
We list the files in 'MESOS_CLI_SRCDIR' when building the new CLI.
We were previously using 'find' and then removing the files in
the virtual environment but this is not enough as we now also
use tools like 'tox' which creates files we do not care about.
To filter more while simplifying the build step, we now use 'git
ls-files' to get a list of the files we need when building. Git
is a dependency of Apache Mesos and the files we have in the
repository are the only ones required to build the CLI,
making this solution simpler yet more future-proof.
Review: https://reviews.apache.org/r/69084/
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5da75d3..df00617 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1758,7 +1758,7 @@ MESOS_CLI_HIDDEN_IMPORTS =
\
$(MESOS_CLI_SRCDIR)/lib/cli/plugins \
-mindepth 1 -maxdepth 1 -type d)))
-mesos: $(shell find $(MESOS_CLI_SRCDIR) | grep -v .virtualenv)
+mesos: $(shell git ls-files $(MESOS_CLI_SRCDIR))
@echo "Building the CLI ..."
VIRTUALENV_DIRECTORY=$(builddir)/.virtualenv \
PYTHON=$(PYTHON_3) \
