Merge branch 'master' into ssl_sock_stream_cleanup

Author: jwillemsen

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+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.
+
 ### Version
 
 The version of ACE and/or TAO you are using

.github/workflows/linux-container.yml

@@ -0,0 +1,56 @@
+name: linux-container
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 1 * * SUN'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-22.04
+    name: alpine-3.18
+    env:
+      ACE_ROOT: ${{ github.workspace }}/ACE
+      TAO_ROOT: ${{ github.workspace }}/TAO
+      MPC_ROOT: ${{ github.workspace }}/MPC
+    steps:
+    - name: Checkout ACE_TAO
+      uses: actions/checkout@v4
+    - name: Checkout MPC
+      uses: actions/checkout@v4
+      with:
+        repository: DOCGroup/MPC
+        path: ${{ env.MPC_ROOT }}
+    - name: Write configuation files
+      run: |
+        echo '#include "ace/config-linux.h"' > ${{ env.ACE_ROOT }}/ace/config.h
+        echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > ${{ env.ACE_ROOT }}/include/makeinclude/platform_macros.GNU
+    - name: Build in container
+      uses: addnab/docker-run-action@v3
+      with:
+        image: alpine:3.18
+        options: -v ${{ github.workspace }}:${{ github.workspace }}
+        run: |
+          apk add --no-cache git bash make g++ perl linux-headers
+          export ACE_ROOT=${{ env.ACE_ROOT }}
+          export TAO_ROOT=${{ env.TAO_ROOT }}
+          export MPC_ROOT=${{ env.MPC_ROOT }}
+          perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/TAO_ACE.mwc -workers 4
+          perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.ACE_ROOT }}/tests/tests.mwc -workers 4
+          perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDL_Test -workers 4
+          perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDLv4 -workers 4
+          make -j 6 -C ${{ env.TAO_ROOT }}
+          make -j 6 -C ${{ env.ACE_ROOT }}/tests
+          make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDL_Test
+          make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDLv4

.github/workflows/linux.yml

@@ -62,7 +62,7 @@ jobs:
             PackageDeps: g++-13
             optional_macros: c++std=c++20
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-22.04
+            os: ubuntu-24.04
           - CC: clang-6.0
             CXX: clang++-6.0
             PackageDeps: clang-6.0
@@ -120,6 +120,12 @@ jobs:
             Repo: llvm-toolchain-$(lsb_release -cs)-15
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
             os: ubuntu-22.04
+          - CC: clang-16
+            CXX: clang++-16
+            PackageDeps: clang-16
+            Repo: llvm-toolchain-$(lsb_release -cs)-16
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
+            os: ubuntu-22.04
           - feature: CORBA/e micro
             CC: gcc-10
             CXX: g++-10
@@ -220,7 +226,7 @@ jobs:
       if: matrix.optional_feature != ''
       shell: pwsh
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: cpp
       if: matrix.feature == 'CodeQL'
@@ -258,7 +264,7 @@ jobs:
         make -j 6 -C ${env:TAO_ROOT}/tests/IDLv4
       shell: pwsh
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       if: matrix.feature == 'CodeQL'
     - name: Install TAO_ACE workspace
       run: |

.github/workflows/macosx.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, macos-12]
+        os: [macos-13, macos-14]
         include:
           - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU
     runs-on: ${{ matrix.os }}

.github/workflows/windows.yml

@@ -131,7 +131,7 @@ jobs:
     - name: Install vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: 5b1214315250939257ef5d62ecdcbca18cf4fb1c
+        vcpkgGitCommitId: c82f74667287d3dc386bce81e44964370c91a289
         runVcpkgInstall: true
     - name: create $ACE_ROOT/ace/config.h
       run: |
@@ -164,7 +164,7 @@ jobs:
         perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:TAO_ROOT}/tests/IDL_Test -workers 4 ${{ matrix.OptionalMpcArgs }}
       shell: pwsh
     - name: Setup msbuild
-      uses: microsoft/setup-msbuild@v1
+      uses: microsoft/setup-msbuild@v2
     - name: Build solution TAO/TAO_ACE.sln
       run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/TAO_ACE.sln
     - name: Build solution ACE/tests/tests.sln

.gitignore

@@ -20,6 +20,7 @@
 
 .depend.*
 GNUmakefile*
+local.mwc
 *.ior
 .obj/
 *.iobj

ACE/ACE-INSTALL.html

@@ -77,7 +77,7 @@ <h2>Synopsis</h2>
   <li><a href="#eclipse">Working with ACE in Eclipse</a></li>
   <li><a href="#advanced">Advanced Topics</a></li>
   <li><a href="#power">Building from git</a></li>
-</li></ul>
+</ul>
 
 
 <p></p><hr><p>
@@ -329,7 +329,7 @@ <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></
       source tree.  The ACE recursive Makefile scheme needs this information.
       There are several ways to set the ACE_ROOT variable.  For example:
       <blockquote>
-      TSCH/CSH:
+      TCSH/CSH:
       <code>setenv ACE_ROOT /home/cs/faculty/schmidt/ACE_wrappers</code>
       </blockquote>
       <blockquote>
@@ -427,6 +427,9 @@ <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></
   </li>
   <li>If you've set the INSTALL_PREFIX before building, now run
 <blockquote><code>% make install</code></blockquote>
+    <p>An alternative to directly running <code>make install</code> is to use <code>$ACE_ROOT/bin/install_proj.sh</code>
+       which will only install projects that are built (instead of trying to build each one during <code>make install</code>).
+    </p>
   </li>
   <li>If you need to regenerate the <code>ace/Svc_Conf_y.cpp</code> file,
       you'll need to
@@ -676,9 +679,9 @@ <h3><a name="embarcadero">Building and Installing ACE on Windows with Embarcader
       <code>set CODEGUARD=1</code><br>
       <br>
       Set one of the following environment variable to 1 to select which Embarcadero
-      C++ compiler has to be used. Valid environment variables are BCC32, BCC32C, and BCC64.
+      C++ compiler has to be used. Valid environment variables are <code>BCC32C</code>, <code>BCC64</code>, and <code>BCC64X</code>.
       <br>
-      <code>set BCC32=1</code><br>
+      <code>set BCC64X=1</code><br><br>
       You can then start the build with the command
       <br><code>make -f Makefile.bmak all</code><br>
       <br>
@@ -2469,7 +2472,7 @@ <h2><a name="g++">Compiling ACE with GNU g++</a></h2>
 If you use the GNU GCC g++ compiler please note the following:
 
 <ul>
-  </p></li><li>ACE/TAO needs g++ 4.8 or better. Older versions are not usable anymore<p>
+  </p><li>ACE/TAO needs g++ 4.8 or better. Older versions are not usable anymore<p>
 
   </p></li><li>Make sure to update your gcc <code>config.status</code>
       file.  This file is produced when installing gcc; it specifies