75 lines
3.1 KiB
Diff
75 lines
3.1 KiB
Diff
|
# HG changeset patch
|
||
|
|
# Parent 9971ebba4494012a93c03b40a2c58ec0eb60f50c
|
||
|
|
build: remove crm shell
|
||
|
|
|
||
|
|
diff -r 9971ebba4494 Makefile.am
|
||
|
|
--- a/Makefile.am Wed Aug 31 11:02:11 2011 +1000
|
||
|
|
+++ b/Makefile.am Wed Oct 19 14:44:33 2011 +0200
|
||
|
|
@@ -23,7 +23,7 @@ EXTRA_DIST = autogen.sh Con
|
||
|
|
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \
|
||
|
|
DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
|
||
|
|
|
||
|
|
-CORE = $(LIBLTDL_DIR) replace include lib mcp pengine cib crmd fencing tools shell xml
|
||
|
|
+CORE = $(LIBLTDL_DIR) replace include lib mcp pengine cib crmd fencing tools xml
|
||
|
|
SUBDIRS = $(CORE) cts extra doc
|
||
|
|
|
||
|
|
doc_DATA = AUTHORS COPYING COPYING.LIB
|
||
|
|
diff -r 9971ebba4494 configure.ac
|
||
|
|
--- a/configure.ac Wed Aug 31 11:02:11 2011 +1000
|
||
|
|
+++ b/configure.ac Wed Oct 19 14:44:33 2011 +0200
|
||
|
|
@@ -1686,15 +1686,6 @@ tools/Makefile \
|
||
|
|
tools/coverage.sh \
|
||
|
|
tools/hb2openais.sh \
|
||
|
|
tools/crm_primitive.py \
|
||
|
|
-shell/Makefile \
|
||
|
|
- shell/templates/Makefile \
|
||
|
|
- shell/regression/Makefile \
|
||
|
|
- shell/regression/testcases/Makefile \
|
||
|
|
- shell/modules/Makefile \
|
||
|
|
- shell/modules/ui.py \
|
||
|
|
- shell/modules/ra.py \
|
||
|
|
- shell/modules/vars.py \
|
||
|
|
- shell/modules/help.py \
|
||
|
|
xml/Makefile \
|
||
|
|
)
|
||
|
|
|
||
|
|
diff -r 9971ebba4494 doc/Makefile.am
|
||
|
|
--- a/doc/Makefile.am Wed Aug 31 11:02:11 2011 +1000
|
||
|
|
+++ b/doc/Makefile.am Wed Oct 19 14:44:33 2011 +0200
|
||
|
|
@@ -22,7 +22,6 @@ MAINTAINERCLEANFILES = Makefile.in
|
||
|
|
helpdir = $(datadir)/$(PACKAGE)
|
||
|
|
|
||
|
|
ascii = crm_fencing.txt acls.txt
|
||
|
|
-asciiman = crm.8.txt
|
||
|
|
help_DATA = crm.8.txt
|
||
|
|
docbook = Pacemaker_Explained Clusters_from_Scratch
|
||
|
|
doc_DATA = README.hb2openais $(ascii) $(generated_docs)
|
||
|
|
@@ -57,10 +56,7 @@ graphics: $(PNGS)
|
||
|
|
$(INKSCAPE) --file=$< --export-dpi=180 -C --export-png=$@
|
||
|
|
|
||
|
|
if BUILD_ASCIIDOC
|
||
|
|
-generated_docs += $(ascii:%.txt=%.html) $(asciiman:%.txt=%.html)
|
||
|
|
-generated_mans += $(asciiman:%.8.txt=%.8)
|
||
|
|
-$(generated_mans): $(asciiman)
|
||
|
|
-man8_MANS = $(generated_mans)
|
||
|
|
+generated_docs += $(ascii:%.txt=%.html)
|
||
|
|
endif
|
||
|
|
|
||
|
|
if BUILD_DOCBOOK
|
||
|
|
@@ -122,12 +118,12 @@ brand: $(BRAND_PNGS) $(wildcard publica
|
||
|
|
# find publican-clusterlabs -name "*.noarch.rpm" -exec sudo rpm -Uvh --force \{\} \;
|
||
|
|
|
||
|
|
www: $(generated_docs)
|
||
|
|
- echo rsync -rtz --progress $(generated_docs) $(ascii) $(asciiman) root@www.clusterlabs.org:/var/www/html/doc/
|
||
|
|
- rsync -rtz --progress $(generated_docs) $(ascii) $(asciiman) root@www.clusterlabs.org:/var/www/html/doc/
|
||
|
|
+ echo rsync -rtz --progress $(generated_docs) $(ascii) root@www.clusterlabs.org:/var/www/html/doc/
|
||
|
|
+ rsync -rtz --progress $(generated_docs) $(ascii) root@www.clusterlabs.org:/var/www/html/doc/
|
||
|
|
rm -f $(docbook_txt)
|
||
|
|
make DOCBOOK_FORMATS="pdf,html,html-single,txt,epub" DOCBOOK_LANGS="all" all-local $(generated_docs) $(ascii)
|
||
|
|
echo Uploading current documentation set to clusterlabs.org
|
||
|
|
- rsync -rtz --progress $(generated_docs) $(ascii) $(asciiman) root@www.clusterlabs.org:/var/www/html/doc/
|
||
|
|
+ rsync -rtz --progress $(generated_docs) $(ascii) root@www.clusterlabs.org:/var/www/html/doc/
|
||
|
|
if BUILD_DOCBOOK
|
||
|
|
for book in $(docbook); do \
|
||
|
|
echo Uploading $$book...; \
|