Skip to content

Commit b414859

Browse files
authored
External Release v2022.04.17 (#37)
Added: - Added Visual Studio 2022 (version 17) support
1 parent 09b6654 commit b414859

File tree

22 files changed

+233
-143
lines changed

22 files changed

+233
-143
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,8 @@ jobs:
4141
python -m pip install .
4242
- name: test
4343
run: |
44+
python tests/1.py
4445
python tests/2.py
46+
python tests/3.py
47+
4548

.gitlab-ci.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.travis.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

appveyor.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#BEGIN_LEGAL
22
#
3-
#Copyright (c) 2021 Intel Corporation
3+
#Copyright (c) 2022 Intel Corporation
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
2424
class MBuildConan(ConanFile):
2525
name = "mbuild"
2626
description = "A simple portable dependence-based build-system written in Python."
27-
url = "https://gitlab.devtools.intel.com/xed-group/xed"
27+
url = "https://github.com/intelxed/mbuild.git"
2828
homepage = "https://intelxed.github.io/"
2929
license = "Apache License 2.0"
3030
topics = ("intel", "mbuild", "build")

mbuild/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#BEGIN_LEGAL
22
#
3-
#Copyright (c) 2016 Intel Corporation
3+
#Copyright (c) 2022 Intel Corporation
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
1616
#
1717
#END_LEGAL
1818
# __init__.py
19-
# Mark Charney
2019
"""This is mbuild: a simple portable dependence-based build-system
2120
written in python.
2221

mbuild/base.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/usr/bin/env python
22
# -*- python -*-
3-
# Mark Charney
43
#BEGIN_LEGAL
54
#
6-
#Copyright (c) 2019 Intel Corporation
5+
#Copyright (c) 2022 Intel Corporation
76
#
87
# Licensed under the Apache License, Version 2.0 (the "License");
98
# you may not use this file except in compliance with the License.

mbuild/build_env.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- python -*-
33
#BEGIN_LEGAL
44
#
5-
#Copyright (c) 2019 Intel Corporation
5+
#Copyright (c) 2022 Intel Corporation
66
#
77
# Licensed under the Apache License, Version 2.0 (the "License");
88
# you may not use this file except in compliance with the License.
@@ -258,7 +258,7 @@ def find_ms_toolchain(env):
258258
if env['toolchain'] == '':
259259
if incoming_setup:
260260
# relying on user-setup env (say MSVS cmd.exe or vcvars-equiv bat file)
261-
if os.environ['VisualStudioVersion'] in ['15.0','16.0']:
261+
if os.environ['VisualStudioVersion'] in ['15.0','16.0','17.0']:
262262
env['msvs_version'] = str(int(float(os.environ['VisualStudioVersion'])))
263263
msvs.set_msvc_compilers(env, os.environ['VCToolsInstallDir'])
264264
if env['compiler']=='ms':

mbuild/dag.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/usr/bin/env python
22
# -*- python -*-
3-
# Mark Charney
43
#BEGIN_LEGAL
54
#
6-
#Copyright (c) 2016 Intel Corporation
5+
#Copyright (c) 2022 Intel Corporation
76
#
87
# Licensed under the Apache License, Version 2.0 (the "License");
98
# you may not use this file except in compliance with the License.

mbuild/dfs.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/usr/bin/env python
22
# FILE: dfs.py
3-
# AUTHOR: Mark Charney <[email protected]>
43
#BEGIN_LEGAL
54
#
6-
#Copyright (c) 2016 Intel Corporation
5+
#Copyright (c) 2022 Intel Corporation
76
#
87
# Licensed under the Apache License, Version 2.0 (the "License");
98
# you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)