<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>Amar Takhar pushed to branch master at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a></h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/627e1fe8d16bded12495b4104de47378772dc9f0">627e1fe8</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2015-11-23T13:33:37Z</i>
</div>
<pre class='commit-message'>Add option to force documentation install path
* Move all documentation options to their own group.</pre>
</li>
</ul>
<h4>3 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
docs/wscript
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
pylib/configure.py
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
wscript
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/627e1fe8d16bded12495b4104de47378772dc9f0#diff-0'>
<strong>
docs/wscript
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/docs/wscript
</span><span style="color: #000000;background-color: #ddffdd">+++ b/docs/wscript
</span><span style="color: #aaaaaa">@@ -37,7 +37,10 @@ def build(ctx):
</span>
# Install docs
<span style="color: #000000;background-color: #ffdddd">- install_prefix = "%s/share/ntpsec/docs/" % ctx.env.PREFIX
</span><span style="color: #000000;background-color: #ddffdd">+ if ctx.env.PATH_DOC:
+ install_prefix = ctx.env.PATH_DOC
+ else:
+ install_prefix = "%s/share/ntpsec/docs/" % ctx.env.PREFIX
</span>
ctx.install_files(install_prefix, extra + [x.change_ext(".html").name for x in doc_source])
ctx.install_files(install_prefix, image_source, relative_trick=True)
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/627e1fe8d16bded12495b4104de47378772dc9f0#diff-1'>
<strong>
pylib/configure.py
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/pylib/configure.py
</span><span style="color: #000000;background-color: #ddffdd">+++ b/pylib/configure.py
</span><span style="color: #aaaaaa">@@ -88,6 +88,7 @@ def cmd_configure(ctx):
</span> ctx.env.ASCIIDOC_FLAGS = ["-f", "%s/docs/asciidoc.conf" % ctx.srcnode.abspath()]
ctx.env.ENABLE_DOC = True
ctx.env.ENABLE_DOC_ONLY = ctx.options.enable_doc_only
<span style="color: #000000;background-color: #ddffdd">+ ctx.env.PATH_DOC = ctx.options.path_doc
</span>
# XXX: conditionally build this with --disable-man? Should it build without docs enabled?
ctx.env.A2X_FLAGS = ["--format", "manpage", "--asciidoc-opts=--conf-file=%s/docs/asciidoc.conf" % ctx.srcnode.abspath()]
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/627e1fe8d16bded12495b4104de47378772dc9f0#diff-2'>
<strong>
wscript
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/wscript
</span><span style="color: #000000;background-color: #ddffdd">+++ b/wscript
</span><span style="color: #aaaaaa">@@ -40,15 +40,11 @@ def options(ctx):
</span> grp = ctx.add_option_group("NTP build options")
grp.add_option('--enable-debug', action='store_true', default=False, help="Enable debugging code")
grp.add_option('--enable-debug-gdb', action='store_true', default=False, help="Enable GDB debugging symbols")
<span style="color: #000000;background-color: #ffdddd">- grp.add_option('--enable-doc', action='store_true', default=False, help="Build NTP documentation")
- grp.add_option('--enable-doc-only', action='store_true', default=False, help="Only build NTP documentation")
- grp.add_option('--enable-a2x-xmllint', action='store_true', default=False, help="Build NTP documentation with a2x XML lint")
</span> grp.add_option('--enable-crypto', action='store_true', default=False, help="Enable OpenSSL.")
grp.add_option('--disable-droproot', action='store_true', default=False, help="Disable dropping root.")
grp.add_option('--disable-dns-lookup', action='store_true', default=False, help="Disable DNS lookups.")
grp.add_option('--disable-dns-retry', action='store_true', default=False, help="Disable DNS lookups.")
grp.add_option('--disable-mdns-registration', action='store_true', default=False, help="Disable DNS lookups.")
<span style="color: #000000;background-color: #ffdddd">- grp.add_option('--disable-manpage', action='store_true', default=False, help="Disable Manpage building.")
</span>
grp = ctx.add_option_group("NTP features")
<span style="color: #aaaaaa">@@ -69,6 +65,12 @@ def options(ctx):
</span> grp.add_option('--fortify-flags', type='string', action='store', help="Fortify flags.")
grp.add_option('--check', action='store_true', default=False, help="Run tests")
<span style="color: #000000;background-color: #ddffdd">+ grp = ctx.add_option_group("NTP documentation options")
+ grp.add_option('--enable-doc', action='store_true', default=False, help="Build NTP documentation")
+ grp.add_option('--enable-doc-only', action='store_true', default=False, help="Only build NTP documentation")
+ grp.add_option('--enable-a2x-xmllint', action='store_true', default=False, help="Build NTP documentation with a2x XML lint")
+ grp.add_option('--disable-manpage', action='store_true', default=False, help="Disable Manpage building.")
+ grp.add_option('--path-doc', type='string', action='store', default=None, help="Force doc install directory.")
</span>
def configure(ctx):
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/627e1fe8d16bded12495b4104de47378772dc9f0">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/627e1fe8d16bded12495b4104de47378772dc9f0"}}</script>
</p>
</div>
</body>
</html>