Skip to content

Commit beef835

Browse files
authored
Merge branch 'master' into ORBListenerInterfaces_IPv6_fix
2 parents 18adedc + 408bd95 commit beef835

File tree

258 files changed

+8648
-5484
lines changed

Some content is hidden

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

258 files changed

+8648
-5484
lines changed
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: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
PackageDeps: g++-13
6363
optional_macros: c++std=c++20
6464
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
65-
os: ubuntu-22.04
65+
os: ubuntu-24.04
6666
- CC: clang-6.0
6767
CXX: clang++-6.0
6868
PackageDeps: clang-6.0
@@ -120,6 +120,12 @@ jobs:
120120
Repo: llvm-toolchain-$(lsb_release -cs)-15
121121
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
122122
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
123129
- feature: CORBA/e micro
124130
CC: gcc-10
125131
CXX: g++-10
@@ -220,7 +226,7 @@ jobs:
220226
if: matrix.optional_feature != ''
221227
shell: pwsh
222228
- name: Initialize CodeQL
223-
uses: github/codeql-action/init@v2
229+
uses: github/codeql-action/init@v3
224230
with:
225231
languages: cpp
226232
if: matrix.feature == 'CodeQL'
@@ -258,7 +264,7 @@ jobs:
258264
make -j 6 -C ${env:TAO_ROOT}/tests/IDLv4
259265
shell: pwsh
260266
- name: Perform CodeQL Analysis
261-
uses: github/codeql-action/analyze@v2
267+
uses: github/codeql-action/analyze@v3
262268
if: matrix.feature == 'CodeQL'
263269
- name: Install TAO_ACE workspace
264270
run: |

.github/workflows/macosx.yml

Lines changed: 1 addition & 1 deletion
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 }}

.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
- name: Install vcpkg
132132
uses: lukka/run-vcpkg@v11
133133
with:
134-
vcpkgGitCommitId: 5b1214315250939257ef5d62ecdcbca18cf4fb1c
134+
vcpkgGitCommitId: c82f74667287d3dc386bce81e44964370c91a289
135135
runVcpkgInstall: true
136136
- name: create $ACE_ROOT/ace/config.h
137137
run: |
@@ -164,7 +164,7 @@ jobs:
164164
perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:TAO_ROOT}/tests/IDL_Test -workers 4 ${{ matrix.OptionalMpcArgs }}
165165
shell: pwsh
166166
- name: Setup msbuild
167-
uses: microsoft/setup-msbuild@v1
167+
uses: microsoft/setup-msbuild@v2
168168
- name: Build solution TAO/TAO_ACE.sln
169169
run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/TAO_ACE.sln
170170
- name: Build solution ACE/tests/tests.sln

ACE/ACE-INSTALL.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ <h2>Synopsis</h2>
7777
<li><a href="#eclipse">Working with ACE in Eclipse</a></li>
7878
<li><a href="#advanced">Advanced Topics</a></li>
7979
<li><a href="#power">Building from git</a></li>
80-
</li></ul>
80+
</ul>
8181

8282

8383
<p></p><hr><p>
@@ -329,7 +329,7 @@ <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></
329329
source tree. The ACE recursive Makefile scheme needs this information.
330330
There are several ways to set the ACE_ROOT variable. For example:
331331
<blockquote>
332-
TSCH/CSH:
332+
TCSH/CSH:
333333
<code>setenv ACE_ROOT /home/cs/faculty/schmidt/ACE_wrappers</code>
334334
</blockquote>
335335
<blockquote>
@@ -427,6 +427,9 @@ <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></
427427
</li>
428428
<li>If you've set the INSTALL_PREFIX before building, now run
429429
<blockquote><code>% make install</code></blockquote>
430+
<p>An alternative to directly running <code>make install</code> is to use <code>$ACE_ROOT/bin/install_proj.sh</code>
431+
which will only install projects that are built (instead of trying to build each one during <code>make install</code>).
432+
</p>
430433
</li>
431434
<li>If you need to regenerate the <code>ace/Svc_Conf_y.cpp</code> file,
432435
you'll need to
@@ -676,9 +679,9 @@ <h3><a name="embarcadero">Building and Installing ACE on Windows with Embarcader
676679
<code>set CODEGUARD=1</code><br>
677680
<br>
678681
Set one of the following environment variable to 1 to select which Embarcadero
679-
C++ compiler has to be used. Valid environment variables are BCC32, BCC32C, and BCC64.
682+
C++ compiler has to be used. Valid environment variables are <code>BCC32C</code>, <code>BCC64</code>, and <code>BCC64X</code>.
680683
<br>
681-
<code>set BCC32=1</code><br>
684+
<code>set BCC64X=1</code><br><br>
682685
You can then start the build with the command
683686
<br><code>make -f Makefile.bmak all</code><br>
684687
<br>
@@ -2469,7 +2472,7 @@ <h2><a name="g++">Compiling ACE with GNU g++</a></h2>
24692472
If you use the GNU GCC g++ compiler please note the following:
24702473

24712474
<ul>
2472-
</p></li><li>ACE/TAO needs g++ 4.8 or better. Older versions are not usable anymore<p>
2475+
</p><li>ACE/TAO needs g++ 4.8 or better. Older versions are not usable anymore<p>
24732476

24742477
</p></li><li>Make sure to update your gcc <code>config.status</code>
24752478
file. This file is produced when installing gcc; it specifies

0 commit comments

Comments
 (0)