build: Integrates prebuilt library release workflow

.github/workflows/library-release.yml

@@ -4,7 +4,7 @@ on:
   push:
     tags:
       - 'c2pa-v*' # Trigger on version tags (e.g., v1.0.0)
-  workflow_dispatch: # Allow manual triggering of the workflow
+  workflow_dispatch:
 
 jobs:
   build:
@@ -13,16 +13,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest, ubuntu-latest, windows-latest ]
-        rust_version: [ stable ]
-        experimental: [ false ]
         include:
           - os: macos-latest
             target: aarch64-apple-darwin
-
+          - os: ubuntu-latest
+            target: aarch64-unknown-linux-gnu
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-
           - os: windows-latest
             target: x86_64-pc-windows-msvc
 
@@ -33,84 +30,54 @@ jobs:
       - name: Set up Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
 
-      - name: Setup Strawberry Perl
-        if: matrix.os == 'windows-latest'
-        uses: shogo82148/actions-setup-perl@v1
-        with:
-          perl-version: '5.32'
-          distribution: 'strawberry'
-
-      # Install Locale::Maketext::Simple only on Windows with explicit paths
-      - name: Install Locale::Maketext::Simple and configure paths
+      - name: Build Windows release
         if: matrix.os == 'windows-latest'
-        run: |
-          cpanm --verbose Locale::Maketext::Simple
-          # List installed modules to confirm installation
-          cpanm --info Locale::Maketext::Simple
-          # Display Perl's include paths
-          perl -e "print join(\"\n\", @INC);"
-          # Create a local copy in the expected path
-          perl -MLocale::Maketext::Simple -e "print \$INC{'Locale/Maketext/Simple.pm'}" > module_path.txt
-          $MODULE_PATH = Get-Content -Path module_path.txt
-          echo "Module found at: $MODULE_PATH"
-
-          # Create symbolic links to the modules in paths that are being checked
-          # Set environment variable for subsequent steps
-          echo "PERL5LIB=$env:PERL5LIB;D:\a\c2pa-rs\c2pa-rs\target\x86_64-pc-windows-msvc\release\build\openssl-sys-def693d178636927\out\openssl-build\build\src\util\perl" | Out-File -FilePath $env:GITHUB_ENV -Append
         shell: pwsh
-
+        run: |
+          ./setup-rust-openssl.ps1
       - name: Build release
+        if: matrix.os != 'windows-latest'
         run: make release
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os }}-${{ matrix.target }}-release
-          path: target/artifacts/*
+          name: release-artifacts-${{ matrix.os }}-${{ matrix.target }}
+          path: target/artifacts/
 
   release:
     needs: build
+    if: always()
     runs-on: ubuntu-latest
     steps:
       - name: Download build artifacts
         uses: actions/download-artifact@v4
         with:
-          path: artifacts
+          pattern: release-artifacts-*
+          path: .
+          merge-multiple: true
 
       - name: List downloaded artifacts
-        run: find . -type f | sort
-
+        run: ls -lh
+
+      - name: Extract tag_name from zip file
+        id: extract_tag
+        run: |
+          ZIP=$(ls c2pa-v*-*.zip | head -n1)
+          TAG_NAME=$(echo "$ZIP" | sed -E 's/^(c2pa-v[0-9]+\.[0-9]+\.[0-9]+)-.*\.zip/\1/')
+          echo "Found tag: $TAG_NAME"
+          echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
+
       - name: Create Release
         id: create_release
         uses: softprops/action-gh-release@v1
         with:
-          files: |
-            ./ubuntu-latest-x86_64-unknown-linux-gnu-release/ubuntu-latest-x86_64-unknown-linux-gnu-release.tar.gz
-            ./windows-latest-x86_64-pc-windows-msvc-release/windows-latest-x86_64-pc-windows-msvc-release.zip
-            ./macos-latest-x86_64-apple-darwin-release/macos-latest-x86_64-apple-darwin-release.tar.gz
+          tag_name: ${{ steps.extract_tag.outputs.tag_name }}
+
+          files: ./*
           draft: false
-          prerelease: false
+          prerelease: true
           generate_release_notes: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Create GitHub Release legacy
-        id: create_release_legacy
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref_name }}
-          release_name: Release ${{ github.ref_name }}
-          draft: true
-          prerelease: true
-
-      - name: Upload Release Assets old
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          for file in artifacts/*; do
-            echo "Uploading $file..."
-            gh release upload "${{ github.ref_name }}" "$file" --clobber
-          done
-

Cargo.toml

@@ -9,6 +9,13 @@ members = [
     "sdk",
 ]
 
+# members in this workspace can share this version setting
+[workspace.package]
+version = "0.51.1"
+
+[workspace.dependencies]
+c2pa = { path = "sdk", default-features = true }
+
 [profile.release]
 strip = true  # Automatically strip symbols from the binary. 
 opt-level = 3

Makefile

@@ -5,12 +5,12 @@ ifeq ($(OS),Windows_NT)
 	PLATFORM := win
 else
 	UNAME := $(shell uname)
-    ifeq ($(UNAME),Linux)
-        PLATFORM := linux
-    endif
-    ifeq ($(UNAME),Darwin)
-        PLATFORM := mac
-    endif
+	ifeq ($(UNAME),Linux)
+		PLATFORM := linux
+	endif
+	ifeq ($(UNAME),Darwin)
+		PLATFORM := mac
+	endif
 endif
 
 check-format:
@@ -22,7 +22,7 @@ clippy:
 	cargo clippy --features="file_io" --all-targets -- -D warnings
 
 test-local:
-	cargo test --features="file_io, fetch_remote_manifests, add_thumbnails" --all-targets
+	cargo test --features="file_io, fetch_remote_manifests, add_thumbnails, v1_api" --all-targets
 # Builds and views documentation
 
 test-wasm:

c_api/Cargo.toml

@@ -1,26 +1,26 @@
 [package]
-name = "c2pa-c"
-version = "0.49.5"
+name = "c_api"
+version.workspace = true
 edition = "2021"
 authors = ["Gavin Peacock <gpeacock@adobe.com>"]
 license = "MIT OR Apache-2.0"
 
 [lib]
+name = "c2pa_c"
 crate-type = ["cdylib"]
 
 [features]
-default = ["json_api", "openssl"]
-json_api = ["c2pa/v1_api"]
-openssl = ["c2pa/openssl"]
 rust_native_crypto = ["c2pa/rust_native_crypto"]
+file_io = ["c2pa/file_io"]
 
 [dependencies]
 tokio = { version = "1.36", features = ["rt-multi-thread","rt"] }
-c2pa = { path = "../sdk", version = "0.53.0", features = [
+c2pa = { workspace = true , features = [
+
     "file_io",
     "add_thumbnails",
     "fetch_remote_manifests",
-], default-features = false }
+]}
 scopeguard = "1.2.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -32,3 +32,4 @@ tempfile = "3.7.0"
 
 [build-dependencies]
 cbindgen = "0.28"
+

c_api/Makefile

@@ -8,31 +8,30 @@ ifeq ($(OS),Windows_NT)
 	PLATFORM := win
 else
 	UNAME := $(shell uname)
-    ifeq ($(UNAME),Linux)
-        PLATFORM := linux
-    endif
-    ifeq ($(UNAME),Darwin)
-        PLATFORM := mac
-    endif
+	ifeq ($(UNAME),Linux)
+		PLATFORM := linux
+	endif
+	ifeq ($(UNAME),Darwin)
+		PLATFORM := mac
+	endif
 endif
 
-TARGET_DIR := $(realpath ../target)
+TARGET_DIR := ../target
 
 # Helper function to create a zip file
 define make_zip
-    echo "Reading version from $(1)/c2pa.h"; \
-    if [ "$(PLATFORM)" = "win" ]; then \
-        VERSION=$$(findstr "^// Version:" $(1)/c2pa.h | awk -F": " "{print \$$2}"); \
-    else \
-        VERSION=$$(grep '^// Version:' $(1)/c2pa.h | sed 's/^\/\/ Version: //'); \
-    fi; \
-    ZIP_NAME=$(TARGET_DIR)/artifacts/c2pa-v$${VERSION}-$(2).zip; \
-    echo "Creating zip file: $${ZIP_NAME}"; \
-    mkdir -p $(TARGET_DIR)/artifacts $(1)/include $(1)/lib; \
-    cp $(1)/c2pa.h $(1)/include/; \
-    cp $(1)/libc2pa_c.* $(1)/lib/; \
-    cd $(1) && zip -r $${ZIP_NAME} include lib; \
-    echo "Zip file created: $${ZIP_NAME}"
+	set -e; \
+	echo "Reading version from $(1)/c2pa.h"; \
+	if [ "$(PLATFORM)" = "win" ]; then \
+		VERSION=$$(findstr "^// Version:" $(1)/c2pa.h | awk -F": " "{print \$$2}"); \
+	else \
+		VERSION=$$(grep '^// Version:' $(1)/c2pa.h | sed 's/^\/\/ Version: //'); \
+	fi; \
+	mkdir -p $(TARGET_DIR)/artifacts $(1)/include $(1)/lib; \
+	cp $(1)/c2pa.h $(1)/include/; \
+	cp $(1)/libc2pa_c.* $(1)/lib/; \
+	(cd $(1) && zip -9 -r ../../artifacts/c2pa-v$${VERSION}-$(2).zip include lib); \
+	echo "Zip file created: $(TARGET_DIR)/artifacts/c2pa-v$${VERSION}-$(2).zip"
 endef
 
 check-format:
@@ -52,28 +51,51 @@ fmt:
 	cargo +nightly fmt
 
 # These are for building the c2patool release bin on various platforms
-release-win:
+release-win-x86_64:
+	rustup update stable-msvc
 	rustup target add x86_64-pc-windows-msvc
-	cargo build --target=x86_64-pc-windows-msvc --release
-	@$(call make_zip,$(TARGET_DIR)/x86_64-pc-windows-msvc/release,x86_64-pc-windows-msvc)	
+	cargo build --target=x86_64-pc-windows-msvc --release --no-default-features --features "rust_native_crypto, file_io"
+	cargo test --target=x86_64-pc-windows-msvc --release ---no-default-features --features "rust_native_crypto, file_io"
+#  powershell -ExecutionPolicy Bypass -File ../../setup-rust-openssl.ps1
+
+release-win-aarch64:
+	rustup update stable-msvc
+	rustup target add aarch64-pc-windows-msvc
+	cargo build --target=aarch64-pc-windows-msvc --release
+#  powershell -ExecutionPolicy Bypass -File ../../setup-rust-openssl.ps1
 
 release-mac-arm:
 	rustup target add aarch64-apple-darwin
 	MACOSX_DEPLOYMENT_TARGET=11.1 cargo build --target=aarch64-apple-darwin --release
-	@$(call make_zip,$(TARGET_DIR)/aarch64-apple-darwin/release,aarch64-apple-darwin)
+	install_name_tool -id @rpath/libc2pa_c.dylib $(TARGET_DIR)/aarch64-apple-darwin/release/libc2pa_c.dylib
 
 release-mac-x86:
 	rustup target add x86_64-apple-darwin
 	MACOSX_DEPLOYMENT_TARGET=10.15 cargo build --target=x86_64-apple-darwin --release
-	@$(call make_zip,$(TARGET_DIR)/x86_64-apple-darwin/release,x86_64-apple-darwin)
+	install_name_tool -id @rpath/libc2pa_c.dylib $(TARGET_DIR)/x86_64-apple-darwin/release/libc2pa_c.dylib
 
 release-mac-universal: release-mac-arm release-mac-x86
 	rm -rf $(TARGET_DIR)/universal-apple-darwin
 	mkdir -p $(TARGET_DIR)/universal-apple-darwin/release
 	lipo -create -output $(TARGET_DIR)/universal-apple-darwin/release/libc2pa_c.dylib $(TARGET_DIR)/aarch64-apple-darwin/release/libc2pa_c.dylib ../target/x86_64-apple-darwin/release/libc2pa_c.dylib
 	cp $(TARGET_DIR)/aarch64-apple-darwin/release/c2pa.h $(TARGET_DIR)/universal-apple-darwin/release/c2pa.h
+	install_name_tool -id @rpath/libc2pa_c.dylib $(TARGET_DIR)/universal-apple-darwin/release/libc2pa_c.dylib
+	dsymutil $(TARGET_DIR)/universal-apple-darwin/release/libc2pa_c.dylib
+
+	cd $(TARGET_DIR)/universal-apple-darwin/release && \
+		zip -r9 libc2pa_c.dylib.dSYM.zip libc2pa_c.dylib.dSYM && \
+		rm -rf libc2pa_c.dylib.dSYM && \
+		ls -l
+
+	strip -x $(TARGET_DIR)/universal-apple-darwin/release/libc2pa_c.dylib
 	@$(call make_zip,$(TARGET_DIR)/universal-apple-darwin/release,universal-apple-darwin)
 
+	strip -x $(TARGET_DIR)/aarch64-apple-darwin/release/libc2pa_c.dylib
+	@$(call make_zip,$(TARGET_DIR)/aarch64-apple-darwin/release,aarch64-apple-darwin)
+
+	strip -x $(TARGET_DIR)/x86_64-apple-darwin/release/libc2pa_c.dylib
+	@$(call make_zip,$(TARGET_DIR)/x86_64-apple-darwin/release,x86_64-apple-darwin)
+
 release-linux-gnu-x86:
 	rustup target add x86_64-unknown-linux-gnu
 	cargo build --target=x86_64-unknown-linux-gnu --release