Skip to content

Commit ae097a4

Browse files
jwillemsenjwillemsen
authored
Merge branch 'master' into const_cast_issue
2 parents 738003b + 6c3ca3f commit ae097a4

File tree

2,826 files changed

+29942
-35273
lines changed

Some content is hidden

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

2,826 files changed

+29942
-35273
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ assignees: ''
77

88
---
99

10+
All support on github is best effort only, no guarantees given. When you need guaranteed support have a look at the commercial support offerings as listed at https://github.com/DOCGroup/ACE_TAO/wiki/ACE-and-TAO-Commercial-support.
11+
1012
### Version
1113

1214
The version of ACE and/or TAO you are using

‎.github/workflows/cmake.yml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: cmake
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+
permissions:
15+
contents: read
16+
17+
jobs:
18+
build:
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
include:
23+
- CC: gcc-12
24+
CXX: g++-12
25+
PackageDeps: g++-12
26+
os: ubuntu-22.04
27+
- CC: vs2019
28+
CXX: vs2019
29+
os: windows-2019
30+
runs-on: ${{ matrix.os }}
31+
name: ${{ matrix.os }} ${{ matrix.CXX }}
32+
env:
33+
ACE_ROOT: ${{ github.workspace }}/ACE
34+
MPC_ROOT: ${{ github.workspace }}/MPC
35+
CC: ${{ matrix.CC }}
36+
CXX: ${{ matrix.CXX }}
37+
steps:
38+
- name: checkout ACE/TAO
39+
uses: actions/checkout@v4
40+
- name: checkout MPC
41+
uses: actions/checkout@v4
42+
with:
43+
repository: DOCGroup/MPC
44+
path: ${{ env.MPC_ROOT }}
45+
- name: Add Repo
46+
run: |
47+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
48+
sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main"
49+
if: matrix.Repo != ''
50+
- name: Add packages
51+
run: |
52+
sudo apt-get --yes update
53+
sudo apt-get --yes install ${{ matrix.PackageDeps }}
54+
if: matrix.PackageDeps != ''
55+
- name: create $ACE_ROOT/ace/config.h
56+
run: |
57+
'#ifdef linux' > ${env:ACE_ROOT}/ace/config.h
58+
'# include "ace/config-linux.h"' >> ${env:ACE_ROOT}/ace/config.h
59+
'#else' >> ${env:ACE_ROOT}/ace/config.h
60+
'# include "ace/config-win32.h"' >> ${env:ACE_ROOT}/ace/config.h
61+
'#endif' >> ${env:ACE_ROOT}/ace/config.h
62+
shell: pwsh
63+
- name: Run mwc.pl on $(ACE_ROOT)/ace/ace.mwc
64+
run: |
65+
perl ${env:ACE_ROOT}/bin/mwc.pl -type cmake ${env:ACE_ROOT}/ace/ace.mwc -workers 6
66+
shell: pwsh
67+
- name: Run mwc.pl on $(ACE_ROOT)/apps/gperf/src
68+
run: |
69+
perl ${env:ACE_ROOT}/bin/mwc.pl -type cmake ${env:ACE_ROOT}/apps/gperf/src
70+
shell: pwsh
71+
- name: Build ace project
72+
run: |
73+
cd ${env:ACE_ROOT}/ace
74+
cmake -S . -B build
75+
cmake --build build -j6
76+
shell: pwsh
77+
- name: Build ACE/apps/gperf/src project
78+
run: |
79+
cd ${env:ACE_ROOT}/apps/gperf/src
80+
cmake -S . -B build
81+
cmake --build build -j6
82+
shell: pwsh

‎.github/workflows/face.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
CXX: g++-10
2525
PackageDeps: g++-10
2626
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
27-
os: ubuntu-18.04
27+
os: ubuntu-20.04
2828
runs-on: ${{ matrix.os }}
2929
name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }}
3030
env:
@@ -35,9 +35,9 @@ jobs:
3535
CXX: ${{ matrix.CXX }}
3636
steps:
3737
- name: checkout ACE/TAO
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939
- name: checkout MPC
40-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
4141
with:
4242
repository: DOCGroup/MPC
4343
path: ${{ env.MPC_ROOT }}

‎.github/workflows/fuzz.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: checkout ACE/TAO
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727
- name: Run fuzz
2828
run: |
2929
perl ${env:ACE_ROOT}/bin/fuzz.pl

‎.github/workflows/linux-container.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: linux-container
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+
permissions:
15+
contents: read
16+
17+
jobs:
18+
build:
19+
strategy:
20+
fail-fast: false
21+
runs-on: ubuntu-22.04
22+
name: alpine-3.18
23+
env:
24+
ACE_ROOT: ${{ github.workspace }}/ACE
25+
TAO_ROOT: ${{ github.workspace }}/TAO
26+
MPC_ROOT: ${{ github.workspace }}/MPC
27+
steps:
28+
- name: Checkout ACE_TAO
29+
uses: actions/checkout@v4
30+
- name: Checkout MPC
31+
uses: actions/checkout@v4
32+
with:
33+
repository: DOCGroup/MPC
34+
path: ${{ env.MPC_ROOT }}
35+
- name: Write configuation files
36+
run: |
37+
echo '#include "ace/config-linux.h"' > ${{ env.ACE_ROOT }}/ace/config.h
38+
echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > ${{ env.ACE_ROOT }}/include/makeinclude/platform_macros.GNU
39+
- name: Build in container
40+
uses: addnab/docker-run-action@v3
41+
with:
42+
image: alpine:3.18
43+
options: -v ${{ github.workspace }}:${{ github.workspace }}
44+
run: |
45+
apk add --no-cache git bash make g++ perl linux-headers
46+
export ACE_ROOT=${{ env.ACE_ROOT }}
47+
export TAO_ROOT=${{ env.TAO_ROOT }}
48+
export MPC_ROOT=${{ env.MPC_ROOT }}
49+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/TAO_ACE.mwc -workers 4
50+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.ACE_ROOT }}/tests/tests.mwc -workers 4
51+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDL_Test -workers 4
52+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDLv4 -workers 4
53+
make -j 6 -C ${{ env.TAO_ROOT }}
54+
make -j 6 -C ${{ env.ACE_ROOT }}/tests
55+
make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDL_Test
56+
make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDLv4

‎.github/workflows/linux.yml‎

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,75 +24,66 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
include:
27-
- CC: gcc-4.8
28-
CXX: g++-4.8
29-
PackageDeps: g++-4.8
30-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
31-
os: ubuntu-18.04
32-
- CC: gcc-6
33-
CXX: g++-6
34-
PackageDeps: g++-6
35-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
36-
os: ubuntu-18.04
3727
- CC: gcc-7
3828
CXX: g++-7
3929
PackageDeps: g++-7
4030
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
41-
os: ubuntu-18.04
31+
os: ubuntu-20.04
4232
CheckPkgConfig: 1
4333
- CC: gcc-8
4434
CXX: g++-8
4535
PackageDeps: g++-8
4636
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
47-
os: ubuntu-18.04
37+
os: ubuntu-20.04
4838
- CC: gcc-9
4939
CXX: g++-9
5040
PackageDeps: g++-9
5141
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
52-
os: ubuntu-18.04
42+
os: ubuntu-20.04
5343
- CC: gcc-10
5444
CXX: g++-10
5545
PackageDeps: g++-10
5646
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
57-
os: ubuntu-18.04
47+
os: ubuntu-20.04
5848
- CC: gcc-11
5949
CXX: g++-11
6050
PackageDeps: g++-11
61-
optional_macros: CCFLAGS+=-std=c++20
51+
optional_macros: c++std=c++20
6252
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
6353
os: ubuntu-22.04
6454
- CC: gcc-12
6555
CXX: g++-12
6656
PackageDeps: g++-12
67-
optional_macros: CCFLAGS+=-std=c++20
57+
optional_macros: c++std=c++20
6858
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
6959
os: ubuntu-22.04
70-
- CC: clang-5.0
71-
CXX: clang++-5.0
72-
PackageDeps: clang-5.0
73-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
74-
os: ubuntu-18.04
60+
- CC: gcc-13
61+
CXX: g++-13
62+
PackageDeps: g++-13
63+
optional_macros: c++std=c++20
64+
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
65+
os: ubuntu-24.04
7566
- CC: clang-6.0
7667
CXX: clang++-6.0
7768
PackageDeps: clang-6.0
7869
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
79-
os: ubuntu-18.04
70+
os: ubuntu-20.04
8071
- CC: clang-7
8172
CXX: clang++-7
8273
PackageDeps: clang-7
8374
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
84-
os: ubuntu-18.04
75+
os: ubuntu-20.04
8576
- CC: clang-8
8677
CXX: clang++-8
8778
PackageDeps: clang-8
8879
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
89-
os: ubuntu-18.04
80+
os: ubuntu-20.04
9081
- CC: clang-9
9182
CXX: clang++-9
9283
PackageDeps: clang-9
9384
Repo: llvm-toolchain-$(lsb_release -cs)-9
9485
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
95-
os: ubuntu-18.04
86+
os: ubuntu-20.04
9687
- CC: clang-10
9788
CXX: clang++-10
9889
PackageDeps: clang-10
@@ -123,20 +114,32 @@ jobs:
123114
Repo: llvm-toolchain-$(lsb_release -cs)-14
124115
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
125116
os: ubuntu-22.04
117+
- CC: clang-15
118+
CXX: clang++-15
119+
PackageDeps: clang-15
120+
Repo: llvm-toolchain-$(lsb_release -cs)-15
121+
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
122+
os: ubuntu-22.04
123+
- CC: clang-16
124+
CXX: clang++-16
125+
PackageDeps: clang-16
126+
Repo: llvm-toolchain-$(lsb_release -cs)-16
127+
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
128+
os: ubuntu-22.04
126129
- feature: CORBA/e micro
127130
CC: gcc-10
128131
CXX: g++-10
129132
PackageDeps: g++-10
130133
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
131-
os: ubuntu-18.04
134+
os: ubuntu-20.04
132135
optional_feature: corba_e_micro=1
133136
optional_macros: corba_e_micro=1
134137
- feature: CORBA/e compact
135138
CC: gcc-10
136139
CXX: g++-10
137140
PackageDeps: g++-10
138141
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
139-
os: ubuntu-18.04
142+
os: ubuntu-20.04
140143
optional_feature: corba_e_compact=1
141144
optional_macros: corba_e_compact=1
142145
- feature: ACE for TAO
@@ -171,9 +174,9 @@ jobs:
171174
CXX: ${{ matrix.CXX }}
172175
steps:
173176
- name: Checkout ACE_TAO
174-
uses: actions/checkout@v3
177+
uses: actions/checkout@v4
175178
- name: Checkout MPC
176-
uses: actions/checkout@v3
179+
uses: actions/checkout@v4
177180
with:
178181
repository: DOCGroup/MPC
179182
path: ${{ env.MPC_ROOT }}
@@ -223,7 +226,7 @@ jobs:
223226
if: matrix.optional_feature != ''
224227
shell: pwsh
225228
- name: Initialize CodeQL
226-
uses: github/codeql-action/init@v2
229+
uses: github/codeql-action/init@v3
227230
with:
228231
languages: cpp
229232
if: matrix.feature == 'CodeQL'
@@ -239,6 +242,10 @@ jobs:
239242
run: |
240243
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDL_Test -workers 4
241244
shell: pwsh
245+
- name: Run mwc.pl on $(TAO_ROOT)/tests/IDLv4
246+
run: |
247+
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDLv4 -workers 4
248+
shell: pwsh
242249
- name: Build TAO_ACE workspace
243250
run: |
244251
make -j 6 -C ${env:TAO_ROOT}
@@ -252,8 +259,12 @@ jobs:
252259
make -j 6 -C ${env:TAO_ROOT}/tests/IDL_Test
253260
shell: pwsh
254261
if: matrix.feature != 'CORBA/e micro'
262+
- name: Build TAO/tests/IDLv4 project
263+
run: |
264+
make -j 6 -C ${env:TAO_ROOT}/tests/IDLv4
265+
shell: pwsh
255266
- name: Perform CodeQL Analysis
256-
uses: github/codeql-action/analyze@v2
267+
uses: github/codeql-action/analyze@v3
257268
if: matrix.feature == 'CodeQL'
258269
- name: Install TAO_ACE workspace
259270
run: |

‎.github/workflows/macosx.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
os: [macos-11, macos-12]
22+
os: [macos-13, macos-14]
2323
include:
2424
- platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU
2525
runs-on: ${{ matrix.os }}
@@ -30,9 +30,9 @@ jobs:
3030
MPC_ROOT: ${{ github.workspace }}/MPC
3131
steps:
3232
- name: checkout ACE/TAO
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434
- name: checkout MPC
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
with:
3737
repository: DOCGroup/MPC
3838
path: ${{ env.MPC_ROOT }}
@@ -61,6 +61,10 @@ jobs:
6161
run: |
6262
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDL_Test -workers 4
6363
shell: pwsh
64+
- name: Run mwc.pl on $(TAO_ROOT)/tests/IDLv4
65+
run: |
66+
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDLv4 -workers 4
67+
shell: pwsh
6468
- name: Build TAO_ACE project
6569
run: |
6670
make -j 6 -C ${env:TAO_ROOT}
@@ -73,3 +77,8 @@ jobs:
7377
run: |
7478
make -j 6 -C ${env:TAO_ROOT}/tests/IDL_Test
7579
shell: pwsh
80+
- name: Build TAO/tests/IDLv4/maps project
81+
run: |
82+
make -j 6 -C ${env:TAO_ROOT}/tests/IDLv4
83+
shell: pwsh
84+

0 commit comments

Comments
 (0)