The branch, master has been updated
via 7a0a765 docs-xml: plain file URIs need three slashes
via 03f0ba7 docs-xml: figure out samba version for the docs
automatically
from 114f5da s3: smbd: Use identical logic to test for kernel oplocks on
a share.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7a0a765d535abdd76d86ea88251489d2839ec59b
Author: Björn Jacke <bja...@samba.org>
Date: Thu Jan 4 12:55:26 2018 +0100
docs-xml: plain file URIs need three slashes
Signed-off-by: Bjoern Jacke <bja...@samba.org>
Autobuild-User(master): Björn Jacke <b...@sernet.de>
Autobuild-Date(master): Thu Jan 4 20:32:21 CET 2018 on sn-devel-144
commit 03f0ba71953b2738261e897074e7d91c6022c1b7
Author: Björn Jacke <bja...@samba.org>
Date: Thu Jan 4 10:38:05 2018 +0100
docs-xml: figure out samba version for the docs automatically
Signed-off-by: Bjoern Jacke <bjo...@samba.org>
Reviewed-by: Karolin Seeger <ksee...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/build/catalog.xml.in | 8 ++++----
docs-xml/configure.ac | 8 +++++++-
2 files changed, 11 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/build/catalog.xml.in b/docs-xml/build/catalog.xml.in
index 77bf87e..77ec4f2 100644
--- a/docs-xml/build/catalog.xml.in
+++ b/docs-xml/build/catalog.xml.in
@@ -6,16 +6,16 @@
<rewriteURI
uriStartString="http://www.samba.org/samba/DTD/";
- rewritePrefix="file://@abs_top_srcdir@/build/DTD/"/>
+ rewritePrefix="file:///@abs_top_srcdir@/build/DTD/"/>
<rewriteURI
uriStartString="http://www.samba.org/samba/LOCAL.BUILDDIR.DTD/";
- rewritePrefix="file://@abs_top_builddir@/build/DTD/"/>
+ rewritePrefix="file:///@abs_top_builddir@/build/DTD/"/>
<rewriteURI
uriStartString="http://www.gnu.org/licenses/";
-
rewritePrefix="file://@abs_top_srcdir@/Samba3-ByExample/"/>
+
rewritePrefix="file:///@abs_top_srcdir@/Samba3-ByExample/"/>
<rewriteURI
uriStartString="http://www.samba.org/samba/smbdotconf/";
- rewritePrefix="file://@abs_top_builddir@/smbdotconf/"/>
+ rewritePrefix="file:///@abs_top_builddir@/smbdotconf/"/>
</catalog>
diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 8c26692..9a7f9ce 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -55,8 +55,14 @@ fi
AC_SUBST(TARGETS)
+. ../VERSION
if test x"$DOC_VERSION" = x; then
- AC_MSG_ERROR([Please export DOC_VERSION variable])
+ #AC_MSG_ERROR([Please export DOC_VERSION variable])
+ VERSION_SUFFIX=""
+ if test x"$SAMBA_VERSION_PRE_RELEASE" != x; then
+ VERSION_SUFFIX=pre
+ fi
+
DOC_VERSION=${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}${VERSION_SUFFIX}
else
AC_MSG_RESULT([DOC_VERSION: ${DOC_VERSION}])
fi
--
Samba Shared Repository
