Merge branch 'master' into build-on-osx

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: RemedyIT

.github/workflows/fuzzr.yml

@@ -29,13 +29,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: '2.7'
     - name: install fuzzr gem
       run: |
-        gem install rite-fuzzr
+        gem install fuzzr
     - name: Run fuzzr
       run: |
         fuzz

.github/workflows/linux.yml

@@ -74,10 +74,10 @@ jobs:
             ruby: '3.1'
             PackageDeps: g++-12
           - os: ubuntu-22.04
-            CC: gcc-12
-            CXX: g++-12
+            CC: gcc-13
+            CXX: g++-13
             ruby: '3.2'
-            PackageDeps: g++-12
+            PackageDeps: g++-13
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} ${{ matrix.CXX }} ruby-${{ matrix.ruby }}
     env:
@@ -90,45 +90,45 @@ jobs:
     - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) == false && github.repository_owner == 'RemedyIT'
       run: |
         echo "X11_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout ACE_TAO
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: DOCGroup/ACE_TAO
         path: ${{ env.DOC_ROOT }}
         ref: ${{ env.ACETAOMPC_BRANCH }}
     - name: checkout MPC
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: DOCGroup/MPC
         path: ${{ env.MPC_ROOT }}
         ref: ${{ env.ACETAOMPC_BRANCH }}
     - name: checkout ridl
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: RemedyIT/ridl
         path: ${{ env.RIDL_ROOT }}
         ref: ${{ env.X11_BRANCH }}
     - name: checkout taox11
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: RemedyIT/taox11
         path: ${{ env.TAOX11_ROOT }}
         ref: ${{ env.X11_BRANCH }}
     - name: checkout ciaox11
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: RemedyIT/ciaox11
         path: ${{ env.CIAOX11_ROOT }}
         ref: ${{ env.X11_BRANCH }}
     - name: checkout dancex11
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: RemedyIT/dancex11
         path: ${{ env.DANCEX11_ROOT }}
         ref: ${{ env.X11_BRANCH }}
     - name: checkout OpenDDS
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: OpenDDS/OpenDDS
         path: ${{ env.DDS_ROOT }}
@@ -170,7 +170,7 @@ jobs:
         files: "docs/html/taox11/getting_started.html"
     - name: File exists
       if: steps.check_files.outputs.files_exists == 'false'
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         script: |
           core.setFailed('Documentation not generated')

.github/workflows/windows.yml

@@ -0,0 +1,104 @@
+name: windows
+
+on:
+  push:
+    branches:
+      - master
+      - v*
+    tags:
+      - AXCIOMA-v*
+  pull_request:
+    branches:
+      - master
+      - v*
+  schedule:
+    - cron: '0 1 * * SUN'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+env:
+  DOC_ROOT: ${{ github.workspace }}/ACE_TAO
+  ACE_ROOT: ${{ github.workspace }}/ACE_TAO/ACE
+  TAO_ROOT: ${{ github.workspace }}/ACE_TAO/TAO
+  MPC_ROOT: ${{ github.workspace }}/ACE_TAO/MPC
+  X11_BASE_ROOT: ${{ github.workspace }}
+  RIDL_ROOT: ${{ github.workspace }}/ridl
+  TAOX11_ROOT: ${{ github.workspace }}/taox11
+  X11_BRANCH: master
+  ACETAOMPC_BRANCH: Latest_ACE7TAO3_Micro
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-2019
+            ruby: '2.6'
+            project_type: vs2019
+          - os: windows-2019
+            ruby: '3.0'
+            project_type: vs2019
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os }} ruby-${{ matrix.ruby }} ${{ matrix.project_type }}
+    steps:
+    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) && github.repository_owner == 'RemedyIT'
+      run: |
+        echo "X11_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV
+    - if: contains(fromJson('["pull_request", "pull_request_target"]'), github.event_name) == false && github.repository_owner == 'RemedyIT'
+      run: |
+        echo "X11_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
+    - uses: actions/checkout@v4
+    - name: checkout ACE_TAO
+      uses: actions/checkout@v4
+      with:
+        repository: DOCGroup/ACE_TAO
+        path: ${{ env.DOC_ROOT }}
+        ref: ${{ env.ACETAOMPC_BRANCH }}
+    - name: checkout MPC
+      uses: actions/checkout@v4
+      with:
+        repository: DOCGroup/MPC
+        path: ${{ env.MPC_ROOT }}
+        ref: ${{ env.ACETAOMPC_BRANCH }}
+    - name: checkout ridl
+      uses: actions/checkout@v4
+      with:
+        repository: RemedyIT/ridl
+        path: ${{ env.RIDL_ROOT }}
+        ref: ${{ env.X11_BRANCH }}
+    - name: checkout axcioma
+      uses: actions/checkout@v4
+      with:
+        repository: RemedyIT/taox11
+        path: ${{ env.TAOX11_ROOT }}
+        ref: ${{ env.X11_BRANCH }}
+    - uses: ilammy/msvc-dev-cmd@v1
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - uses: shogo82148/actions-setup-perl@v1
+      with:
+        distribution: strawberry
+    - name: Run brix11 configure
+      run: |
+        %X11_BASE_ROOT%\bin\brix11 -t ${{ matrix.project_type }} configure -W aceroot=%ACE_ROOT% -W taoroot=%TAO_ROOT% -W mpcroot=%MPC_ROOT%
+      shell: cmd
+    - name: Print brix11 configuration
+      run: |
+        %X11_BASE_ROOT%/bin/brix11 env -- configure -P
+      shell: cmd
+    - name: Run brix11 gen build
+      run: |
+        %X11_BASE_ROOT%/bin/brix11 gen build workspace.mwc -- gen build %TAOX11_ROOT%/examples -- gen build %TAOX11_ROOT%/orbsvcs/tests -- gen build %TAOX11_ROOT%/tests
+      shell: cmd
+    - name: Run brix11 make
+      run: |
+        %X11_BASE_ROOT%/bin/brix11 make -N -d %X11_BASE_ROOT% -- make -N -d %TAOX11_ROOT%/examples -- make -N -d %TAOX11_ROOT%/orbsvcs/tests -- make -N -d %TAOX11_ROOT%/tests
+      shell: cmd

brix11/lib/brix11.rb

@@ -8,10 +8,7 @@
 #--------------------------------------------------------------------
 
 module BRIX11
-  VERSION = '1.1.0'
-  VERSION_MAJOR,
-      VERSION_MINOR,
-      VERSION_RELEASE, = VERSION.split('.').collect { |e| e.to_i }
+  VERSION = { major: 2, minor: 6, release: 0 }
   COPYRIGHT = "Copyright (c) 2014-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
 
   def self.root_path

brix11/lib/brix11/base.rb

@@ -29,6 +29,10 @@ def set_reporter(rep)
       @reporter = rep
     end
 
+    def version
+      "#{VERSION[:major]}.#{VERSION[:minor]}.#{VERSION[:release]}"
+    end
+
     private
     #
     # Configuration handling
@@ -121,7 +125,7 @@ def self.init_optparser
              'List available project types (with compiler options) and active default') {
       options.load_config
       load_brix
-      puts "BRIX11 pluggable scaffolding tool #{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_RELEASE}"
+      puts "BRIX11 pluggable scaffolding tool #{version}"
       puts COPYRIGHT
       puts
       puts '  %-45s | %-35s' % ['Project type [compilers]', 'Description']
@@ -156,7 +160,7 @@ def self.init_optparser
             'Define an additional environment variable for BRIX11 commands.',
             'Separate (optional) value by \'=\' like VAR=VAL. By default value will be \'1\'.',
             'Supports \$VAR and \${VAR}-form variable expansion.') { |v|
-      _var, _val = v.split('=')
+      _var, _val = v.split('=', 2)
       (options.user_config.user_environment ||= {})[_var] = _val || '1'
     }
     opts.on('-x', '--crossbuild',
@@ -181,7 +185,7 @@ def self.init_optparser
             'Print specified or active config and exit.',
             "Default: active configuration") { |v|
       options.load_config unless String === v
-      puts "BRIX11 pluggable scaffolding tool #{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_RELEASE}"
+      puts "BRIX11 pluggable scaffolding tool #{version}"
       puts COPYRIGHT
       puts
       puts options.print_config(String === v ? v : nil)
@@ -193,7 +197,7 @@ def self.init_optparser
             'List available brix collections and exit.') {
       options.load_config
       load_brix
-      puts "BRIX11 pluggable scaffolding tool #{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_RELEASE}"
+      puts "BRIX11 pluggable scaffolding tool #{version}"
       puts COPYRIGHT
       puts
       print '  '
@@ -207,7 +211,7 @@ def self.init_optparser
       BRIX11.log_fatal("Invalid switch -L#{v}") unless v == true || v == 'all'
       options.load_config
       load_brix
-      puts "BRIX11 pluggable scaffolding tool #{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_RELEASE}"
+      puts "BRIX11 pluggable scaffolding tool #{version}"
       puts COPYRIGHT
       puts
       print '  '
@@ -230,7 +234,7 @@ def self.init_optparser
             'Show version information and exit.') {
       options.load_config
       load_brix
-      puts "BRIX11 pluggable scaffolding tool #{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_RELEASE}"
+      puts "BRIX11 pluggable scaffolding tool #{version}"
       puts COPYRIGHT
       puts
       puts '--- [Brix collections] ---'

brix11/lib/brix11/brix/common/require.rb

@@ -13,7 +13,7 @@ module Common
     TITLE = 'Common'.freeze
     DESC = 'BRIX11 Common brix collection'.freeze
     COPYRIGHT = "Copyright (c) 2014-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
-    VERSION = { major: 1, minor: 1, release: 0 }
+    VERSION = { major: 2, minor: 6, release: 0 }
 
     Collection.configure(:common, ROOT, TITLE, DESC, COPYRIGHT, VERSION) do |cfg|
 

brix11/lib/brix11/options.rb

@@ -116,7 +116,7 @@ def _defaults
         help_proc: lambda {
           options.load_config
           load_brix
-          puts "BRIX11 pluggable scaffolding tool #{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_RELEASE}"
+          puts "BRIX11 pluggable scaffolding tool #{version}"
           puts COPYRIGHT
           puts
           puts BRIX11.options.optparser

brix11/lib/brix11/projects/msbuild.rb

@@ -276,7 +276,7 @@ def project_exists?(*args)
     protected
 
       def extra_mpc_args
-        super.concat(%W(-value_template platforms="#{@compiler.platform}" -value_template PlatformToolset=#{@compiler.version}))
+        super.concat(%W(-value_template platforms="#{@compiler.platform}" -value_template PlatformToolset=#{@compiler.version} -value_template MultiProcessorCompilation=true))
       end
 
       def sln_for_dir(path)

etc/brix11rc

@@ -1,7 +1,7 @@
 {
   "bootstrap": [
-    { "id": "ACE", "collections": ["TAOX11", "AXCIOMA"], "dir": "ACE", "repo": "https://github.com/DOCGroup/ACE_TAO.git", "tag": "ACE+TAO-7_1_0" },
-    { "id": "MPC", "collections": ["TAOX11", "AXCIOMA"], "dir": "ACE/MPC", "repo": "https://github.com/DOCGroup/MPC.git", "tag": "ACE+TAO-7_1_0" },
+    { "id": "ACE", "collections": ["TAOX11", "AXCIOMA"], "dir": "ACE", "repo": "https://github.com/DOCGroup/ACE_TAO.git", "tag": "ACE+TAO-7_1_3" },
+    { "id": "MPC", "collections": ["TAOX11", "AXCIOMA"], "dir": "ACE/MPC", "repo": "https://github.com/DOCGroup/MPC.git", "tag": "ACE+TAO-7_1_3" },
     { "id": "ridl", "collections": ["TAOX11", "AXCIOMA"], "dir": "ridl", "repo": "https://github.com/RemedyIT/ridl.git", "tag": "master" },
     { "id": "taox11", "collections": ["TAOX11", "AXCIOMA"], "dir": "taox11", "repo": "https://github.com/RemedyIT/taox11.git", "tag": "master" },
     { "id": "ciaox11", "collections": ["AXCIOMA"], "dir": "ciaox11", "repo": "https://github.com/RemedyIT/ciaox11.git", "tag": "master" },