[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-3389-g0ee05c0
Michael Adam
obnox at samba.org
Wed Jan 21 14:22:44 GMT 2009
The branch, v3-2-test has been updated
via 0ee05c012e5f58c9132549c59cfd1ed74dd27759 (commit)
via c421d57e69de4d8c135123ed9f78dc9712bc7b3d (commit)
via bd3bb83824803c5301201f7fa2703a52971eae8f (commit)
from f3d355ffa75cd2b0f8cc51189e80aaf3552766d0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 0ee05c012e5f58c9132549c59cfd1ed74dd27759
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 15:10:10 2009 +0100
build-docs: cleanup exit of the script
exit in the directory where it was called using pushd/popd.
Michael
(cherry picked from commit b319549f129b1c79afc9bfd4a84f2730b96d69a3)
Signed-off-by: Michael Adam <obnox at samba.org>
commit c421d57e69de4d8c135123ed9f78dc9712bc7b3d
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 15:09:46 2009 +0100
s3:docs: clean build/catalog.xml in "make clean"
Michael
(cherry picked from commit 5e21fc3506f2ba7b1135b1acad2697dfb86b5df0)
Signed-off-by: Michael Adam <obnox at samba.org>
commit bd3bb83824803c5301201f7fa2703a52971eae8f
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 15:09:12 2009 +0100
s3:docs: clean generated .png images in "make clean"
Michael
(cherry picked from commit 9b32e839bec8611c30745607a3a6b124d5b34c01)
Signed-off-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 4 +++-
release-scripts/build-docs | 20 ++++++++++++++------
2 files changed, 17 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 08e3f5e..610d720 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -58,13 +58,15 @@ clean::
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
$(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
- $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
+ $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
+ $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
rm -f *-images-html*
rm -f *-images-latex-* $(LATEX_FIGURES)
rm -f xslt/figures/*pdf
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
rm -f $(addsuffix .*,$(MAIN_DOCS))
+ rm -f build/catalog.xml
# Output format targets
pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index bde87f4..5da641a 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -1,8 +1,14 @@
#!/bin/sh
+_exit() {
+ echo $@
+ popd
+ exit 1
+}
+
DOCSRCDIR=`dirname $0`/../docs-xml
-cd $DOCSRCDIR || exit 1
+pushd $DOCSRCDIR || exit 1
git clean -d -x -f
autoconf && \
@@ -11,21 +17,23 @@ autoconf && \
make release
if [ $? != 0 ]; then
- echo "Docs build failed!"
- exit 1
+ _exit "Docs build failed!"
fi
-mkdir ../docs
+mkdir -p ../docs
rsync -Ca --delete --exclude=.git output/ ../docs/
rsync -Ca --exclude=.svn registry ../docs/
rsync -Ca --exclude=.svn archives/ ../docs/
-cd ../docs || exit 1
+cd ../docs || _exit "Error changing dir to ${DOCSDIR}/../docs/"
+
/bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
mv manpages-3 manpages
mv htmldocs/manpages-3 htmldocs/manpages
-cd ../docs-xml || exit 1
+cd ../docs-xml || _exit "Error changing dir to ${DOCSDIR}/../docs-xml/"
make distclean
+echo "Success"
+popd
exit
--
Samba Shared Repository
More information about the samba-cvs
mailing list