CMake and script changes for clang-format

1 files changed, 58 insertions, 2 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 60e21c7..936a826 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
 #      fail-fast: false
       matrix:
-        name: ["Windows Latest MSVC", "Ubuntu Latest GCC", "macOS Latest Clang"]
+        name: ["Windows Latest MSVC", "Ubuntu Latest GCC", "Ubuntu Debug GCC", "macOS Latest Clang", "Ubuntu Autotools GCC"]
         include:
           - name: "Windows Latest MSVC"
             artifact: "Windows-MSVC.tar.xz"
@@ -27,16 +27,47 @@ jobs:
             artifact: "Linux.tar.xz"
             os: ubuntu-latest
             build_type: "Release"
+            cpp: ON
             fortran: OFF
+            parallel: OFF
             toolchain: "config/toolchain/GCC.cmake"
             generator: "-G Ninja"
           - name: "macOS Latest Clang"
             artifact: "macOS.tar.xz"
             os: macos-latest
             build_type: "Release"
+            cpp: ON
             fortran: OFF
+            parallel: OFF
             toolchain: "config/toolchain/clang.cmake"
             generator: "-G Ninja"
+          - name: "Ubuntu Debug GCC"
+            artifact: "LinuxDBG.tar.xz"
+            os: ubuntu-latest
+            build_type: "Debug"
+            cpp: ON
+            fortran: OFF
+            parallel: OFF
+            toolchain: "config/toolchain/GCC.cmake"
+            generator: "-G Ninja"
+          - name: "Ubuntu Autotools GCC"
+            artifact: "Linux.tar.xz"
+            os: ubuntu-latest
+            build_type: "Release"
+            cpp: enable
+            fortran: enable
+            parallel: disable
+            toolchain: ""
+            generator: "autogen"
+#          - name: "Ubuntu Parallel GCC"
+#            artifact: "LinuxPar.tar.xz"
+#            os: ubuntu-latest
+#            build_type: "Release"
+#            cpp: OFF
+#            fortran: OFF
+#            parallel: ON
+#            toolchain: "config/toolchain/GCC.cmake"
+#            generator: "-G Ninja"
 
     name: ${{ matrix.name }}
     # The type of runner that the job will run on
@@ -47,6 +78,9 @@ jobs:
     - name: Install Dependencies (Linux)
       run: sudo apt-get install ninja-build
       if: matrix.os == 'ubuntu-latest'
+    - name: Install Autotools Dependencies (Linux)
+      run: sudo apt-get install automake autoconf libtool libtool-bin
+      if: matrix.generator == 'autogen'
     - name: Install Dependencies (Windows)
       run: choco install ninja
       if: matrix.os == 'windows-latest'
@@ -64,17 +98,39 @@ jobs:
     - name: Get Sources
       uses: actions/checkout@v2
 
+    - name: Autotools Configure 
+      if: matrix.generator == 'autogen'
+      run: |
+        sh ./autogen.sh
+        mkdir "${{ runner.workspace }}/build"
+        cd "${{ runner.workspace }}/build"
+        $GITHUB_WORKSPACE/configure --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --enable-java
+      shell: bash
+
     - name: Configure
+      if: matrix.generator != 'autogen'
       run: |
         mkdir "${{ runner.workspace }}/build"
         cd "${{ runner.workspace }}/build"
-        cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=ON $GITHUB_WORKSPACE
+        cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=ON $GITHUB_WORKSPACE
       shell: bash
 
+    - name: Autotools Build
+      if: matrix.generator == 'autogen'
+      run: make
+      working-directory: ${{ runner.workspace }}/build      
+
     - name: Build
+      if: matrix.generator != 'autogen'
       run: cmake --build . --config ${{ matrix.build_type }}
       working-directory: ${{ runner.workspace }}/build      
 
+    - name: Autotools Test
+      if: matrix.generator == 'autogen'
+      run: make check
+      working-directory: ${{ runner.workspace }}/build
+
     - name: Test
+      if: matrix.generator != 'autogen'
       run: ctest --build . -C ${{ matrix.build_type }} -V
       working-directory: ${{ runner.workspace }}/build