Skip to content

Commit 7b5fe9d

Browse files
hilljh82hilljh82
committed
chore: merge master
2 parents 69a76b2 + f167fbd commit 7b5fe9d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+592
-264
lines changed

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Set update schedule for GitHub Actions
2+
version: 2
3+
updates:
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"

‎.github/workflows/fuzz.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: fuzz
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '0 1 * * SUN'
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
env:
15+
DOC_ROOT: ${{ github.workspace }}/ACE
16+
ACE_ROOT: ${{ github.workspace }}/ACE/ACE
17+
TAO_ROOT: ${{ github.workspace }}/ACE/TAO
18+
19+
jobs:
20+
build:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: checkout MPC
24+
uses: actions/checkout@v2
25+
- name: checkout ACE_TAO
26+
uses: actions/checkout@v2
27+
with:
28+
repository: DOCGroup/ACE_TAO
29+
path: ${{ env.DOC_ROOT }}
30+
- name: Run fuzz
31+
run: |
32+
perl ${env:ACE_ROOT}/bin/fuzz.pl
33+
shell: pwsh

‎.github/workflows/linux.yml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: linux
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '0 1 * * SUN'
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
build:
16+
strategy:
17+
matrix:
18+
include:
19+
- CC: gcc-10
20+
CXX: g++-10
21+
PackageDeps: g++-10
22+
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
23+
os: ubuntu-20.04
24+
runs-on: ${{ matrix.os }}
25+
name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }}
26+
env:
27+
DOC_ROOT: ${{ github.workspace }}/ACE_TAO
28+
ACE_ROOT: ${{ github.workspace }}/ACE_TAO/ACE
29+
TAO_ROOT: ${{ github.workspace }}/ACE_TAO/TAO
30+
MPC_ROOT: ${{ github.workspace }}/
31+
CC: ${{ matrix.CC }}
32+
CXX: ${{ matrix.CXX }}
33+
steps:
34+
- name: checkout MPC
35+
uses: actions/checkout@v2
36+
- name: checkout ACE_TAO
37+
uses: actions/checkout@v2
38+
with:
39+
repository: DOCGroup/ACE_TAO
40+
path: ${{ env.DOC_ROOT }}
41+
- name: Add Repo
42+
run: |
43+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
44+
sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main"
45+
if: matrix.Repo != ''
46+
- name: Add packages
47+
run: |
48+
sudo apt-get --yes update
49+
sudo apt-get --yes install libxerces-c-dev libssl-dev ${{ matrix.PackageDeps }}
50+
- name: create $ACE_ROOT/ace/config.h
51+
run: |
52+
'#include "ace/config-linux.h"' > ${env:ACE_ROOT}/ace/config.h
53+
shell: pwsh
54+
- name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU
55+
run: |
56+
'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
57+
'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
58+
'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
59+
'zlib=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
60+
shell: pwsh
61+
- name: add optional optional macros
62+
run: |
63+
'${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
64+
shell: pwsh
65+
if: matrix.optional_macros != ''
66+
- name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU
67+
run: |
68+
'${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
69+
shell: pwsh
70+
- name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
71+
run: |
72+
'ipv6=1' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
73+
'xerces3=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
74+
'ssl=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
75+
'zlib=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
76+
shell: pwsh
77+
- name: add optional optional feature
78+
run: |
79+
'${{ matrix.optional_feature }}' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
80+
if: matrix.optional_feature != ''
81+
shell: pwsh
82+
- name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
83+
run: |
84+
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4
85+
shell: pwsh
86+
- name: Build TAO_ACE project
87+
run: |
88+
make -j 6 -C ${env:TAO_ROOT}
89+
shell: pwsh

‎.github/workflows/macosx.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: macosx
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '0 1 * * SUN'
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
build:
16+
strategy:
17+
matrix:
18+
cxxstd: ["11"]
19+
os: [macos-10.15, macos-11.0]
20+
include:
21+
- platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU
22+
runs-on: ${{ matrix.os }}
23+
name: "${{ matrix.os }}-C++${{ matrix.cxxstd }}"
24+
env:
25+
DOC_ROOT: ${{ github.workspace }}/ACE_TAO
26+
ACE_ROOT: ${{ github.workspace }}/ACE_TAO/ACE
27+
TAO_ROOT: ${{ github.workspace }}/ACE_TAO/TAO
28+
MPC_ROOT: ${{ github.workspace }}/
29+
steps:
30+
- name: checkout MPC
31+
uses: actions/checkout@v2
32+
- name: checkout ACE/TAO
33+
uses: actions/checkout@v2
34+
with:
35+
repository: DOCGroup/ACE_TAO
36+
path: ${{ env.DOC_ROOT }}
37+
- name: create $ACE_ROOT/ace/config.h
38+
run: |
39+
'#include "ace/config-macosx.h"' > ${env:ACE_ROOT}/ace/config.h
40+
shell: pwsh
41+
- name: Add c++${{ matrix.cxxstd }} platform_macros.GNU
42+
run: |
43+
'c++${{ matrix.cxxstd }}=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
44+
shell: pwsh
45+
- name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU
46+
run: |
47+
'${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
48+
shell: pwsh
49+
- name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
50+
run: |
51+
'ipv6=1' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
52+
'versioned_namespace=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
53+
shell: pwsh
54+
- name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
55+
run: |
56+
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4
57+
shell: pwsh
58+
- name: Build TAO_ACE project
59+
run: |
60+
make -j 6 -C ${env:TAO_ROOT}
61+
shell: pwsh

‎.github/workflows/windows.yml‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
name: windows
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '0 1 * * SUN'
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
build:
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
include:
20+
- name: VS2017Debug64
21+
vmimage: windows-2016
22+
mpctype: vs2017
23+
BuildPlatform: x64
24+
BuildConfiguration: Debug
25+
vcpkgarch: x64-windows
26+
vcpkglibdir: debug/lib
27+
vcpkgpackages: openssl xerces-c zlib
28+
- name: VS2019Debug64
29+
vmimage: windows-2019
30+
mpctype: vs2019
31+
BuildPlatform: x64
32+
BuildConfiguration: Debug
33+
vcpkgarch: x64-windows
34+
vcpkglibdir: debug/lib
35+
vcpkgpackages: openssl xerces-c zlib
36+
- name: VS2019Release32
37+
vmimage: windows-2019
38+
mpctype: vs2019
39+
BuildPlatform: Win32
40+
BuildConfiguration: Release
41+
vcpkgarch: x86-windows
42+
vcpkglibdir: lib
43+
vcpkgpackages: openssl xerces-c zlib
44+
- name: VS2022Debug64
45+
vmimage: windows-2022
46+
mpctype: vs2022
47+
BuildPlatform: x64
48+
BuildConfiguration: Debug
49+
vcpkgarch: x64-windows
50+
vcpkglibdir: debug/lib
51+
vcpkgpackages: openssl xerces-c zlib
52+
runs-on: ${{ matrix.vmimage }}
53+
name: ${{ matrix.name }}
54+
env:
55+
DOC_ROOT: ${{ github.workspace }}/ACE_TAO
56+
ACE_ROOT: ${{ github.workspace }}/ACE_TAO/ACE
57+
TAO_ROOT: ${{ github.workspace }}/ACE_TAO/TAO
58+
MPC_ROOT: ${{ github.workspace }}/
59+
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
60+
XERCESC_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
61+
XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
62+
SSL_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
63+
SSL_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
64+
ZLIB_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
65+
ZLIB_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
66+
steps:
67+
- name: checkout MPC
68+
uses: actions/checkout@v2
69+
- name: checkout ACE_TAO
70+
uses: actions/checkout@v2
71+
with:
72+
repository: DOCGroup/ACE_TAO
73+
path: ${{ env.DOC_ROOT }}
74+
- name: Install vcpkg
75+
uses: lukka/run-vcpkg@v7
76+
with:
77+
vcpkgGitCommitId: 70033dbb31527fb3e69654731f540f59c87787f9
78+
vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }}
79+
vcpkgTriplet: ${{ matrix.vcpkgarch }}
80+
appendedCacheKey: ${{ matrix.name }}
81+
- name: create $ACE_ROOT/ace/config.h
82+
run: |
83+
'#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h
84+
shell: pwsh
85+
- name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
86+
run: |
87+
echo "ipv6=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
88+
echo "xerces3=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
89+
echo "ssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
90+
echo "openssl11=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
91+
echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
92+
echo "zlib=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
93+
shell: pwsh
94+
- name: Add optional features ${{ matrix.OptionalFeatures }}
95+
run: |
96+
echo "${{ matrix.OptionalFeatures }}" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
97+
shell: pwsh
98+
if: matrix.OptionalFeatures != ''
99+
- name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
100+
run: |
101+
perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4
102+
shell: pwsh
103+
- name: Setup msbuild
104+
uses: microsoft/setup-msbuild@v1
105+
- name: Build solution $(TAO_ROOT)/TAO_ACE.sln
106+
run: |
107+
msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} ${env:TAO_ROOT}/TAO_ACE.sln
108+
shell: pwsh

‎ChangeLog‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Mon Jan 6 06:21:29 UTC 2020 Chad Elliott <[email protected]>
1111
* modules/ProjectCreator.pm:
1212

1313
Make a copy of the flag override hash when connecting it to a
14-
file so that we do not inadvertantly modify multiple flag overrides
14+
file so that we do not inadvertently modify multiple flag overrides
1515
when modifying flag overrides for a single file.
1616

1717
Mon Jul 1 18:35:43 UTC 2019 Chad Elliott <[email protected]>
@@ -155,7 +155,7 @@ Thu Apr 18 22:18:20 UTC 2019 Chad Elliott <[email protected]>
155155
* templates/iar.mpt:
156156

157157
Added an initial, simplistic IAR workspace/project generator.
158-
There will be more changes to fully suport this IDE.
158+
There will be more changes to fully support this IDE.
159159

160160
Mon May 21 14:33:24 UTC 2018 Adam Mitz <[email protected]>
161161

‎_typos.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[default.extend-words]
2+
mosquitto = "mosquitto"
3+
4+
[files]
5+
extend-exclude = ["templates/*.*", "history/*"]

0 commit comments

Comments
 (0)