projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
burnin: fix default growth parameter
[ganeti-local]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
6c4b2c6
..
0474980
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-30,7
+30,6
@@
DIRS = \
lib/rapi \
man \
qa \
lib/rapi \
man \
qa \
- qa/hooks \
scripts \
test \
test/data \
scripts \
test \
test/data \
@@
-42,6
+41,7
@@
CLEANFILES = \
doc/*.html \
doc/*.in \
doc/*.pdf \
doc/*.html \
doc/*.in \
doc/*.pdf \
+ $(patsubst %.dot,%.png,$(docdot)) \
doc/rapi-resources.sgml \
doc/examples/ganeti.initd \
doc/examples/ganeti.cron \
doc/rapi-resources.sgml \
doc/examples/ganeti.initd \
doc/examples/ganeti.cron \
@@
-51,7
+51,6
@@
CLEANFILES = \
man/*.[78] \
man/*.in \
qa/*.py[co] \
man/*.[78] \
man/*.in \
qa/*.py[co] \
- qa/hooks/*.py[co] \
test/*.py[co] \
stamp-directories \
$(nodist_pkgpython_PYTHON)
test/*.py[co] \
stamp-directories \
$(nodist_pkgpython_PYTHON)
@@
-68,12
+67,12
@@
pkgpython_PYTHON = \
lib/cmdlib.py \
lib/config.py \
lib/constants.py \
lib/cmdlib.py \
lib/config.py \
lib/constants.py \
+ lib/daemon.py \
lib/errors.py \
lib/http.py \
lib/jqueue.py \
lib/jstore.py \
lib/locking.py \
lib/errors.py \
lib/http.py \
lib/jqueue.py \
lib/jstore.py \
lib/locking.py \
- lib/logger.py \
lib/luxi.py \
lib/mcpu.py \
lib/objects.py \
lib/luxi.py \
lib/mcpu.py \
lib/objects.py \
@@
-94,7
+93,6
@@
hypervisor_PYTHON = \
rapi_PYTHON = \
lib/rapi/__init__.py \
rapi_PYTHON = \
lib/rapi/__init__.py \
- lib/rapi/httperror.py \
lib/rapi/baserlib.py \
lib/rapi/connector.py \
lib/rapi/rlib1.py \
lib/rapi/baserlib.py \
lib/rapi/connector.py \
lib/rapi/rlib1.py \
@@
-108,7
+106,15
@@
docsgml = \
doc/rapi.sgml \
doc/iallocator.sgml
doc/rapi.sgml \
doc/iallocator.sgml
+docrst = \
+ doc/design-2.0.rst \
+ doc/security.rst
+
+docdot = \
+ doc/arch-2.0.dot
+
doc_DATA = \
doc_DATA = \
+ $(patsubst %.rst,%.html,$(docrst)) \
$(patsubst %.sgml,%.html,$(docsgml)) \
$(patsubst %.sgml,%.pdf,$(docsgml))
$(patsubst %.sgml,%.html,$(docsgml)) \
$(patsubst %.sgml,%.pdf,$(docsgml))
@@
-136,13
+142,14
@@
EXTRA_DIST = \
DEVNOTES \
autotools/docbook-wrapper \
devel/upload.in \
DEVNOTES \
autotools/docbook-wrapper \
devel/upload.in \
+ $(docrst) \
+ $(docdot) \
$(docsgml) \
doc/build-rapi-resources-doc \
doc/examples/ganeti.initd.in \
doc/examples/ganeti.cron.in \
doc/examples/dumb-allocator \
$(docsgml) \
doc/build-rapi-resources-doc \
doc/examples/ganeti.initd.in \
doc/examples/ganeti.cron.in \
doc/examples/dumb-allocator \
- qa/hooks/datehook.py \
- qa/hooks/loghook.py \
+ doc/locking.txt \
test/testutils.py \
test/mocks.py \
$(dist_TESTS) \
test/testutils.py \
test/mocks.py \
$(dist_TESTS) \
@@
-150,7
+157,7
@@
EXTRA_DIST = \
man/footer.sgml \
$(mansgml) \
qa/ganeti-qa.py \
man/footer.sgml \
$(mansgml) \
qa/ganeti-qa.py \
- qa/qa-sample.yaml \
+ qa/qa-sample.json \
qa/qa_cluster.py \
qa/qa_config.py \
qa/qa_daemon.py \
qa/qa_cluster.py \
qa/qa_config.py \
qa/qa_daemon.py \
@@
-159,7
+166,6
@@
EXTRA_DIST = \
qa/qa_instance.py \
qa/qa_node.py \
qa/qa_os.py \
qa/qa_instance.py \
qa/qa_node.py \
qa/qa_os.py \
- qa/qa_other.py \
qa/qa_rapi.py \
qa/qa_tags.py \
qa/qa_utils.py
qa/qa_rapi.py \
qa/qa_tags.py \
qa/qa_utils.py
@@
-185,17
+191,19
@@
TEST_FILES = \
test/data/proc_drbd8.txt
dist_TESTS = \
test/data/proc_drbd8.txt
dist_TESTS = \
+ test/ganeti.bdev_unittest.py \
+ test/ganeti.cli_unittest.py \
+ test/ganeti.cmdlib_unittest.py \
test/ganeti.config_unittest.py \
test/ganeti.config_unittest.py \
+ test/ganeti.constants_unittest.py \
test/ganeti.hooks_unittest.py \
test/ganeti.hooks_unittest.py \
- test/ganeti.utils_unittest.py \
- test/ganeti.bdev_unittest.py \
- test/ganeti.ssh_unittest.py \
+ test/ganeti.http_unittest.py \
test/ganeti.locking_unittest.py \
test/ganeti.locking_unittest.py \
- test/ganeti.serializer_unittest.py \
- test/ganeti.workerpool_unittest.py \
test/ganeti.rapi.resources_unittest.py \
test/ganeti.rapi.resources_unittest.py \
- test/ganeti.http_unittest.py \
- test/ganeti.constants_unittest.py
+ test/ganeti.serializer_unittest.py \
+ test/ganeti.ssh_unittest.py \
+ test/ganeti.utils_unittest.py \
+ test/ganeti.workerpool_unittest.py
nodist_TESTS =
nodist_TESTS =
@@
-222,21
+230,29
@@
man/%.in: man/%.sgml stamp-directories $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
sed -f $(REPLACE_VARS_SED) < $< > $@
doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
- $(DOCBOOK_WRAPPER) $< $@
+ $(DOCBOOK_WRAPPER) "$(DOCBOOK2PDF)" $< $@
doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
- $(DOCBOOK_WRAPPER) $< $@
+ $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
+
+doc/%.html: doc/%.rst
+ $(RST2HTML) $< $@
+
+doc/%.png: doc/%.dot
+ $(DOT) -Tpng -o $@ $<
+
+doc/design-2.0.html: doc/design-2.0.rst doc/arch-2.0.png
-doc/rapi.pdf doc/rapi.html: doc/rapi-resources.sgml
+doc/rapi.pdf doc/rapi.html doc/rapi.in: doc/rapi-resources.sgml
doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@
man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@
man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
- $(DOCBOOK_WRAPPER) $< $@
+ $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
- $(DOCBOOK_WRAPPER) $< $@
+ $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
man/footer.sgml $(TESTS): srclinks
man/footer.sgml $(TESTS): srclinks
@@
-293,7
+309,7
@@
srclinks: stamp-directories
.PHONY: ganeti
ganeti:
.PHONY: ganeti
ganeti:
- cd $(top_builddir) && rm -f $@ && $(LN_S) lib $@
+ cd $(top_builddir) && test -h "$@" || { rm -f $@ && $(LN_S) lib $@; }
# a dist hook rule for catching revision control directories
distcheck-hook:
# a dist hook rule for catching revision control directories
distcheck-hook: