From 7ea76605d51de9c9dd8379d28bad420e6cf42ef7 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 2 Dec 2020 12:34:55 +0100
Subject: Further enhance mingw steps

    * .github/workflows/windows.yml:
---
 .github/workflows/windows.yml | 47 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 7 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index ea716b364ec..6d57d462dee 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -140,10 +140,13 @@ jobs:
       matrix:
         compiler: [gcc, clang]
         msystem: [MINGW32, MINGW64]
-    defaults:
-      run:
-        shell: msys2 {0}
+        include:
+          - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU
     name: ${{ matrix.msystem }}-${{ matrix.compiler }}
+    env:
+      ACE_ROOT: ${{ github.workspace }}/ACE
+      TAO_ROOT: ${{ github.workspace }}/TAO
+      MPC_ROOT: ${{ github.workspace }}/MPC
     steps:
     - uses: actions/checkout@v2
     - uses: msys2/setup-msys2@v2
@@ -157,6 +160,36 @@ jobs:
     - run: pacman --noconfirm -S mingw-w64-i686-clang
       if: ${{ (matrix.msystem == 'MINGW32') && (matrix.compiler == 'clang') }}
     - run: ${{ matrix.compiler }} --version
+    - name: checkout ACE/TAO
+      uses: actions/checkout@v2
+    - name: checkout MPC
+      uses: actions/checkout@v2
+      with:
+        repository: DOCGroup/MPC
+        path: ${{ env.MPC_ROOT }}
+    - name: create $ACE_ROOT/ace/config.h
+      run: |
+        '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h
+      shell: pwsh
+    - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+      run: |
+        echo "ipv6=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+      shell: pwsh
+    - name: Add optional features ${{ matrix.OptionalFeatures }}
+      run: |
+        echo "${{ matrix.OptionalFeatures }}" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+      shell: pwsh
+      if: matrix.OptionalFeatures != ''
+    - name: add optional optional macros
+      run: |
+        '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
+      if: matrix.optional_macros != ''
+    - name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU
+      run: |
+        '${{ matrix.platform_file }}' >>  ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
     - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
       run: |
         perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4
@@ -167,9 +200,9 @@ jobs:
       shell: pwsh
     - name: Build TAO_ACE project
       run: |
-        make -j 6 -C ${env:TAO_ROOT}
-      shell: pwsh
+        make -j 6 -C $TAO_ROOT
+      shell: msys2 {0}
     - name: Build ACE/tests project
       run: |
-        make -j 6 -C ${env:ACE_ROOT}/tests
-      shell: pwsh
+        make -j 6 -C $ACE_ROOT/tests
+      shell: msys2 {0}
-- 
cgit v1.2.1