Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matthias Mayr
limbo
Commits
633156d5
Commit
633156d5
authored
May 21, 2018
by
Konstantinos Chatzilygeroudis
Browse files
Merge remote-tracking branch 'origin' into cpp14
parents
a46439d3
959fb3f4
Changes
1
Hide whitespace changes
Inline
Side-by-side
wscript
View file @
633156d5
...
...
@@ -91,7 +91,11 @@ def options(opt):
opt
.
add_option
(
'--cpp14'
,
action
=
'store_true'
,
default
=
False
,
help
=
'force c++-14 compilation [--cpp14]'
,
dest
=
'cpp14'
)
opt
.
logger
=
Logs
.
make_logger
(
blddir
+
'options.log'
,
'mylogger'
)
try
:
os
.
mkdir
(
blddir
)
# because this is not always created at that stage
except
:
print
(
"build dir not created (it probably already exists, this is fine)"
)
opt
.
logger
=
Logs
.
make_logger
(
blddir
+
'/options.log'
,
'mylogger'
)
for
i
in
glob
.
glob
(
'exp/*'
):
if
os
.
path
.
isdir
(
i
):
...
...
@@ -245,7 +249,7 @@ def write_default_params(ctx):
def
build_docs
(
ctx
):
Logs
.
pprint
(
'NORMAL'
,
"generating HTML doc with versioning..."
)
s
=
'sphinx-versioning -v build -f docs/pre_script.sh --whitelist-branches "(master|release-*)" docs docs/_build/html'
s
=
'sphinx-versioning -v build -f docs/pre_script.sh --whitelist-branches "(
fix\_docs|
master|release-*)" docs docs/_build/html'
retcode
=
subprocess
.
call
(
s
,
shell
=
True
,
env
=
None
)
class
BuildExtensiveTestsContext
(
BuildContext
):
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment