<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/cb4a163fdf595fe4658ff880a7b5d97acc5e2a3d">cb4a163f</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2016-01-20T23:20:30-05:00</i>
</div>
<pre class='commit-message'>Add a workaround for --enable-doc-only when building the main variant.
* Also remove whitespace that snuck in the last commit.</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
pylib/configure.py
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
wscript
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/cb4a163fdf595fe4658ff880a7b5d97acc5e2a3d#diff-0'>
<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">@@ -14,18 +14,6 @@ def cmd_configure(ctx):
</span> opt = flag.replace("--", "").upper() # XXX: find a better way.
opt_map[opt] = ctx.env.OPT_STORE[flag]
<span style="color: #000000;background-color: #ffdddd">-
-
-
-
-
-
-
-
-
-
-
-
</span> msg("--- Configuring host ---")
ctx.setenv('host', ctx.env.derive())
<span style="color: #aaaaaa">@@ -70,9 +58,6 @@ def cmd_configure(ctx):
</span> if not ctx.options.enable_a2x_xmllint:
ctx.env.A2X_FLAGS += ["--no-xmllint"]
<span style="color: #000000;background-color: #ffdddd">- # The rest is not needed for documentation building.
- if ctx.options.enable_doc_only:
- return
</span>
# Disable manpages within build()
if ctx.options.disable_manpage:
<span style="color: #aaaaaa">@@ -101,14 +86,16 @@ def cmd_configure(ctx):
</span> ctx.end_msg(ctx.env.NTPS_VERSION_STRING)
<span style="color: #000000;background-color: #ffdddd">-
-
-
-
-
</span> msg("--- Configuring main ---")
ctx.setenv("main", ctx.env.derive())
<span style="color: #000000;background-color: #ddffdd">+ # XXX: temp hack to fix --enable-doc-only
+ ctx.env.ENABLE_DOC_ONLY = ctx.options.enable_doc_only
+
+ # The rest is not needed for documentation building.
+ if ctx.options.enable_doc_only:
+ return
+
</span> from check_type import check_type
from check_sizeof import check_sizeof
from check_structfield import check_structfield
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/cb4a163fdf595fe4658ff880a7b5d97acc5e2a3d#diff-1'>
<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">@@ -176,7 +176,8 @@ def build(ctx):
</span> ctx.load('rtems_trace', tooldir='pylib/')
if ctx.env.ENABLE_DOC:
<span style="color: #000000;background-color: #ffdddd">- ctx.recurse("docs")
</span><span style="color: #000000;background-color: #ddffdd">+ if ctx.variant != "main":
+ ctx.recurse("docs")
</span>
if ctx.env.ENABLE_DOC_ONLY:
return
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/cb4a163fdf595fe4658ff880a7b5d97acc5e2a3d">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/cb4a163fdf595fe4658ff880a7b5d97acc5e2a3d"}}</script>
</p>
</div>
</body>
</html>