Use standard lib extensions.

This commit is contained in:
Alejandro Cabeza Romero 2026-04-08 18:37:39 +02:00
parent 6a7394e29b
commit d64e9f0b03
No known key found for this signature in database
GPG Key ID: DA3D14AE478030FD
3 changed files with 16 additions and 6 deletions

View File

@ -45,6 +45,11 @@ runs:
CIRCUIT_FILENAME="$(basename ${CIRCUIT_PATH})"
CIRCUIT_FILESTEM="${CIRCUIT_FILENAME%.circom}"
CIRCUIT_CPP_DIRNAME="${CIRCUIT_FILESTEM}_cpp"
if [ "${OS}" = "windows" ]; then
LIB_EXT=".lib"
else
LIB_EXT=".a"
fi
{
echo "CIRCUIT_DIRECTORY=${CIRCUIT_DIRECTORY}"
@ -54,7 +59,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}.a"
echo "LIB_NAME=libwitness_${CIRCUIT_FILESTEM}${LIB_EXT}"
} >> "${GITHUB_OUTPUT}"
- name: Generate ${{ inputs.circuit-name-display }}

View File

@ -26,7 +26,12 @@ LIB_SRCS := calcwit.cpp fr.cpp $(PROJECT).cpp
LIB_OBJS := $(LIB_SRCS:.cpp=.o)
DEPS_HPP := circom.hpp calcwit.hpp fr.hpp
BIN := $(PROJECT)
LIB := libwitness_$(PROJECT).a
ifeq ($(OS),windows)
LIB_EXT := .lib
else
LIB_EXT := .a
endif
LIB := libwitness_$(PROJECT)$(LIB_EXT)
# ---- Linux (x86_64 and aarch64) ----
linux: CXXFLAGS=$(CXXFLAGS_COMMON)

View File

@ -856,16 +856,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.a "${BUNDLE_NAME}/pol/"
mv witness-generators/pol-artifact/libwitness_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.a "${BUNDLE_NAME}/poq/"
mv witness-generators/poq-artifact/libwitness_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.a "${BUNDLE_NAME}/zksign/"
mv witness-generators/zksign-artifact/libwitness_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.a "${BUNDLE_NAME}/poc/"
mv witness-generators/poc-artifact/libwitness_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/"