[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-42-gb319549

[Michael Adam]

The branch, master has been updated
       via  b319549f129b1c79afc9bfd4a84f2730b96d69a3 (commit)
       via  5e21fc3506f2ba7b1135b1acad2697dfb86b5df0 (commit)
       via  9b32e839bec8611c30745607a3a6b124d5b34c01 (commit)
      from  e4801a426a954040aeb6d2c6d5c1b3e596bd1cab (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b319549f129b1c79afc9bfd4a84f2730b96d69a3
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

commit 5e21fc3506f2ba7b1135b1acad2697dfb86b5df0
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

commit 9b32e839bec8611c30745607a3a6b124d5b34c01
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

-----------------------------------------------------------------------

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