Skip to content

feat: Amalgam build#166

Merged
tmathern merged 55 commits into
mainfrom
vNext-amalgam
Mar 4, 2026
Merged

feat: Amalgam build#166
tmathern merged 55 commits into
mainfrom
vNext-amalgam

Conversation

@tmathern

@tmathern tmathern commented Feb 27, 2026

Copy link
Copy Markdown
Collaborator
  • For easy release/revert, same as vNext but split files. Ready for release/merging, squashes all amalgam build investigations into 1 branch/commit.

tmathern and others added 30 commits November 14, 2025 15:30
* fix: Update C2PA version to 0.70.0

* fix: Bump project version to 0.13.0

* fix: Update c2pa-rs version

* fix: Nump c2pa-rs c2pa-c-ffi version to 0.71.2
* fix: Move semantics

* fix: Undo some paranoia

* fix: COmment
* fix: Move semantics

* fix: Undo some paranoia

* fix: COmment

* fix: More move semantics
* Update C2PA version to 0.74.0

* fix: Update test

* fix: FOmrat
* Update C2PA version to 0.75.3

* fix: Update C2PA version to 0.75.4
* fix: Update CmakeList

* fix: Update comment

* Clarify compatibility comment for json library

Updated comment to clarify compatibility with older platforms.

* fix: Note

* feat: Expand OS matrix in CI workflow (#132)

* feat: Expand OS matrix in CI workflow

* Update CI workflow OS matrix

Removed 'windows-2022' and 'ubuntu-slim' from the OS matrix.

* Replace filesystem path usage with string conversion

* Add filesystem namespace for path handling

* Fix test file path for cross-platform compatibility

* Update CI workflow to include windows-2022

* Remove namespace alias for filesystem in tests

Remove unnecessary namespace alias for filesystem.

* Update CI workflow OS matrix

Removed 'windows-2022' from the OS matrix in CI workflow.

* fix: FIx shadowing (#133)

Added new constructor for Signer to take ownership of a signer pointer and updated documentation for clarity.

* fix: Additional build flags (#134)

* fix: FIx shadowing

Added new constructor for Signer to take ownership of a signer pointer and updated documentation for clarity.

* feat: Enhance MSVC compiler and linker options

Added additional compiler and linker options for MSVC.

* fix: Enhance compiler and linker options for c2pa_cpp *nix

Added additional compiler and linker options for c2pa_cpp to enhance security and compatibility.

* fix: Move linker flags -Wl,-z,relro and -Wl,-z,now to linking

Removed linker flags for relro and now.

* feat: Adjust linker options for different platforms

* fix: Refactorings and additional checks (#135)

* fix: Refactor null checks and improve exception handling

* Refactor Reader constructor to manage stream lifetime

* Update c2pa.cpp

* Replace string with std::string in c2pa.cpp

* Change type from ofstream to ostream in flusher

* Change member functions to const in c2pa.hpp

* Fix reserve_size function declaration syntax

* Fix supported_mime_types method signature

* Change reserve_size method to non-const

* Update c2pa.hpp

* Update c2pa.cpp

* fix: Use EINVAL where it was missed

* fix: FOrmat
* Update CMakeLists.txt

* fix: v0.75.15

* fix: Retrigger all jobs

* Update CMakeLists.txt
tmathern and others added 15 commits February 12, 2026 16:43
* Update CMakeLists.txt

* fix: One test is actually invalid

* fix: A few other tests are invalid

* fix: no archive and embeddable mix
* fix: Docs

* fix: Clean up docs

* fix: Clean up docs

* fix: Clean up docs

* fix: Typos in header docs

* fix: Typos 2

---------

Co-authored-by: Tania Mathern <tania.mathern@gmail.comn>
…urce_path (#161)

* fix: utf8

* fix: Add a few tests

* fix: Add a few tests 2

* fix: Add a few tests 3

* fix: Add a few tests 3

* fix: Add a few tests 3

* fix: Add a few tests 3

* fix: Add a few tests 3

---------

Co-authored-by: Tania Mathern <tania.mathern@gmail.comn>
* fix: Initial versions

* fix: Settings

* fix: Context

* Update settings.md

* Update context.md

* Update context.md

* Update context.md

* minor copy edits

* Copy edit

* Remove some duplication, add xrefs

* clean up edits

* Final cleanup edits

---------

Co-authored-by: Tania Mathern <tania.mathern@gmail.comn>
Co-authored-by: Rand McKinney <crandmck@yahoo.com>
* fix: Add a file size limit

* fix: Enforce more null checks

* fix: Enforce more null checks 2

* fix: Typos

* fix: Typos

* fix: Typos

* fix: Typos

* fix: Typos

* fix: Typos

* fix: Typos

* fix: Typos

---------

Co-authored-by: Tania Mathern <tania.mathern@gmail.comn>
* fix: Refactor

* Delete REFACTORING_PLAN.md

* fix: Refactor

* fix: Refactor

---------

Co-authored-by: Tania Mathern <tania.mathern@gmail.comn>
* fix: Workin stores

* Update working-stores.md

* Update working-stores.md

* Update working-stores.md

* Update working-stores.md

* Update working-stores.md

* Update working-stores.md

* Copy edits, add xrefs

* Remove incomplete section

* Misc edits and add some more links, add a bit to Mermaid diagram

* Add div to xrefs not needed in doc site, other small tweaks

---------

Co-authored-by: Tania Mathern <tania.mathern@gmail.comn>
Co-authored-by: Rand McKinney <crandmck@yahoo.com>
* fix: File split

* fix: Let's try this

* fix: Add a script

* fix: Build hack

* fix: Amalgam build

* fix: Amalgamate 2

* fix: fix headers

* fix: Scripts location tweak

* fix: Amalgam build

* fix: Amalgam build 2

* fix: Amalgam build with shared lib

* fix: Amalgam build with shared lib 2

* fix: Update CMakeLists.txt (#155)

* fix: Update CMakeLists.txt

* Update CMakeLists.txt

* Update c2pa_internal.hpp

* Update CMakeLists.txt

* fix: Docs

* docs: Update amalgam-build.md

Removed project version and Rust library version details from the amalgam build documentation.

* fix: Refine amalgam-build.md

* fix: License header

---------

Co-authored-by: Tania Mathern <tania.mathern@gmail.comn>
@tmathern tmathern self-assigned this Feb 27, 2026
@tmathern tmathern changed the title feat: Amalgam build (#151) feat: Amalgam build Feb 27, 2026
@tmathern

Copy link
Copy Markdown
Collaborator Author

Review here: #151
Parking in squashed branch for future release gymnastics/revert by pointing from vNext to vNext-amalgam and vice-versa.

@tmathern tmathern changed the base branch from vNext to main March 3, 2026 17:42
@tmathern tmathern changed the base branch from main to vNext March 3, 2026 17:44
@tmathern tmathern changed the base branch from vNext to main March 3, 2026 17:45
@tmathern tmathern merged commit 065d4a4 into main Mar 4, 2026
23 of 25 checks passed
@tmathern tmathern deleted the vNext-amalgam branch March 5, 2026 00:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant