Update lib names.

This commit is contained in:
Alejandro Cabeza Romero 2026-04-27 15:34:41 +02:00
parent cb0e660e16
commit de11d81252
No known key found for this signature in database
GPG Key ID: DA3D14AE478030FD
3 changed files with 22 additions and 18 deletions

View File

@ -47,8 +47,10 @@ runs:
CIRCUIT_CPP_DIRNAME="${CIRCUIT_FILESTEM}_cpp"
if [ "${OS}" = "windows" ]; then
LIB_EXT=".lib"
LIB_PREFIX=""
else
LIB_EXT=".a"
LIB_PREFIX="lib"
fi
{
@ -59,7 +61,7 @@ runs:
echo "CIRCUIT_CPP_PATH=${CIRCUIT_DIRECTORY}/${CIRCUIT_CPP_DIRNAME}"
echo "WITNESS_GENERATOR_RESOURCES_PATH=${RESOURCES_PATH}/witness-generator"
echo "BUNDLE_TRIPLET=${BUNDLE_TRIPLET}"
echo "LIB_NAME=libwitness_${CIRCUIT_FILESTEM}${LIB_EXT}"
echo "LIB_NAME=${LIB_PREFIX}${CIRCUIT_FILESTEM}${LIB_EXT}"
} >> "${GITHUB_OUTPUT}"
- name: Generate ${{ inputs.circuit-name-display }}

View File

@ -18,10 +18,12 @@ DEPS_HPP := circom.hpp calcwit.hpp fr.hpp types.hpp $(PROJECT)/ffi.hpp
BIN := $(PROJECT)
ifeq ($(OS),windows)
LIB_EXT := .lib
LIB_PREFIX :=
else
LIB_EXT := .a
LIB_PREFIX := lib
endif
LIB := libwitness_$(PROJECT)$(LIB_EXT)
LIB := $(LIB_PREFIX)$(PROJECT)$(LIB_EXT)
# ---- Linux (x86_64 and aarch64) ----
linux: CXXFLAGS=$(CXXFLAGS_COMMON)

View File

@ -346,16 +346,16 @@ jobs:
chmod +x "${BUNDLE_NAME}/verifier"
# Move witness libraries into their respective circuit directories
mv witness-generators/pol-artifact/libwitness_pol.a "${BUNDLE_NAME}/pol/"
mv witness-generators/pol-artifact/libpol.a "${BUNDLE_NAME}/pol/"
mv witness-generators/pol-artifact/pol.dat "${BUNDLE_NAME}/pol/witness_generator.dat"
cp -r witness-generators/pol-artifact/include "${BUNDLE_NAME}/pol/"
mv witness-generators/poq-artifact/libwitness_poq.a "${BUNDLE_NAME}/poq/"
mv witness-generators/poq-artifact/libpoq.a "${BUNDLE_NAME}/poq/"
mv witness-generators/poq-artifact/poq.dat "${BUNDLE_NAME}/poq/witness_generator.dat"
cp -r witness-generators/poq-artifact/include "${BUNDLE_NAME}/poq/"
mv witness-generators/zksign-artifact/libwitness_signature.a "${BUNDLE_NAME}/zksign/"
mv witness-generators/zksign-artifact/libsignature.a "${BUNDLE_NAME}/zksign/"
mv witness-generators/zksign-artifact/signature.dat "${BUNDLE_NAME}/zksign/witness_generator.dat"
cp -r witness-generators/zksign-artifact/include "${BUNDLE_NAME}/zksign/"
mv witness-generators/poc-artifact/libwitness_poc.a "${BUNDLE_NAME}/poc/"
mv witness-generators/poc-artifact/libpoc.a "${BUNDLE_NAME}/poc/"
mv witness-generators/poc-artifact/poc.dat "${BUNDLE_NAME}/poc/witness_generator.dat"
cp -r witness-generators/poc-artifact/include "${BUNDLE_NAME}/poc/"
@ -584,16 +584,16 @@ jobs:
chmod +x "${BUNDLE_NAME}/verifier"
# Move witness libraries into their respective circuit directories
mv witness-generators/pol-artifact/libwitness_pol.a "${BUNDLE_NAME}/pol/"
mv witness-generators/pol-artifact/libpol.a "${BUNDLE_NAME}/pol/"
mv witness-generators/pol-artifact/pol.dat "${BUNDLE_NAME}/pol/witness_generator.dat"
cp -r witness-generators/pol-artifact/include "${BUNDLE_NAME}/pol/"
mv witness-generators/poq-artifact/libwitness_poq.a "${BUNDLE_NAME}/poq/"
mv witness-generators/poq-artifact/libpoq.a "${BUNDLE_NAME}/poq/"
mv witness-generators/poq-artifact/poq.dat "${BUNDLE_NAME}/poq/witness_generator.dat"
cp -r witness-generators/poq-artifact/include "${BUNDLE_NAME}/poq/"
mv witness-generators/zksign-artifact/libwitness_signature.a "${BUNDLE_NAME}/zksign/"
mv witness-generators/zksign-artifact/libsignature.a "${BUNDLE_NAME}/zksign/"
mv witness-generators/zksign-artifact/signature.dat "${BUNDLE_NAME}/zksign/witness_generator.dat"
cp -r witness-generators/zksign-artifact/include "${BUNDLE_NAME}/zksign/"
mv witness-generators/poc-artifact/libwitness_poc.a "${BUNDLE_NAME}/poc/"
mv witness-generators/poc-artifact/libpoc.a "${BUNDLE_NAME}/poc/"
mv witness-generators/poc-artifact/poc.dat "${BUNDLE_NAME}/poc/witness_generator.dat"
cp -r witness-generators/poc-artifact/include "${BUNDLE_NAME}/poc/"
@ -859,16 +859,16 @@ jobs:
mv verifier-${{ env.VERSION }}-${{ env.OS }}-${{ env.ARCH }}/verifier/verifier.exe "${BUNDLE_NAME}/verifier.exe"
# Move witness libraries into their respective circuit directories
mv witness-generators/pol-artifact/libwitness_pol.lib "${BUNDLE_NAME}/pol/"
mv witness-generators/pol-artifact/pol.lib "${BUNDLE_NAME}/pol/"
mv witness-generators/pol-artifact/pol.dat "${BUNDLE_NAME}/pol/witness_generator.dat"
cp -r witness-generators/pol-artifact/include "${BUNDLE_NAME}/pol/"
mv witness-generators/poq-artifact/libwitness_poq.lib "${BUNDLE_NAME}/poq/"
mv witness-generators/poq-artifact/poq.lib "${BUNDLE_NAME}/poq/"
mv witness-generators/poq-artifact/poq.dat "${BUNDLE_NAME}/poq/witness_generator.dat"
cp -r witness-generators/poq-artifact/include "${BUNDLE_NAME}/poq/"
mv witness-generators/zksign-artifact/libwitness_signature.lib "${BUNDLE_NAME}/zksign/"
mv witness-generators/zksign-artifact/signature.lib "${BUNDLE_NAME}/zksign/"
mv witness-generators/zksign-artifact/signature.dat "${BUNDLE_NAME}/zksign/witness_generator.dat"
cp -r witness-generators/zksign-artifact/include "${BUNDLE_NAME}/zksign/"
mv witness-generators/poc-artifact/libwitness_poc.lib "${BUNDLE_NAME}/poc/"
mv witness-generators/poc-artifact/poc.lib "${BUNDLE_NAME}/poc/"
mv witness-generators/poc-artifact/poc.dat "${BUNDLE_NAME}/poc/witness_generator.dat"
cp -r witness-generators/poc-artifact/include "${BUNDLE_NAME}/poc/"
@ -1091,16 +1091,16 @@ jobs:
chmod +x "${BUNDLE_NAME}/verifier"
# Move witness libraries into their respective circuit directories
mv witness-generators/pol-artifact/libwitness_pol.a "${BUNDLE_NAME}/pol/"
mv witness-generators/pol-artifact/libpol.a "${BUNDLE_NAME}/pol/"
mv witness-generators/pol-artifact/pol.dat "${BUNDLE_NAME}/pol/witness_generator.dat"
cp -r witness-generators/pol-artifact/include "${BUNDLE_NAME}/pol/"
mv witness-generators/poq-artifact/libwitness_poq.a "${BUNDLE_NAME}/poq/"
mv witness-generators/poq-artifact/libpoq.a "${BUNDLE_NAME}/poq/"
mv witness-generators/poq-artifact/poq.dat "${BUNDLE_NAME}/poq/witness_generator.dat"
cp -r witness-generators/poq-artifact/include "${BUNDLE_NAME}/poq/"
mv witness-generators/zksign-artifact/libwitness_signature.a "${BUNDLE_NAME}/zksign/"
mv witness-generators/zksign-artifact/libsignature.a "${BUNDLE_NAME}/zksign/"
mv witness-generators/zksign-artifact/signature.dat "${BUNDLE_NAME}/zksign/witness_generator.dat"
cp -r witness-generators/zksign-artifact/include "${BUNDLE_NAME}/zksign/"
mv witness-generators/poc-artifact/libwitness_poc.a "${BUNDLE_NAME}/poc/"
mv witness-generators/poc-artifact/libpoc.a "${BUNDLE_NAME}/poc/"
mv witness-generators/poc-artifact/poc.dat "${BUNDLE_NAME}/poc/witness_generator.dat"
cp -r witness-generators/poc-artifact/include "${BUNDLE_NAME}/poc/"