Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ifs
sconsider
Commits
a5d20e07
Commit
a5d20e07
authored
Dec 16, 2020
by
Marcel Huber
Browse files
Merge branch 'hotfix_0.3.21'
parents
aa0e3abf
6d04d669
Pipeline
#52108
passed with stages
in 3 minutes and 54 seconds
Changes
5
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
a5d20e07
...
@@ -14,6 +14,8 @@ build:
...
@@ -14,6 +14,8 @@ build:
artifacts
:
artifacts
:
expire_in
:
1 day
expire_in
:
1 day
paths
:
paths
:
-
dist/*.whl
-
dist/*.tar.gz
-
"
*.tox.json"
-
"
*.tox.json"
-
pytest.log
-
pytest.log
script
:
script
:
...
...
CHANGELOG.adoc
View file @
a5d20e07
= Changelog
= Changelog
:ci_commit_link: link:/../commit/
:ci_commit_link: link:/../commit/
== tag: 0.3.21
* keep dist wheels for download ({ci_commit_link}a26a8fb[a26a8fb])
* add install tool if not available ({ci_commit_link}0dd877c[0dd877c])
* fixed boost include dir ({ci_commit_link}13bd2bb[13bd2bb])
* Bumped version to 0.3.21 ({ci_commit_link}f8e5751[f8e5751])
== tag: 0.3.20
== tag: 0.3.20
* Merge branch 'tag: 0.3.20' ({ci_commit_link}aa0e3ab[aa0e3ab])
* updated changelog ({ci_commit_link}14ff6be[14ff6be])
* Bumped version to 0.3.20 ({ci_commit_link}1349192[1349192])
* Bumped version to 0.3.20 ({ci_commit_link}1349192[1349192])
...
...
SConsider/3rdparty/boost/boost.src.sconsider
View file @
a5d20e07
...
@@ -22,7 +22,7 @@ else:
...
@@ -22,7 +22,7 @@ else:
createFulltargetname = PackageRegistry.createFulltargetname
createFulltargetname = PackageRegistry.createFulltargetname
INCLUDE_TARGET_NAME = 'include'
INCLUDE_TARGET_NAME = 'include'
TARGET_LIBS_AND_HEADERS = [(INCLUDE_TARGET_NAME, '
include
', 'boost/version.hpp', 'CXX'),
TARGET_LIBS_AND_HEADERS = [(INCLUDE_TARGET_NAME, '', 'boost/version.hpp', 'CXX'),
('regex', 'boost_regex', 'boost/regex.h', 'CXX'),
('regex', 'boost_regex', 'boost/regex.h', 'CXX'),
('system', 'boost_system', 'boost/system/error_code.hpp', 'CXX')]
('system', 'boost_system', 'boost/system/error_code.hpp', 'CXX')]
...
...
SConsider/site_tools/SystemLibsInstallBuilder.py
View file @
a5d20e07
...
@@ -128,6 +128,13 @@ def installSystemLibs(source):
...
@@ -128,6 +128,13 @@ def installSystemLibs(source):
env
.
Depends
(
aliasPrefix
+
sourcenode
.
name
,
source_syslibs
)
env
.
Depends
(
aliasPrefix
+
sourcenode
.
name
,
source_syslibs
)
def
prePackageCollection
(
env
,
**
_
):
# ensure we have getBitwidth() and other functions available
for
required_tool
in
[
'install'
]:
if
required_tool
not
in
env
[
'TOOLS'
]:
env
.
Tool
(
required_tool
)
def
generate
(
env
,
*
args
,
**
kw
):
def
generate
(
env
,
*
args
,
**
kw
):
from
SCons.Action
import
ActionFactory
from
SCons.Action
import
ActionFactory
"""Add the options, builders and wrappers to the current Environment."""
"""Add the options, builders and wrappers to the current Environment."""
...
...
VERSION
View file @
a5d20e07
0.3.20
0.3.21
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
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