Squashed 'externals/nitro/' changes from c8ecbe9ae..a5bd34266

a5bd34266 Merge commit 'b1f170ff084565365cdca72e88b87c80b7f848ba' into cpp17 b1f170ff0 Squashed 'externals/coda-oss/' changes from e87c32b4de..436289c928 d6efa7ec5 restore C++17 547d0aa9f NITRO-2.11.4 (#575) fe309c4ba Merge branch 'main' of github.com:mdaus/nitro 10efa9990 latest from CODA-OSS (#574) d08f1c0a1 CRLF db5d3d484 latest from CODA-OSS 98c755048 CRLF aa1482543 CRLF bfdbe69a4 Latest from CODA-OSS (#573) 9e4ce0b58 latest from CODA-OSS (#572) 227a8a8f4 trust coda-oss for right -std flags 13869687e latest from CODA-OSS (#571) 5724d8c18 latest from CODA-OSS (#570) fb794f0fe latest from CODA-OSS (#569) 7a6132ba0 update files changes in cpp17 branch (#568) de91d4977 Fix bug creating NITFException (#567) 225273436 fix YAML for 'main' 5d1c83d11 single project for unittests (#566) 102a019db latest from CODA-OSS (known broken build) (#565) b4ae2d429 match YAML from coda-oss 176bcaf6d build NITRO.SLN using msbuild (#562) 85e9043b8 latest from CODA-OSS (#561) 49ec50325 use new "PlatformToolkit" special environment variable (#560) 6c06e3711 latest from CODA-OSS (#559) cee9feb42 latest from CODA-OSS (#558) 3f01809fa latest from coda-oss (#557) 471fb3fc1 Update test_j2k_loading++.cpp b12caf2fc latest from CODA-OSS (#556) 0cd432624 use sys::make_span (#555) 05dae18a3 patch to build other projects 8f974e995 NITRO-2.11.3 (#554) 870aa6afd update to coda-oss 2023-06-05 (#553) 2fd7a0bfa latest from coda-oss (#552) 0eecce004 invoke() utility to reduce code duplication (#550) 59fb02fe9 latest from coda-oss (#551) 9fbf2b7b8 Fill out adapter free block which is used for nitf decompression (#549) 089ba0b5b latest from coda-oss 3b52f0025 latest from coda-oss (#547) 90c6263e2 latest from coda-oss (#544) 90d513ac5 latest from coda-oss (#543) git-subtree-dir: externals/nitro git-subtree-split: a5bd34266b2ab07e8970ccb9984b484db38361f7
ngageoint · Aug 21, 2023 · bfdbae8 · bfdbae8
1 parent 99bf76e
commit bfdbae8
Show file tree

Hide file tree

Showing 1,401 changed files with 218,215 additions and 214,662 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,3 +4,105 @@ conanfile.py text eol=lf
 CMakeLists.txt text eol=lf
 *.cmake text eol=lf
 *.in text eol=lf
+
+# Modern tools on Windows can handle Linux LF
+# See https://stackoverflow.com/a/13154031/8877 for details
+* text=auto eol=lf
+.git?*	    text
+
+# Leave known Windows-only text files as CR/LF
+*.sln text eol=crlf
+*.vcxproj text eol=crlf
+*.vcxproj.filters text eol=crlf
+*.ruleset text eol=crlf
+
+# Text file formats
+*.txt	text eol=lf
+*.md	text eol=lf
+*.tex	text eol=lf
+*.?ml	text eol=lf
+*.kmz	  binary
+
+# Programming languages
+*.htm?	text eol=lf
+*.css	text eol=lf
+*.c	text eol=lf
+*.cc	text eol=lf
+*.c??	text eol=lf
+*.c??m	text eol=lf
+*.ccm	text eol=lf
+*.C	text eol=lf
+*.h??	text eol=lf
+*.h	text eol=lf
+*.hh	text eol=lf
+*.ixx	text eol=lf
+*.mpp	text eol=lf
+*.py	text eol=lf
+*.pyc	binary
+# .f and .f90
+*.f*	text eol=lf
+*.m	text eol=lf
+*.java	text eol=lf
+*.cs	text eol=lf
+*.vb	text eol=lf
+*.js	text eol=lf
+*.ts	text eol=lf
+*.pl	text eol=lf
+*.sh	text eol=lf
+*.csh	text eol=lf
+
+######################
+# Known binary files
+
+# from various unit_test/ directories
+*.dat  	       binary
+*.*hdr	       binary
+*.flat	       binary
+*.sig	       binary
+*.bin	       binary
+
+# images
+*.bmp	binary
+*.ico	binary
+*.tiff	binary
+*.tif	binary
+*.gif	binary
+*.jpg	binary
+*.jpeg	binary
+*.png	binary
+# SVG images are XML
+*.svg	text eol=lf
+*.raw	binary
+*.hei*	binary
+
+# music
+*.mp3	binary
+*.m4a	binary
+*.wav	binary
+*.wma	binary
+
+# video
+*.m4v	binary
+*.avi	binary
+*.wmv	binary
+*.mkv	binary
+
+# documents
+*.pdf	  binary
+*.dvi	  binary
+*.doc*	  binary
+*.xls*	  binary
+*.ppt*	  binary
+
+*.h5	  binary
+*.sio	  binary
+*.ntf	  binary
+*.nitf	  binary
+*.si?d	  binary
+
+# containers
+*.zip	  binary
+*.gz	  binary
+*.tar	  binary
+*.tgz	  binary
+*.jar	  binary
diff --git a/.github/workflows/frequent_check.yml b/.github/workflows/frequent_check.yml
@@ -4,9 +4,14 @@ on: [push]
 
 
 jobs:
-  build-windows:
-    name: Windows
-    runs-on: [windows-latest]
+  build-cmake-windows:
+    strategy:
+      matrix:
+        os: [windows-latest]
+        platform: [x64]
+        configuration: [Release]
+    name: ${{ matrix.os }}-CMake
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
@@ -16,22 +21,70 @@ jobs:
         python-version: '3.7'
     - name: configure
       run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_INSTALL_PREFIX=installWindows-Github -DPYTHON_VERSION="3.7" ..
+        mkdir out
+        cd out
+        cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DPYTHON_VERSION="3.7"
     - name: make
       run: |
-        cd build
-        cmake --build . --config Release -j
-        cmake --build . --config Release --target install
+        cd out
+        cmake --build . --config ${{ matrix.configuration }} -j
+        cmake --build . --config ${{ matrix.configuration }} --target install
     - name: test
       run: |
-        cd build
-        ctest -C Release --output-on-failure
+        cd out
+        ctest -C ${{ matrix.configuration }} --output-on-failure
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+      with:
+        msbuild-architecture: x64
+    - name: msbuild
+      run: |
+        msbuild nitro.sln /p:configuration=${{ matrix.configuration }}
+
+  build-msbuild-windows:
+    strategy:
+      matrix:
+        os: [windows-latest]
+        platform: [x64]
+        configuration: [Debug] # Debug turns on more compiler warnings
+    name: ${{ matrix.os }}-msbuild
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: configure CODA-OSS
+      run: |
+        mkdir externals\coda-oss\out
+        cd externals\coda-oss\out
+        cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DENABLE_PYTHON=OFF
+    - name: make CODA-OSS
+      run: |
+        cd externals\coda-oss\out
+        cmake --build . --config ${{ matrix.configuration }} -j
+        cmake --build . --config ${{ matrix.configuration }} --target install
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+      with:
+        msbuild-architecture: x64
+    - name: msbuild
+      run: |
+        msbuild nitro.sln /p:configuration=${{ matrix.configuration }}
+    #- name: vstest 
+    #  uses: microsoft/[email protected] # https://github.com/marketplace/actions/vstest-action
+    #  with:
+    #    platform: ${{ matrix.platform }}
+    #    testAssembly: UnitTest.dll
+    #    searchFolder: D:\a\nitro\nitro\x64\Debug
+    #- name: vstest 
+    #  run: |
+    #    vstest.console D:\a\nitro\nitro\x64\Debug\UnitTest.dll
 
-  build-linux:
-    name: Linux
-    runs-on: [ubuntu-latest]
+  build-linux-cmake:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    name: ${{ matrix.os }}-CMake
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
@@ -41,16 +94,16 @@ jobs:
         python-version: '3.7'
     - name: configure
       run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_INSTALL_PREFIX=installLinux-Github -DPYTHON_VERSION=3.7 ..
+        mkdir target-Release
+        cd target-Release
+        cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=3.7
     - name: make
       run: |
-        cd build
+        cd target-Release
         # using the default number of threads (-j) causes G++ to crash
         cmake --build . -j 6
         cmake --build . --target install
     - name: test
       run: |
-        cd build
+        cd target-Release
         ctest --output-on-failure
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,11 +6,15 @@ on:
   pull_request:
     branches: main
 
-
 jobs:
-  build-windows:
-    name: Windows
-    runs-on: [windows-latest]
+  build-cmake-windows:
+    strategy:
+      matrix:
+        os: [windows-latest]
+        platform: [x64]
+        configuration: [Release]
+    name: ${{ matrix.os }}-CMake
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
@@ -20,22 +24,70 @@ jobs:
         python-version: '3.7'
     - name: configure
       run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_INSTALL_PREFIX=installWindows-Github -DPYTHON_VERSION="3.7" ..
+        mkdir out
+        cd out
+        cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DPYTHON_VERSION="3.7"
     - name: make
       run: |
-        cd build
-        cmake --build . --config Release -j
-        cmake --build . --config Release --target install
+        cd out
+        cmake --build . --config ${{ matrix.configuration }} -j
+        cmake --build . --config ${{ matrix.configuration }} --target install
     - name: test
       run: |
-        cd build
-        ctest -C Release
+        cd out
+        ctest -C ${{ matrix.configuration }} --output-on-failure
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+      with:
+        msbuild-architecture: x64
+    - name: msbuild
+      run: |
+        msbuild nitro.sln /p:configuration=${{ matrix.configuration }}
+
+  build-msbuild-windows:
+    strategy:
+      matrix:
+        os: [windows-latest]
+        platform: [x64]
+        configuration: [Debug] # Debug turns on more compiler warnings
+    name: ${{ matrix.os }}-msbuild
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: configure CODA-OSS
+      run: |
+        mkdir externals\coda-oss\out
+        cd externals\coda-oss\out
+        cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DENABLE_PYTHON=OFF
+    - name: make CODA-OSS
+      run: |
+        cd externals\coda-oss\out
+        cmake --build . --config ${{ matrix.configuration }} -j
+        cmake --build . --config ${{ matrix.configuration }} --target install
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+      with:
+        msbuild-architecture: x64
+    - name: msbuild
+      run: |
+        msbuild nitro.sln /p:configuration=${{ matrix.configuration }}
+    #- name: vstest 
+    #  uses: microsoft/[email protected] # https://github.com/marketplace/actions/vstest-action
+    #  with:
+    #    platform: ${{ matrix.platform }}
+    #    testAssembly: UnitTest.dll
+    #    searchFolder: D:\a\nitro\nitro\x64\Debug
+    #- name: vstest 
+    #  run: |
+    #    vstest.console D:\a\nitro\nitro\x64\Debug\UnitTest.dll
 
-  build-linux:
-    name: Linux
-    runs-on: [ubuntu-latest]
+  build-linux-cmake:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    name: ${{ matrix.os }}-CMake
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
@@ -45,18 +97,18 @@ jobs:
         python-version: '3.7'
     - name: configure
       run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_INSTALL_PREFIX=installLinux-Github -DPYTHON_VERSION=3.7 ..
+        mkdir target-Release
+        cd target-Release
+        cmake -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=3.7 ..
     - name: make
       run: |
-        cd build
+        cd target-Release
         # using the default number of threads (-j) causes G++ to crash
         cmake --build . -j 6
         cmake --build . --target install
     - name: test
       run: |
-        cd build
-        ctest
+        cd target-Release
+        ctest --output-on-failure
 
 
diff --git a/.gitignore b/.gitignore
@@ -47,5 +47,5 @@ libnitf.pc
 cmake-build*/
 
 # unit tests
-outputPathname.ntf
-sicd_*_nitf__*_band_*.man
+outputPathname.ntf
+sicd_*_nitf__*_band_*.man