[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  a9211ec build: Fix generation of CTDB manpages while creating tarball
       via  3bb4fd5 ctdb-build: Add make target for generating manpages
       via  5005362 ctdb-build: Split dist() target to generate manpages separately
      from  646917e repl_meta_data: Clarify that replmd_private->la_list is only for DRS for replication

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


- Log -----------------------------------------------------------------
commit a9211ec2860d7763e606e9a9e4b62c19846b3302
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Feb 21 22:33:48 2017 +1100

    build: Fix generation of CTDB manpages while creating tarball
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12595
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Thu Feb 23 19:25:11 CET 2017 on sn-devel-144

commit 3bb4fd545864aeb7f28230604c26ccc188ba360a
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Feb 21 22:44:10 2017 +1100

    ctdb-build: Add make target for generating manpages
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12595
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

commit 5005362122700ba3651b2c0c58f9026d415d031e
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Feb 21 22:30:30 2017 +1100

    ctdb-build: Split dist() target to generate manpages separately
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12595
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

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

Summary of changes:
 ctdb/Makefile |  3 +++
 ctdb/wscript  | 44 +++++++++++++++++++++++++++-----------------
 wscript       |  2 +-
 3 files changed, 31 insertions(+), 18 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/Makefile b/ctdb/Makefile
index b0912f2..23ee780 100644
--- a/ctdb/Makefile
+++ b/ctdb/Makefile
@@ -27,6 +27,9 @@ show_version:
 	@touch .tmplock
 	@WAFLOCK=.tmplock $(WAF) show_version
 
+manpages:
+	$(WAF) manpages
+
 dist:
 	touch .tmplock
 	WAFLOCK=.tmplock $(WAF) dist
diff --git a/ctdb/wscript b/ctdb/wscript
index 0233149..78319ec 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -957,7 +957,27 @@ def show_version(ctx):
     print VERSION
 
 
-def dist():
+def manpages(ctx):
+    BASE_URL = 'http://docbook.sourceforge.net/release/xsl/current'
+    MAN_XSL = '%s/manpages/docbook.xsl' % BASE_URL
+    HTML_XSL = '%s/html/docbook.xsl' % BASE_URL
+    CMD_TEMPLATE = 'xsltproc --xinclude -o %s --nonet %s %s'
+    manpages = manpages_binary + manpages_misc + manpages_etcd + manpages_ceph
+    for t in manpages:
+        cmd = CMD_TEMPLATE % ('doc/%s' % t, MAN_XSL, 'doc/%s.xml' % t)
+        ret = samba_utils.RUN_COMMAND(cmd)
+        if ret != 0:
+            print('Command %s failed with exit status %d' % (cmd, ret))
+            sys.exit(ret)
+
+        cmd = CMD_TEMPLATE % ('doc/%s.html' % t, HTML_XSL, 'doc/%s.xml' % t)
+        ret = samba_utils.RUN_COMMAND(cmd)
+        if ret != 0:
+            print('Command %s failed with exit status %d' % (cmd, ret))
+            sys.exit(ret)
+
+
+def distonly(ctx):
     samba_dist.DIST_FILES('VERSION:VERSION', extend=True)
 
     t = 'include/ctdb_version.h'
@@ -979,24 +999,8 @@ def dist():
         sys.exit(ret)
     samba_dist.DIST_FILES('ctdb/%s:%s' % (t, t), extend=True)
 
-    BASE_URL = 'http://docbook.sourceforge.net/release/xsl/current'
-    MAN_XSL = '%s/manpages/docbook.xsl' % BASE_URL
-    HTML_XSL = '%s/html/docbook.xsl' % BASE_URL
-    CMD_TEMPLATE = 'xsltproc --xinclude -o %s --nonet %s %s'
     manpages = manpages_binary + manpages_misc + manpages_etcd + manpages_ceph
     for t in manpages:
-        cmd = CMD_TEMPLATE % ('doc/%s' % t, MAN_XSL, 'doc/%s.xml' % t)
-        ret = samba_utils.RUN_COMMAND(cmd)
-        if ret != 0:
-            print('Command %s failed with exit status %d' % (cmd, ret))
-            sys.exit(ret)
-
-        cmd = CMD_TEMPLATE % ('doc/%s.html' % t, HTML_XSL, 'doc/%s.xml' % t)
-        ret = samba_utils.RUN_COMMAND(cmd)
-        if ret != 0:
-            print('Command %s failed with exit status %d' % (cmd, ret))
-            sys.exit(ret)
-
         samba_dist.DIST_FILES('ctdb/doc/%s:doc/%s' % (t, t), extend=True)
         samba_dist.DIST_FILES('ctdb/doc/%s.html:doc/%s.html' % (t, t),
                               extend=True)
@@ -1004,6 +1008,12 @@ def dist():
     samba_dist.dist()
 
 
+def dist():
+    import Scripting
+    Scripting.commands.append('manpages')
+    Scripting.commands.append('distonly')
+
+
 def rpmonly(ctx):
     opts = os.getenv('RPM_OPTIONS') or ''
     cmd = 'rpmbuild -ta --clean --rmsource %s ctdb-%s.tar.gz' % (opts, VERSION)
diff --git a/wscript b/wscript
index 9706e0f..407bcdc 100644
--- a/wscript
+++ b/wscript
@@ -319,7 +319,7 @@ def dist():
     '''makes a tarball for distribution'''
     sambaversion = samba_version.load_version(env=None)
 
-    os.system("make -C ctdb/doc")
+    os.system("make -C ctdb manpages")
     samba_dist.DIST_FILES('ctdb/doc:ctdb/doc', extend=True)
 
     os.system(srcdir + "/release-scripts/build-manpages-nogit")


-- 
Samba Shared Repository