Commit f774bd03 authored by Michael Hanselmann's avatar Michael Hanselmann

Build epydoc's module list from Makefile

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 7be85163
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
/config.log /config.log
/config.status /config.status
/configure /configure
/epydoc.conf
/ganeti /ganeti
/stamp-srclinks /stamp-srclinks
/vcs-version /vcs-version
......
...@@ -90,6 +90,7 @@ CLEANFILES = \ ...@@ -90,6 +90,7 @@ CLEANFILES = \
$(addsuffix /*.py[co],$(DIRS)) \ $(addsuffix /*.py[co],$(DIRS)) \
$(all_dirfiles) \ $(all_dirfiles) \
$(PYTHON_BOOTSTRAP) \ $(PYTHON_BOOTSTRAP) \
epydoc.conf \
autotools/replace_vars.sed \ autotools/replace_vars.sed \
daemons/daemon-util \ daemons/daemon-util \
daemons/ensure-dirs \ daemons/ensure-dirs \
...@@ -371,6 +372,7 @@ pkglib_SCRIPTS = \ ...@@ -371,6 +372,7 @@ pkglib_SCRIPTS = \
EXTRA_DIST = \ EXTRA_DIST = \
NEWS \ NEWS \
UPGRADE \ UPGRADE \
epydoc.conf.in \
pylintrc \ pylintrc \
autotools/build-bash-completion \ autotools/build-bash-completion \
autotools/check-python-code \ autotools/check-python-code \
...@@ -623,7 +625,6 @@ man/%.html.in: man/%.rst man/footer.html ...@@ -623,7 +625,6 @@ man/%.html.in: man/%.rst man/footer.html
$(PANDOC) -s -f rst -t html -A man/footer.html $< | \ $(PANDOC) -s -f rst -t html -A man/footer.html $< | \
sed -e 's/\\@/@/g' > $@ sed -e 's/\\@/@/g' > $@
man/%.7: man/%.7.in $(REPLACE_VARS_SED) man/%.7: man/%.7.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@ sed -f $(REPLACE_VARS_SED) < $< > $@
...@@ -633,6 +634,9 @@ man/%.8: man/%.8.in $(REPLACE_VARS_SED) ...@@ -633,6 +634,9 @@ man/%.8: man/%.8.in $(REPLACE_VARS_SED)
man/%.html: man/%.html.in $(REPLACE_VARS_SED) man/%.html: man/%.html.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@ sed -f $(REPLACE_VARS_SED) < $< > $@
epydoc.conf: epydoc.conf.in
sed -e 's#@MODULES@#$(lint_python_code)#g' < $< > $@
vcs-version: vcs-version:
if test -d .git; then \ if test -d .git; then \
git describe > $@; \ git describe > $@; \
......
...@@ -5,7 +5,7 @@ set -e ...@@ -5,7 +5,7 @@ set -e
tmpdir=$(mktemp -d -t gntbuild.XXXXXXXX) tmpdir=$(mktemp -d -t gntbuild.XXXXXXXX)
trap "rm -rf $tmpdir" EXIT trap "rm -rf $tmpdir" EXIT
cp -r daemons scripts lib tools test $tmpdir cp -r autotools daemons scripts lib tools test $tmpdir
mv $tmpdir/lib $tmpdir/ganeti mv $tmpdir/lib $tmpdir/ganeti
cd $tmpdir && GANETI_TEMP_DIR="$tmpdir" "$@" cd $tmpdir && GANETI_TEMP_DIR="$tmpdir" "$@"
...@@ -8,11 +8,10 @@ output: html ...@@ -8,11 +8,10 @@ output: html
# note: the wildcards means the directories should be cleaned up after each # note: the wildcards means the directories should be cleaned up after each
# run, otherwise there will be stale '*c' (compiled) files that will not be # run, otherwise there will be stale '*c' (compiled) files that will not be
# parsable and will break the epydoc run # parsable and will break the epydoc run
modules: ganeti, scripts/gnt-*, daemons/ganeti-confd, daemons/ganeti-masterd, daemons/ganeti-noded, daemons/ganeti-rapi, daemons/ganeti-watcher, daemons/import-export, tools/burnin, tools/cfgshell, tools/cfgupgrade, tools/cfgupgrade12, tools/check-cert-expired, tools/cluster-merge, tools/ganeti-listrunner, tools/lvmstrap, tools/move-instance, tools/sanitize-config, tools/setup-ssh modules: @MODULES@
graph: all graph: all
simple-term: 1 simple-term: 1
docformat: epytext docformat: epytext
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment