Skip to content

Commit

Permalink
Squashed 'externals/coda-oss/' changes from 67d6362..f10fa2009c
Browse files Browse the repository at this point in the history
f10fa2009c Release 2022-11-04 (#613)
a32e697044 remove exception specifications (#609)
084f19126a utilities to find files/directories for unittests (#608)
a3cedada96 Merge branch 'master'
fde6c864fa Merge pull request #607 from mdaus/bugfix/change-order-of-config-header-install
c8a0044010 Install the cmake-configured header after installing the xercesc source tree. Otherwise, the original config will persist in the install
dda2c9acda Merge pull request #606 from mdaus/fix-xerces-config
004a00f09b Bump zlib version for conan builds
207f4dbb9f Fix Xerces config issue and install its config.h
b842417671 Add support for debug optimizations.
0f6cda57dc Use enhanced debug information with gcc/gdb.
5047dce1a9 Work around GCC avx support bug.
001ab18751 Rebuild the waf self-extractor with a fix for the FIPS error.
5a7f64fca2 Revert "Rebuild the waf self-extractor with a fix for the FIPS problem."
9f6f775f8f Rebuild the waf self-extractor with a fix for the FIPS problem.
af7229bd83 utilities to find files from a build (#605)
264ae49dd7 be sure downstream projects build w/C++14 (#604)
7a7b13cbd5 "hello world" for HDF5 (#602)
33cff0ff43 more C++14
963e8ff40c Revert "add HDF5 source code (#603)"
7b5e71a006 add HDF5 source code (#603)
ec7bb2e520 add HDF5 source code (#603)
ec26f703e7 build in NITRO and SIX (#601)
f4361a9730 make it easier to write cli unit-tests (#600)
34b6fdeee1 tweak toString() to reduce specialization (#599)
5907b3ed60 remove C++11 workarounds (#598)
caed59480d Release 2022-08-30_cpp14 (#597)
2630d41e08 get rid of merge conflict
652bce3854 Merge branch 'master'
6f41c09d71 Release 2022-08-30 (#596)
838c323d6a Merge branch 'master'
f916680126 Added handler accessor to MinidomParser for inheriting modules (#594)
72d29e9c27 get unittests working when "nested" in other projects (#595)
f8f18fea5f Actually look at unit test results when using waf (#593)
4189c429e8 Merge branch 'master'
cda679ceee more overloads to take a string length (#592)
b95a32bc4c by default, Uri()s aren't validated (#591)
903ee7ffff Merge branch 'master'
173930a6f2 fix a UTF-8 conversion bug (#590)
a1c0a1eea6 Merge branch 'master'
c5c221a832 CODA code inherits from xml.lite classes :-( (#589)
1bfe5fc402 Merge branch 'master'
a4c6294c30 use EncodedStringView instead of _bstr_t (#588)
6c2df8bb62 "main" is now C++14 (not C++20)
2ce4161080 Squashed commit of the following:
3a0f7fd14d Merge branch 'master'
83c982f0cf remove work-arounds to write non-UTF-8 XML (#586)
142fd7185e Merge branch 'master'
ebf6db1762 <bit> is part of C++20
d3aa8aa5ce std::u8string is in C++20, not C++17
03654933c4 changes to math.linear from coda (#587)
d442e5be0f Merge branch 'master'
5a2f8e52f1 release 2022-08-02 (#585)
e5516aba29 tweak names to match utf8:: conventions (#584)
32f08a9e40 Squashed commit of the following:
ee15ba3172 Merge branch 'master'
3083ec7915 move most platform-specific code to EncodedStringView (#583)
bede753547 fix unit-test with C++20
61a8033f62 consistent use of coda_oss:: and std::
5d3bf9eb83 Merge branch 'master'
36371410c0 EncodedString tweaks for XML processing (#582)
cf2016205c remove any vestiges of Expat and libXML (#580)
33538aa0fc update for newer Intel compiler
ed65e4ccc5 Add two patch candidates to fix FIPS problems in waf.
34c40bd397 Merge branch 'master'
a731ebf8e8 release 2022-06-29 (#579)
a9b9d2a9fa Merge branch 'master'
59387bd87b update "ReleaseNotes.md" for recent changes (#578)
24a3f01afe Merge branch 'master'
e4f940854a remove "boost" and "serialize" (#577)
80b70537e9 update to zlib-1.2.12 (#576)
f92811a53b Merge branch 'master'
202084bacb Remove some compiler warnings (#575)
414c25c551 build with C++20 in VS
1a99a29da3 Merge branch 'master'
c61232224b build most code with Visual Studio (#574)
5cca863d7e Merge branch 'master'
6e4d952bea some unit-tests need argc/argv (#573)
36e051d7b6 Add run1D method to GenerationThreadPool (#572)
6d4776235e Merge branch 'master'
0a08b8e4e9 build "coda-oss-lite" as a VS2022 project (#571)
6677cc38e3 simplify creation of encodes string (#570)
ba62c610c1 Add the 'universal_newlines=True' flag to python Popen calls.
984e4a96ce Fix a bug in waf platform detection.
8f1173f4a6 fix build errors
f21af35b0b Merge branch 'master'
d2aca8d4b5 release 2022-05-03 (#569)
ff55fed596 can't replace all TEST_ASSERT macros with functions (#568)
4db8ada411 restore changes clobbered with merge from "master"
a1f36e1839 Merge branch 'master'
89a636a fix copy/assignment in EncodedString (#567)
c3fe91d latest tweaks to build with C++17 (#566)
a59a51b be sure we use a 64-bit time_t (#565)
1f79fb3 Poly2D::atY() bugfix (#564)
ac53076 Testing to see if windows-2019 works with github actions (#563)
8d0726b Fix a bug in waf platform detection.
80fe8e9f8a Merge branch 'master'
c662b5a Update ReleaseNotes.md
ef4a3bb Release 2022-02-22 (aka 2/22/22) (#562)
33b0f3f6eb Merge branch 'master'
8bd0c8cf4a Merge branch 'main' of github.com:mdaus/coda-oss
0a0e6cf use char16_t on Linux (#560)
7e41b4b5e4 Merge branch 'feature/use-cpp11-code'
fe65bfd fix units for ICC, sys::filesystem (#559)
fc99e4b3e6 recreate from "master"
510317c07a use std::filesystem to "implement" sys::filesystem
895f6c77cd always implement sys::filesystem
0d83ae22fc "units" changes from master
b58173b781 latest from "master" (not quite)
793e3442c8 Squashed commit of the following:
91a729f5a2 re-create from "master"
def9791 update to GSL 4.0.0 (#558)
fe365e5 fix XML validation for UTF-8 (#557)
502e582 support conversion to std::wstring (#556)
e694225 Delete codeql-analysis.yml
45bc6a9 Create codeql-analysis.yml
87d9a7e remove CodeQL
eab5ecb Update build_unittest.yml
8ab12d4 Delete codeql-analysis.yml
9e54209 try running CodeQL as part of build-linux-cmake
de0c506 Create codeql-analysis.yml
0496087 tweaks to build in "coda" (#554)
0ba2423 replace sys::U8string with coda_oss::u8string (#553)
bcee655 add EncodedString class (#552)
c2eecd3 simplify implementation of EncodedStringView (#551)
c1320ef fix 'typename' for other compilers (#550)
ac3b939 tweaks to make "main" build easier (#549)
78da741 remove sys/Optional.h (#548)
f31730a put our std work-arounds in one place (#547)
9b7bb57 Add an EncodedStringView class (#545)
c0e1da5 another batch of tweaks to cleanup compiler warnings, etc. (#546)
0f3bfd9 added missing "virtual", support unique_ptr (#544)
ca32f99 Add option to specify curl installation location. (#501)
2df9c1a allow std::filesystem::path to be used for validation (#543)
2891435 add SinCos for units::Angle (#542)
e430edd Delete log4j as 1) it's old, 2) coda-oss doesn't use it, and 3) remove any questions about security vulnerability (#541)
bb11134 xml.lite tweaks (#540)
955b33e Release 2021_12_13 (#539)
d73d74d xml.lite tweaks (#537)
3a90e25 use more C++11 functionality (#538)
9ca2a0e remove more compiler warnings (#536)
0ec9da1 be sure == and != are in-sync (#535)
9084be3 fix size_t compiler warnings (#534)
abd6469 fix ICC errors (#533)
09cb36f update version number before cutting a new release (#532)
c29e4d2 fix ICC warnings/errors from high-side (#531)
91f8f1c simplify our std:: implementations (#530)
7c633c7 Further reduce use of std::auto_ptr (#529)
d858837 Provide support for creating simple version numbers (#528)
b035825 Merge pull request #527 from mdaus/fix-crypt-h-clash
ffed3d6 Disable encryption support in minizip build and remove crypt.h header
ee2b2bf Merge pull request #525 from mdaus/swig-fix
3c02ff2 Fix config-python prefix issue
6149053 Add new config-python module for SWIG compatibility workarounds
30acf5b mt::transform_async(), mem::SharedPtr, math::SinCos() (#526)
21efd6a Implement better workaround for lack of SWIG support for "final"
60837a6 Revert unneeded changes
0bc994d Fix SWIG path issue for waf build
070f4e9 Update SWIG generated files
f8472b0 Fix SWIG path issues and warnings
e10707f Set minimum SWIG version to 4.0.1
b8cdba5 Fix waf SWIG build issue
2bd0ee3 Enable SWIG in Github waf build
f2b0011 Try fixing SWIG compile issue again
afafabc Fix SWIG compile issue on Linux due to missing macro
7c8d4a8 Add SWIG to the CI flow
4023d72 Regenerate SWIG bindings
1d8c701 Add some compile definitions needed by SWIG for CMake build
e5cc585 Remove some functions which return unique_ptr from SWIG bindings (incompatible).
965a291 Remove "final" specifier from structs bound in SWIG (incompatible)
f1bec56 Merge branch 'master' of https://github.com/mdaus/coda-oss
c01c4d7 do in-line initialization (#524)
fb7230e Update CMakeLists.txt
5dfb056 tweaks for C++17 (#523)
1a7d3ab Merge pull request #515 from mdaus/security-and-conan-updates
d13885d make it easier to create a new Element with the right encoding (#522)
3fb09e7 Merge pull request #359 from mdaus/parseArgUpdate
0d546a8 Tweak some ArgumentParser tests for the ignoreUnknownArguments option
14bd1f2 Merge remote-tracking branch 'origin/master' into parseArgUpdate
cf398c0 tweak code for C++11/C++17 (#521)
2d0322b reduce use of std::auto_ptr (#520)
853320e reduce use of deprecated C++98 code (#519)
4752ba2 Replace some warning pragmas with macros
3268555 Merge remote-tracking branch 'origin/master' into security-and-conan-updates
f0350c0 Merge pull request #518 from mdaus/bugfix/python3.9-related
fc01df0 fix typos in gcc macros
9d356f3 fix gcc impl
8124da7 remove unreachable code
d034b3a clobber warnings from numpy innards
9941a40 macros to disable warnings around system headers
8a725bb Merge pull request #516 from mdaus/mbraswell-enablecpp17-windows
2e7b816 Fixed pragma stuff on gcc
9775bb0 Fixed pragma stuff on gcc
680d3cc Merge branch 'master' of https://github.com/mdaus/coda-oss
8ffd6ed forgot to add "units" to CMakeFiles.txt
0683567 Remove Auto_ptr flag and make disable warnings cross_platform compatible
d62efec Merge branch 'master' of https://github.com/mdaus/coda-oss into mbraswell-enablecpp17-windows
d04042e Merge pull request #517 from mdaus/develop/compiler-warning-helpers
cf5cd16 Fix macro usage on gcc
a88bbcd Macros to narrowly target disabling warnings
c0d5cdf Formatting Changes
be019b4 Formatting Changes
2eb04dc Fixed compiler warnings and added option to compile cpp17 with waf on windows
5d9f27f Refactor coda-oss conan recipe
ce66457 Disable warning for MSVC2017 and earlier
ecfefbf Merge remote-tracking branch 'origin/master' into security-and-conan-updates
8b14798 Merge pull request #514 from mdaus/develop/fix-unused-symbol-errors
1d9a4ec Add conan option to use std::regex instead of pcre
6dd5d44 add required include
4c0ae77 add required include
1873cee parameterize build (somewhat)
c9ef567 fix Release compile error
e6b47e9 fix compiler error
eff205b helper macro to fix unusual targets
342098a Fix CMake build for modules without include files
5625706 Enable cpp17 option for windows builds
98e12b1 Use consistent line endings for *.in template files
d01fea0 Configure coda_add_module to install more file extension types
30823f6 Delete stray file
ac7760b Load dependency targets when loading coda-oss for conan build
14781ca Implement conan build for openjpeg and pcre2 dependencies
9d955ef Exclude unsupported XML backend wrappers from CMake build to remove warnings
1e8c9b2 Merge remote-tracking branch 'origin/master' into security-and-conan-updates
772d804 Implement conan build for libjpeg dependency
98b653d Implement conan build for xerces-c dependency
11323e8 Implement conan build for zlib dependency
d0e6bf2 Improve conan test_package
a03e129 Fix uninitialized member variable warning in mt::AbstractTiedThreadPool
c7bb47b Remove member variable duplicated in derived class io::ToggleOutputStream
0838ac2 Use consistent line endings for conan recipes and CMake files.
2768e5f Update libjpeg to v9d
d75f55b Update zlib to 1.2.11
ca2f84c Fix warning in GSL for MSVC 2015 and earlier
1babd19 Fix warning in thread tests for MSVC
2f17632 Fix warning in except module for Visual Studio 2015 and earlier
a485bf6 Fix BIGENDIAN redefinition warning
59543e4 Disable warning in dbi for MSVC 2017 and earlier
b4b2128 Fix warnings in numpyutils for MSVC 2017 and earlier
2b179b6 Fix integer overflow issue
898151a Hook up simple "units" (#513)
4d6beee Merge pull request #511 from mdaus/develop/horizontal-improved-numerical-precision
c1878b2 Fix for numerical precision issues surrounding horizontal lines
7d1442c Merge pull request #510 from mbraswell/fix-testnumelements-build
58fc85f Whitespace change to trigger workflow
ab74026 Fix wscript to successfully build test_num_elements
323283c Merge pull request #509 from mbraswell/develop-mbraswell-cpp17
16a5502 Added option to enable cpp17
b0625cf tweak debug stuff (#508)
8455494 fix RowCol casting (#507)
01fbb5f Get std::u8string working right with C++20 (#506)
df9413e more "noexcept" for fewer code-analysis diagnostics (#505)
e6219f9 reduce compiler warnings/code-analysis diagnostics (#504)
4c9ea0e tweaks for VS2019 16.10 (#503)
0d8ea07 reduce compiler warnings (#502)
625b8b5 reduce compiler warnings (#500)
3795758 get rid of more compiler warnings/code-analysis diagnostics (#499)
427f91b reduce compiler-warnings and code-analysis diagnostics (#498)
c82dd9e cleanup compiler and code-analysis diagnistics (#496)
b5105b5 reduce compiler warnings (#495)
e0099cc Develop/compiler optimizations (#494)
0eeb3f9 tweaks to python wrappers made in "nitro" (#492)
5f91f70 fix printf() format string (#491)
55b855a Delete codeql-analysis.yml
603c192 Update codeql-analysis.yml
f306979 Update codeql-analysis.yml
4a1f78f Create codeql-analysis.yml
3c80a65 add back coda_oss::filesystem::path (#490)
eaea659 tweak how std:: features are exposed (#489)
0492f0d simplify code exposing std:: routines (#488)
e5f3d77 remove code-analysis diagnostics (#485)
5be599e make HOME and USERPROFILE the same (#484)
62b22ae cleanup more compiler warnings (#483)
c32ec7d add unit-tests for env-var editing (#482)
311aea4 allow an environment-variable to be "edited" during expansion (#481)
bbcab13 static_assert is C++11, don't use it when checking for C++11 (#480)
068562f fix glitches in expandEnviromentVariables() (#479)
30ed1d9 produce a new Path::expandEnviromentVariables() function (#478)
074a873 remove compiler warnings (#477)
e29f654 latest C++17 tweaks (#476)
c4e681b tweak code when wchar_t is a built-in type (#474)
8449ac2 wchar_t might not be a built-in type on old systems (#473)
a62bdb3 add operator= to sys::Optional (#472)
8e310a7 use compiler-provided macros to determine features (#470)
88405c8 "constexpr" can be hard to get right with older compilers; don't even try (#471)
b195ab3 need at least VS2017 to use the real GSL (#469)
2978f91 tweaks to build with older compilers (#468)
7235b89 The (old) version of SWIG we're using doesn't like certain C++11 features. (#464)
cccde7f only look in the Win1252->UTF-8 map as a last resort (#467)
3db0974 get rid of more compiler warnings (#465)
5e0d2e8 get rid of "char8_t" compiler warning (#463)
d710bc6 make getValue() easier to use (#462)
f5a9284 make getElement*() be consistent for both 0 and >1 (#461)
88be6db consistently add C++14/17/20 library features (#459)
59c3a7e use coda_oss:: as a drop-in replacement for std:: (#458)
35de452 use sys::Filesystem::path rather than std::string (#457)
cace666 make sys::Filesystem::path better conform to std::filesystem::path (#456)
f395edc remove ambiguous overloads w/C++17 (#455)
eac4371 use newly added sys::Optional<> to manage "encoding" (#454)
243ef5e don't derive from std::iterator (#453)
a48b011 Arguments should be "const&" to prevent C4866 (#452)
878bff9 provide std::span (#451)
81727c4 remove newly added a new pure virtual as that's a breaking change (#450)
93cf0f0 main -> master (#449)
5af37a7 be sure code compiles with C++17 (#448)
82b5aec build with C++17 (#407)
6ffb888 reduce compiler warnings (#439)
9137dda GSL (Guideline Support Library) from https://github.com/Microsoft/GSL (#423)
bc5552c update to xerces-c-3.2.3 (#409)
6fe09e1 update to openjpeg-2.3.1 (#417)
6405c0c reduce differences in #407 (#438)
2987bbf tweak how std::filesystem is enabled (#437)
8fd3c2f tweak how std::endian is enabled (#436)
138372c more straight-forward reduction of std::auto_ptr (#435)
f13c7ce straight-forward reduction of std::auto_ptr (#434)
d243b08 add mem::auto_ptr for transition to C++17 (#432)
54ed521 allow clients to specify custom toType and toString (#431)
7f90aab remove trailing underscore from macro (#429)
999e490 with C++11, several sys typedefs are the same on both Windows & *nix (#427)
6f075b1 add sys::Byte (#426)
92221bd allow except::Throwable to derive from std::exception (#421)
a8f52d0 reduce compiler warnings (#424)
63ea20a #including <bit> w/C++17 generates warnings (#408)
10ef060 reduce compiler warnings (#405)
cf233fd forgot Conf.cpp changes for sys::Endian (#403)
cc53b18 fix several compiler warnings/code-analysis diagnostics (#404)
1db3751 implmeent sys::Endian from C++20 (#402)
f042cd6 support std::filesystem if desired (#400)
4895a9f WIN32 is old, but existing code might still use it; _WIN32 is better (#398)
e2a62f8 make it easier to use xml.lite (#396)
1059b7d allow for explicit use of a UTF-8 string (#395)
27de8b8 Optionally record how std::string is encoded when manipulating XML (#378)
e0018ce implement some <filesystem>-like routines until we can use C++17 (#388)
cafb236 Merge pull request #363 from mdaus/feature/fix-compiler-warnings
6a78bec use the existing sys::ubyte rather than making our own pre-C++17 std::byte
14c9fc4 fix a couple of G++ compiler warnings via static_cast<>
e596a60 std::numeric_limits<T>::epsilon() can be "constexpr"
78b0f6b another try at removing the compiler warning from tiff::split()
8e1de21 fixed typo; added a few nots about why we're not using strncpy()
fed3ba8 retore previous tiff::split() code as the change got rid of the compiler warning but wasn't portable
98a5896 get rid of g++ strncpy() warning
798f847 don't use memset(0) with C++ objects
7f697d0 casting result of system() to void doesn't get rid of compiler warning
d55a849 remove new g++ compiler warnings in WSL
d0aaa29 Merge pull request #361 from mdaus/feature/fix-compiler-warnings
cc62e86 fix compiler warnings
d45c1f9 Updates based on peer review comments which include changing ostream to pointer, adding a couple of more tests, and updating all auto_ptr to unique_ptr in unit test.
fb12ba1 Update ArgumentParser to use a stream as an argument if the ignore unknown argument flag is set to true.
536d2b0 Added ability to ignore unknown arguments in the ArgumentParser.
27288f4 Merge pull request #358 from mdaus/conan-options
fd5e1ee Expose additional CMake options in conan recipe
c972161 Remove unneeded CMake function

git-subtree-dir: externals/coda-oss
git-subtree-split: f10fa2009c1c2c9a442cedc02f7894e3440da48c
  • Loading branch information
Dan Smith authored and Dan Smith committed Nov 9, 2022
1 parent 1262718 commit ca59f00
Show file tree
Hide file tree
Showing 1,381 changed files with 547,113 additions and 17,043 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# prevent git from changing line endings for conan recipes and CMake files,
# since they are hashed to produce a conan recipe revision ID
conanfile.py text eol=lf
CMakeLists.txt text eol=lf
*.cmake text eol=lf
*.in text eol=lf
106 changes: 84 additions & 22 deletions .github/workflows/build_unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,62 +3,124 @@ name: build_unittest
on: [push]

jobs:
build-windows:
name: Windows
runs-on: [windows-latest]

build-cmake-windows:
strategy:
matrix:
os: [windows-latest]
python-version: ['3.7']
name: ${{ matrix.os }}-${{ matrix.python-version }}-CMake
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: '3.7'
python-version: ${{ matrix.python-version }}
- name: Install python dependencies
run: |
pip install numpy
- name: configure
run: |
ls env:
mkdir target
cd target
cmake .. -DCMAKE_INSTALL_PREFIX=installWindows-Github -DPYTHON_VERSION="3.7"
mkdir target-Release
cd target-Release
cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=${{ matrix.python-version }} -DENABLE_SWIG=ON
cd ..
mkdir target-Debug
cd target-Debug
cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DENABLE_PYTHON=OFF
- name: build
run: |
cd target
cd target-Release
cmake --build . --config Release -j
cd ..
cd target-Debug
cmake --build . --config Debug -j
- name: install
run: |
cd target
cd target-Release
cmake --build . --config Release --target install
cd ..
cd target-Debug
cmake --build . --config Debug --target install
- name: test
run: |
cd target
cd target-Release
ctest -C Release
cd ..
cd target-Debug
ctest -C Debug
build-linux:
name: Linux
runs-on: [ubuntu-latest]

build-linux-cmake:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ['3.7']
name: ${{ matrix.os }}-${{ matrix.python-version }}-CMake
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: '3.7'
python-version: ${{ matrix.python-version }}
- name: Install python dependencies
run: |
pip install numpy
- name: configure
run: |
env
which python
mkdir target
cd target
cmake .. -DCMAKE_INSTALL_PREFIX=installLinux-Github -DPYTHON_VERSION=3.7
cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=${{ matrix.python-version }} -DENABLE_SWIG=ON
- name: build
run: |
cd target
cmake --build . -j
# "-j" spawns too many processes causing GCC to crash
cmake --build . -j 12
- name: install
run: |
cd target
cmake --build . --target install
- name: test
run: |
cd target
ctest
ctest
build-waf:
strategy:
matrix:
os: [ubuntu-latest, windows-2019]
python-version: ['3.7']
debugging: ['--enable-debugging', '']
name: ${{ matrix.os }}-${{ matrix.python-version }}-waf
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: configure_with_swig
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
pip install numpy
mkdir install${{ matrix.os }}Waf-Github
python waf configure --prefix="$PWD/install${{ matrix.os }}Waf-Github" --enable-swig ${{ matrix.debugging }}
- name: configure_without_swig
if: ${{ matrix.os == 'windows-2019' }}
run: |
pip install numpy
mkdir install${{ matrix.os }}Waf-Github
python waf configure --prefix="$PWD/install${{ matrix.os }}Waf-Github" ${{ matrix.debugging }}
- name: build
run: |
python waf build
- name: install
run: |
python waf install
- name: test
run: |
python waf install --alltests
89 changes: 54 additions & 35 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,35 +1,54 @@
*.swp
*~
*.pyc
__pycache__/
# Build artifacts

install/
target/
test_package/build/

# Waf
.waf-*
waf-*
.waf3-*
waf3-*
.lock-waf*
build/waf*/

# Eclipse
.project
.cproject

# Drivers
modules/drivers/fftw/fftw-2.1.5/
modules/drivers/jpeg/jpeg-9/
modules/drivers/j2k/openjpeg/openjpeg-2.3.0_mod/
modules/drivers/pcre/pcre2-10.22/
modules/drivers/uuid/e2fsprogs-1.40-uuid/
modules/drivers/xml/xerces/xerces-c-3.1.1/
modules/drivers/zlib/zlib-1.2.7/

# VS
.vs/
project.sln
.depproj/
*.swp
*~
*.pyc
__pycache__/
# Build artifacts

install/
install-*/
target/

# Conan
modules/drivers/**/build
test_package/build/

# CMake
_deps/
CMakeCache.txt
CMakeFiles/
*_config.h
Makefile
modules/**/Makefile
out/

# Waf
.waf-*
waf-*
.waf3-*
waf3-*
.lock-waf*
build/waf*/

# Eclipse
.project
.cproject

# Drivers
modules/drivers/fftw/fftw-2.1.*/
modules/drivers/jpeg/jpeg-9/
modules/drivers/jpeg/jpeg-9d/
modules/drivers/j2k/openjpeg/openjpeg-2.3.*_mod/
modules/drivers/pcre/pcre2-10.*/
modules/drivers/uuid/e2fsprogs-1.*-uuid/
modules/drivers/xml/xerces/xerces-c-*/
modules/drivers/zlib/zlib-1.2.*/

# VS
.vs/
project.sln
.depproj/
*.tlog
**/x64/
*.vcxproj.user

CMakeSettings.json
16 changes: 13 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@

cmake_minimum_required(VERSION 3.14)

set(TARGET_LANGUAGE c++)
set(CMAKE_CXX_STANDARD 14)
set(CXX_STANDARD_REQUIRED true)

project(coda-oss)

set(CMAKE_CXX_STANDARD 11)
if (EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
# build and package with conan
include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
conan_basic_setup()

include("${CMAKE_BINARY_DIR}/conan_paths.cmake")
endif()

if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss)
# this is the top level project
Expand All @@ -16,14 +26,14 @@ if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss)
# set warning level to /W3
string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
string(REGEX REPLACE "/W[0-4]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
add_compile_options(/W3 /wd4290 /wd4512)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
add_compile_options(/std:c++14)
elseif (UNIX)
add_compile_options(
-Wno-deprecated
-Wno-unused-value
-Wno-unused-but-set-variable
)
add_compile_options(-std=c++14)
endif()

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
Expand Down
61 changes: 61 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
```
_________________________
| ____ _||_ ___ __ |
| /___ \/_||_\| __\/ \ |
| // \// || \|| \\ _ \ |
| || [===||===] ||(_)| |
| || _|| || ||| ||__ | |
| \\ _/ |\_||_/||__/|| || |
| \___/ \_||_/|___/|| || |
|__________||_____________|
```
# coda-oss Release Notes

## [Release 2022-11-04](https://github.com/mdaus/coda-oss/releases/tag/2022-11-04)
* "Cut" from [main](https://github.com/mdaus/coda-oss/tree/main), not *master*.
* The [HDFGroup](https://hdfgroup.org/)s [HDF5 library](https://github.com/HDFGroup/hdf5) is built
and installed; a simple (and very incomplete!) wrapper is provided, this is at the "hello world!" stage.
* A few **cli** routines have been tweaked to make unit-testing easier.
* Utilitiy routines for finding various files when unit-testing.
* Removed C++14 work-arounds needed in C++11. Legacy C++ exception specificatons removed.
* Rebuild `waf` for FIPS error; added more debug options.

## [Release 2022-08-30](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30)
* XML is now always written as UTF-8; the code will still try to read Windows-1252.
* `Uri`s are no longer validated by default.
* Minor tweaks from other projects.
* Final C++11 release 🤞🏻; future releases will be C++14 from [main](https://github.com/mdaus/coda-oss/tree/main).

## [Release 2022-08-02](https://github.com/mdaus/coda-oss/releases/tag/2022-08-02)
* remove *Expat* and *libXML* modules and support in **xml.lite**; only *Xerces* was actively used.
* fix `waf` to work-around FIPS warning because of insecure *md5* hashing.
* tweak `str::EncodedStringView` and `str::EncodedString` for
[future XML changes](https://github.com/mdaus/coda-oss/tree/feature/always-write-xml-as-utf8).

## [Release 2022-06-29](https://github.com/mdaus/coda-oss/releases/tag/2022-06-29)
* remove **modules/drivers/boost** as it was empty (and unused);
**modules/c++/serialize** depended on boost, so it has also been removed.
* Update to [zlib 1.2.12](https://www.zlib.net/zlib-1.2.12.tar.gz),
["Due to the bug fixes, any installations of 1.2.11 should be replaced with 1.2.12."](https://www.zlib.net/)
* Build most code in Visual Studio 2022
* Removed more compiler warnings
* Begin work on `CODA_OSS_API` (needed for building a shared-library/DLL)
* Add `run1D()` method to `mt::GenerationThreadPool`

## [Release 2022-05-03](https://github.com/mdaus/coda-oss/releases/tag/2022-05-03)
* Fixed a bug in `Poly2D::atY()`; improved `flipXY()` behavior.
* Implement [std::filesystem::file_size()](https://en.cppreference.com/w/cpp/filesystem/file_size).
* use `inline` functions for `TEST_` macros
* force use of [64-bit `time_t`](https://en.wikipedia.org/wiki/Year_2038_problem)
* more routines now support a `std::span` overload; e.g., `io::InputStream::read()`.

## [Release 2022-02-22](https://github.com/mdaus/coda-oss/releases/tag/2022-02-22)
* new `EnocdedString` and `EncodedStringView` to manage strings in different encodings
* XML containing UTF-8 characters can now be validated
* Update to [GSL 4.0.0](https://github.com/microsoft/GSL/releases/tag/v4.0.0)
* our implementation of `std` stuff is all in the `coda_oss` namespace
* old, unused **log4j.jar** deleted to remove any questions about the security vulnerability

## [Release 2021-12-13](https://github.com/mdaus/coda-oss/releases/tag/2021-12-13)
* Try hard to parse XML encoded in various ways
* Simplify XML element creation for common idioms
43 changes: 43 additions & 0 deletions UnitTest/CppUnitTestAssert.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#include "pch.h"
#include "TestCase.h"

#include "str/EncodedStringView.h"

using namespace Microsoft::VisualStudio::CppUnitTestFramework;

// EQUALS_MESSAGE() wants ToString() specializations (or overloads) for our types, which is a nusiance.
// This hooks up our existing str::toString() into the VC++ unit-test infrastructure

// C++ hack to call private methods
// https://stackoverflow.com/a/71578383/8877

using FailOnCondition_t = void(bool condition, const unsigned short* message, const __LineInfo* pLineInfo); // declare method's type
using GetAssertMessage_t = std::wstring(bool equality, const std::wstring& expected, const std::wstring& actual, const wchar_t *message); // declare method's type
template <FailOnCondition_t fFailOnCondition, GetAssertMessage_t fGetAssertMessage>
struct caller final // helper structure to inject call() code
{
friend void FailOnCondition(bool condition, const unsigned short* message, const __LineInfo* pLineInfo)
{
fFailOnCondition(condition, message, pLineInfo);
}

friend std::wstring GetAssertMessage(bool equality, const std::wstring& expected, const std::wstring& actual, const wchar_t *message)
{
return fGetAssertMessage(equality, expected, actual, message);
}
};
template struct caller<&Assert::FailOnCondition, &Assert::GetAssertMessage>; // even instantiation of the helper

void FailOnCondition(bool condition, const unsigned short* message, const __LineInfo* pLineInfo); // declare caller
void test::Assert::FailOnCondition(bool condition, const unsigned short* message, const __LineInfo* pLineInfo)
{
::FailOnCondition(condition, message, pLineInfo); // and call!
}

std::wstring GetAssertMessage(bool equality, const std::wstring& expected, const std::wstring& actual, const wchar_t *message); // declare caller
std::wstring test::Assert::GetAssertMessage(bool equality, const std::string& expected, const std::string& actual, const wchar_t *message)
{
const str::EncodedStringView vExpected(expected);
const str::EncodedStringView vActual(actual);
return ::GetAssertMessage(equality, vExpected.wstring(), vActual.wstring(), message); // and call!
}
Loading

0 comments on commit ca59f00

Please sign in to comment.