The branch, v3-0-test has been updated
via 84433b32a9339662ddad9443b90beafdcd8a2044 (commit)
via 12116d757e2d9e3472dcccecc83ba77e09767d52 (commit)
via c6c1ab779c50c24c362132d4a5f26bee198a8a1a (commit)
via 892ab9ce709a478fad31f552a70a4b5992a386ed (commit)
via 347cc7f911cdbbe04aa3254444f7060cb0d2038e (commit)
via 4976a8737700aff1772126375b60566046f29ec4 (commit)
via c52786ee1c37139b9d2f7041fcc858cdd0c6e8f3 (commit)
via 9894ba47fa0d75bf0b9b2993eb6115a33e39ce9c (commit)
via f430afc9c78178184601b08ea3e2efd5b1db761c (commit)
via 4591c073be8feb767764aaa4030d6f23ea4a07db (commit)
from ab3e06e58b3b82377621262002837a63429ef87d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit 84433b32a9339662ddad9443b90beafdcd8a2044
Author: Michael Adam <[email protected]>
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 <[email protected]>
commit 12116d757e2d9e3472dcccecc83ba77e09767d52
Author: Michael Adam <[email protected]>
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 <[email protected]>
commit c6c1ab779c50c24c362132d4a5f26bee198a8a1a
Author: Michael Adam <[email protected]>
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 <[email protected]>
commit 892ab9ce709a478fad31f552a70a4b5992a386ed
Author: Michael Adam <[email protected]>
Date: Wed Jan 21 11:47:46 2009 +0100
s3:docs: fix ommission in fix of (real)distclean targets
Michael
(cherry picked from commit 37412017c5dd2f05a7f4bbe0410a6e00ce4805e5)
Signed-off-by: Michael Adam <[email protected]>
commit 347cc7f911cdbbe04aa3254444f7060cb0d2038e
Author: Michael Adam <[email protected]>
Date: Wed Jan 21 11:45:23 2009 +0100
s3:create-tarball: also include the VENDOR_PATCH in the version
Michael
(cherry picked from commit ce3e34d37ce5592e0268be5d16240387d971585a)
Signed-off-by: Michael Adam <[email protected]>
commit 4976a8737700aff1772126375b60566046f29ec4
Author: Michael Adam <[email protected]>
Date: Wed Jan 21 11:41:14 2009 +0100
s3:docs: fix distclean target and add realdistclean target
- remove stuff created by configure in distclean
- remove stuff created by autoconf in realdistclean
Michael
(cherry picked from commit 65c92fea3d18c3520ff2a1e53a0c5c8825c9788f)
Signed-off-by: Michael Adam <[email protected]>
commit c52786ee1c37139b9d2f7041fcc858cdd0c6e8f3
Author: Jelmer Vernooij <[email protected]>
Date: Tue May 27 18:40:14 2008 +0200
Depend on latexfigures files directly as using a rule in between causes
problems.
(This used to be commit bf3c2773f94c1db29a8a3e5935ff587f16f9a905)
(cherry picked from commit 5f6d0078d41e790ab4fa7dac15294821cdb4d4f0)
Signed-off-by: Michael Adam <[email protected]>
commit 9894ba47fa0d75bf0b9b2993eb6115a33e39ce9c
Author: Jelmer Vernooij <[email protected]>
Date: Wed May 21 17:55:20 2008 +0200
Use double colon targets.
(This used to be commit 825cf91fa8b30a67d04cbda8885ff62a4c26458f)
(cherry picked from commit 323be4a6907e4915bb76aa103bf5b868f0b459b1)
Signed-off-by: Michael Adam <[email protected]>
commit f430afc9c78178184601b08ea3e2efd5b1db761c
Author: Jelmer Vernooij <[email protected]>
Date: Fri May 16 15:46:36 2008 +0200
Add test target in Makefile.
(This used to be commit ac0d768676b1b8105a9141169b1afa248df6ce66)
(cherry picked from commit 0f3ba4b766ed83d2a38e6cae8db8690374d88989)
Signed-off-by: Michael Adam <[email protected]>
commit 4591c073be8feb767764aaa4030d6f23ea4a07db
Author: Jelmer Vernooij <[email protected]>
Date: Fri May 16 15:31:54 2008 +0200
Make the make output a bit less chatty.
(This used to be commit 1fa4ef553c437bae07389c0f6a5410ba22ee4905)
(cherry picked from commit 70f52c06ba1d0d9638f1dfb8c42cd0d70364e9df)
Signed-off-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 82 +++++++++++++++++++++------------------
release-scripts/build-docs | 20 +++++++---
release-scripts/create-tarball | 4 ++
3 files changed, 62 insertions(+), 44 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 0f401d6..610d720 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -50,49 +50,56 @@ $(DOCBOOKDIR)/Samba3-Developers-Guide.xml: $(filter-out
Samba3-Developers-Guide/
$(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard
Samba4-HOWTO/*.xml)) Samba4-HOWTO-attributions.xml
# Pseudo targets
-all: $(TARGETS)
-everything: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson
-release: manpages3 htmlman3 html pdf
-clean:
+all:: $(TARGETS)
+everything:: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp
pearson
+release:: manpages3 htmlman3 html pdf
+clean::
@echo "Cleaning up..."
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-* latexfigures
+ 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))
-dvi: $(patsubst %,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
-ps: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
-txt: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
-txt-chunks: $(addsuffix -txt-chunks,$(MAIN_DOCS))
-fo: $(patsubst %,$(FODIR)/%.fo,$(MAIN_DOCS))
-fo-pdf: $(patsubst %,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
-tex: $(addsuffix .tex,$(MAIN_DOCS))
-texi: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
-texiinfo: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
-manpages3: $(patsubst
$(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
-pearson: $(PEARSONDIR)/Samba3-HOWTO.xml
-pearson-verify: $(PEARSONDIR)/Samba3-HOWTO.report.html
-plucker: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
-htmlman3: $(patsubst
$(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3))
$(HTMLDIR)/manpages-3/index.html
-html-single: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
-html: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
-htmlhelp: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS))
-validate: $(addsuffix -validate,$(MAIN_DOCS))
+pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
+dvi:: $(patsubst %,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
+ps:: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
+txt:: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
+txt-chunks:: $(addsuffix -txt-chunks,$(MAIN_DOCS))
+fo:: $(patsubst %,$(FODIR)/%.fo,$(MAIN_DOCS))
+fo-pdf:: $(patsubst %,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
+tex:: $(addsuffix .tex,$(MAIN_DOCS))
+texi:: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
+texiinfo:: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
+manpages3:: $(patsubst
$(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
+pearson:: $(PEARSONDIR)/Samba3-HOWTO.xml
+pearson-verify:: $(PEARSONDIR)/Samba3-HOWTO.report.html
+plucker:: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
+htmlman3:: $(patsubst
$(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3))
$(HTMLDIR)/manpages-3/index.html
+html-single:: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
+html:: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
+htmlhelp:: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS))
+validate:: $(addsuffix -validate,$(MAIN_DOCS))
+
+test:: validate
+check:: validate
+
+.PHONY: test check validate
# Intermediate docbook docs
#
$(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
@echo "Converting Samba-specific tags for $*..."
@mkdir -p $(@D)
- $(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam
noreference 0 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+ @$(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam
noreference 0 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
$(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl
@mkdir -p $(@D)
@@ -105,7 +112,6 @@ $(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3)
xslt/manpage-summary.xsl
@echo "</variablelist></article>" >> $@
# HTML docs
-
$(HTMLDIR)/index.html: htmldocs.html
@mkdir -p $(@D)
cp $< $@
@@ -128,7 +134,7 @@ $(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css
xslt/html.xsl
%-attributions.xml:
@echo "Generating attributions file $@ from $*/"
@cp -f templates/attributions.xml $@
- $(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl
$*/index.xml
+ @$(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl
$*/index.xml
# Text files
$(TXTDIR)/%.txt: $(HTMLDIR)/%.html
@@ -139,15 +145,13 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
%.tex: %/index.xml xslt/latex.xsl
@echo "Generating $...@..."
@mkdir -p $(@D)
- $(XSLTPROC) $(DB2LATEX_ARGS) --stringparam latex.imagebasedir "$*/"
--xinclude --output $@ xslt/latex.xsl $<
-
-latexfigures: $(LATEX_FIGURES)
+ @$(XSLTPROC) $(DB2LATEX_ARGS) --stringparam latex.imagebasedir "$*/"
--xinclude --output $@ xslt/latex.xsl $<
$(PDFDIR)/%.pdf: %.pdf
@mkdir -p $(@D)
cp $< $@
-%.idx: %.tex latexfigures
+%.idx: %.tex $(LATEX_FIGURES)
-$(PDFLATEX) $<
%.ind: %.idx
@@ -156,8 +160,7 @@ $(PDFDIR)/%.pdf: %.pdf
# Dependency files
%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
@echo "Generating dependency file for $*"
- $(XSLTPROC) \
- --novalid \
+ @$(XSLTPROC) --novalid \
--stringparam txtbasedir "$(TXTDIR)/$*/" \
--stringparam target "$*" \
-o $@ xslt/generate-dependencies.xsl $<
@@ -190,7 +193,7 @@ endif
endif
# Adobe PDF files
-%.pdf: %.tex %.ind latexfigures %-images-latex-png %-images-latex-pdf
+%.pdf: %.tex %.ind $(LATEX_FIGURES) %-images-latex-png %-images-latex-pdf
-$(PDFLATEX) $<
-$(PDFLATEX) $<
-$(PDFLATEX) $<
@@ -318,12 +321,15 @@ xslt/generate-attributions.xsl:
xslt/man.xsl:
xslt/pearson.xsl:
-distclean clobber: clean
- rm Makefile.settings config.status config.log configure
+distclean clobber:: clean
+ rm -f Makefile.settings config.status config.log
+
+realdistclean:: distclean
+ rm -f configure
rm -rf autom4te.cache
# Always keep intermediate files if we can
.SECONDARY:
-.PHONY: clean clobber archive release everything all $(TARGETS) latexfigures
+.PHONY: clean clobber archive release everything all
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
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index da39d89..d468dd3 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -183,6 +183,10 @@ function main
if [ -n "$vendor_version" ]; then
version="$version-$vendor_version"
fi
+ vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" $VER_H | awk
'{print $3}'`
+ if [ -n "$vendor_patch" ]; then
+ version="$version-$vendor_patch"
+ fi
version=`echo $version | sed 's/\"//g'`
echo "Creating release tarball for Samba $version"
--
Samba Shared Repository
