Skip to content

Commit

Permalink
Add no_jwz build tag to prevent depencency on librapidsnark library
Browse files Browse the repository at this point in the history
  • Loading branch information
olomix committed May 24, 2024
1 parent 562f577 commit 4a766f0
Showing 5 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests-c.yaml
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ jobs:
# without this line `git status` does not work on containers
# 1.19.5 and upper
git config --global --add safe.directory `pwd`
go build -buildmode=c-archive -o ios/libpolygonid.a ./cmd/polygonid
go build -tags no_jwz -buildmode=c-archive -o ios/libpolygonid.a ./cmd/polygonid
cp ios/libpolygonid.h ios/libpolygonid-darwin-arm64.h
mkdir examples/build
cd examples/build
@@ -59,7 +59,7 @@ jobs:
${{ runner.os }}-go-
- name: Run ctests
run: |
go build -buildmode=c-archive -o ios/libpolygonid.a ./cmd/polygonid
go build -tags no_jwz -buildmode=c-archive -o ios/libpolygonid.a ./cmd/polygonid
cp ios/libpolygonid.h ios/libpolygonid-darwin-arm64.h
brew install cjson
mkdir examples/build
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ ios-arm64:
TARGET=arm64-apple-ios16 \
CC=$(PWD)/clangwrap.sh \
CGO_CFLAGS="-fembed-bitcode" \
go build -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios.a ./cmd/polygonid
go build -tags no_jwz -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios.a ./cmd/polygonid
cp $(IOS_OUT)/libpolygonid-ios.h $(IOS_OUT)/libpolygonid.h


@@ -20,7 +20,7 @@ ios-simulator-x86_64:
TARGET=x86-64-apple-ios16-simulator \
CC=$(PWD)/clangwrap.sh \
CGO_CFLAGS="-fembed-bitcode" \
go build -tags ios -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios-simulator-x86_64.a ./cmd/polygonid
go build -tags ios,no_jwz -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios-simulator-x86_64.a ./cmd/polygonid
cp $(IOS_OUT)/libpolygonid-ios-simulator-x86_64.h $(IOS_OUT)/libpolygonid.h

ios-simulator-arm64:
@@ -31,14 +31,14 @@ ios-simulator-arm64:
TARGET=arm64-apple-ios16-simulator \
CC=$(PWD)/clangwrap.sh \
CGO_CFLAGS="-fembed-bitcode" \
go build -tags ios -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios-simulator-arm64.a ./cmd/polygonid
go build -tags ios,no_jwz -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios-simulator-arm64.a ./cmd/polygonid
cp $(IOS_OUT)/libpolygonid-ios-simulator-arm64.h $(IOS_OUT)/libpolygonid.h

darwin-arm64:
GOOS=darwin \
GOARCH=arm64 \
CGO_ENABLED=1 \
go build -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-darwin-arm64.a ./cmd/polygonid
go build -tags no_jwz -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-darwin-arm64.a ./cmd/polygonid
cp $(IOS_OUT)/libpolygonid-darwin-arm64.h $(IOS_OUT)/libpolygonid.h

# Build a legacy multi-architecture version of libpolygonid.a with iOS Device arm64 & iOS Simulator x86_64
@@ -53,7 +53,7 @@ ios-simulator: ios-simulator-x86_64 ios-simulator-arm64
ios: ios-old ios-arm64 ios-simulator

dylib:
go build -buildmode=c-shared -o $(IOS_OUT)/libpolygonid.dylib ./cmd/polygonid
go build -tags no_jwz -buildmode=c-shared -o $(IOS_OUT)/libpolygonid.dylib ./cmd/polygonid

ANDROID_OUT=android
ANDROID_NDK_HOME?=$(ANDROID_HOME)/ndk/22.1.7171670
@@ -63,28 +63,28 @@ android-armeabi-v7a:
GOARCH=arm \
CGO_ENABLED=1 \
CC=$(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi21-clang \
go build -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/armeabi-v7a/libpolygonid.so ./cmd/polygonid
go build -tags no_jwz -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/armeabi-v7a/libpolygonid.so ./cmd/polygonid

android-arm64-v8a:
GOOS=android \
GOARCH=arm64 \
CGO_ENABLED=1 \
CC=$(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang \
go build -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/arm64-v8a/libpolygonid.so ./cmd/polygonid
go build -tags no_jwz -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/arm64-v8a/libpolygonid.so ./cmd/polygonid

android-x86:
GOOS=android \
GOARCH=386 \
CGO_ENABLED=1 \
CC=$(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android21-clang \
go build -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/x86/libpolygonid.so ./cmd/polygonid
go build -tags no_jwz -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/x86/libpolygonid.so ./cmd/polygonid

android-x86-64:
GOOS=android \
GOARCH=amd64 \
CGO_ENABLED=1 \
CC=$(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android21-clang \
go build -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/x86-64/libpolygonid.so ./cmd/polygonid
go build -tags no_jwz -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/x86-64/libpolygonid.so ./cmd/polygonid

android: android-armeabi-v7a android-arm64-v8a android-x86 android-x86-64

2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ endif()
# include_directories(${cJSON_SOURCE_DIR})
# add_executable(json_functions_tests json_functions_tests.c ${cJSON_SOURCE_DIR}/cJSON.c)

## Compaly with system installed cJSON
## Compile with system installed cJSON

find_package(cJSON REQUIRED)
include_directories(${CJSON_INCLUDE_DIRS})
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ require (
github.com/iden3/go-merkletree-sql/v2 v2.0.6
github.com/iden3/go-onchain-credential-adapter v0.0.0-20240425110009-4004ac8da50c
github.com/iden3/go-schema-processor/v2 v2.3.4
github.com/iden3/iden3comm/v2 v2.3.3
github.com/iden3/iden3comm/v2 v2.3.4-0.20240524090357-f348cd28df8c
github.com/iden3/merkletree-proof v0.1.1
github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f
github.com/stretchr/testify v1.9.0
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -186,8 +186,8 @@ github.com/iden3/go-rapidsnark/witness/wazero v0.0.0-20230524142950-0986cf057d4e
github.com/iden3/go-rapidsnark/witness/wazero v0.0.0-20230524142950-0986cf057d4e/go.mod h1:UEBifEzw62T6VzIHJeHuUgeLg2U/J9ttf7hOwQEqnYk=
github.com/iden3/go-schema-processor/v2 v2.3.4 h1:zWE9NrY7dm9Il8c0u3XcJfenptmxbvIaNDOqkq5uQ0A=
github.com/iden3/go-schema-processor/v2 v2.3.4/go.mod h1:tuz/iuqU13NdpCY1Ovsh7n6KTZnJnfhqjB0MUgxbcA4=
github.com/iden3/iden3comm/v2 v2.3.3 h1:lH2v/hZeZYvKQAgfpi/hyzugDjvCTxJo/Y0pyMVWHFQ=
github.com/iden3/iden3comm/v2 v2.3.3/go.mod h1:14aZgYjCi0XIZ/wkQrWIhLkQT20nwQMyWEIeLXY0Klg=
github.com/iden3/iden3comm/v2 v2.3.4-0.20240524090357-f348cd28df8c h1:MKEvtiDyk/ByXHhQoIsQuXSy74oQgHOmJtHQFfF2EVw=
github.com/iden3/iden3comm/v2 v2.3.4-0.20240524090357-f348cd28df8c/go.mod h1:14aZgYjCi0XIZ/wkQrWIhLkQT20nwQMyWEIeLXY0Klg=
github.com/iden3/merkletree-proof v0.1.1 h1:NwuaW/t0HTwZpmxWSxqeh/hYRjAQt/uIvw5QeW5GE8I=
github.com/iden3/merkletree-proof v0.1.1/go.mod h1:ul0HDU6/eVNX++u/PWScY7pTXiFjqM5kA6vl1wEoTUU=
github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=

0 comments on commit 4a766f0

Please sign in to comment.