Skip to content

Commit

Permalink
Upgrade miniz to v3.0 (unreleased, using git commit on master) (#688)
Browse files Browse the repository at this point in the history
* Updated miniz to v2.2

Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com>

* Integrated cppms patches and updated README

Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com>

* Moved builds for each configuration into their own folders

Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com>

* Upgraded to more recent version of miniz with utf8 fixes already

- Fixed incorrect porting of cppms-specific change

- Updated README and patch file

Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com>

* Another attempt at getting the merge right

Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com>

* Removing ctest value for -j for gcc, oops

* Another (another) attempt at porting changes

* still using the v3.0.0 (unreleased) version from their
  master branch

* fixes (I think) the macOS performance issue (due to bad porting)

Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com>

* [ci skip] Added missing '/' in patch notes

[ci skip]

Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com>
  • Loading branch information
achristoforides committed Jul 1, 2022
1 parent 703f326 commit 31a12d8
Show file tree
Hide file tree
Showing 5 changed files with 8,664 additions and 4,259 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build_and_test_nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ jobs:
run: ctest -VV -S ${{github.workspace}}/cmake/usCTestScript_github.cmake
env:
BUILD_CONFIGURATION: ${{matrix.buildconfiguration}}
BUILD_DIR: ${{github.workspace}}/build_${{matrix.buildconfiguration}}

- name: Code Coverage
run: bash <(curl -s https://codecov.io/bash) -X gcov -s ${{github.workspace}}/build
run: bash <(curl -s https://codecov.io/bash) -X gcov -s ${{github.workspace}}/build_${{matrix.buildconfiguration}}
11 changes: 8 additions & 3 deletions third_party/README
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,15 @@ Patches
miniz
-----

Public Domain
MIT License (GitHub) or Public Domain

https://github.com/richgel999/miniz
(formerly https://code.google.com/p/miniz/)
76b3a872855388c735c564905da030f26334f3b3

https://code.google.com/p/miniz/
v1.15 r4
Note: miniz.c and miniz.h created by downloading the source code
and building it using CMake. This was necessary as a v3.0
release of miniz has not occurred yet.

Patches

Expand Down

0 comments on commit 31a12d8

Please sign in to comment.