Simplify contrib/get-lfsc-checker and use cvc5 repo for LFSC signatures (#7835)
authorAndrew Reynolds <andrew.j.reynolds@gmail.com>
Fri, 17 Dec 2021 22:07:04 +0000 (16:07 -0600)
committerGitHub <noreply@github.com>
Fri, 17 Dec 2021 22:07:04 +0000 (22:07 +0000)
contrib/get-lfsc-checker

index 9a7292fc7c66efdc8423f7bf3b8c5930462f5285..889455917d32342fe910dcdb4d649aa116dfcd30 100755 (executable)
@@ -25,7 +25,7 @@ mkdir -p $LFSC_DIR
 
 # download and unpack LFSC
 version="15f53d6feb84e4ddb41deaf2b5630f5c1303b06d"
-download "https://github.com/CVC4/LFSC/archive/$version.tar.gz" $BASE_DIR/tmp/lfsc.tgz
+download "https://github.com/cvc5/LFSC/archive/$version.tar.gz" $BASE_DIR/tmp/lfsc.tgz
 tar --strip 1 -xzf $BASE_DIR/tmp/lfsc.tgz -C $LFSC_DIR
 
 # build and install LFSC
@@ -36,17 +36,13 @@ make install
 popd
 
 ##### signatures
-SIG_DIR="$BASE_DIR/lfsc-signatures"
-mkdir -p $SIG_DIR
 
-# download and unpack signatures
-sig_version="5d72dafd48aded21fd717ef77321e1c88f732d28"
-download "https://github.com/CVC4/signatures/archive/$sig_version.tar.gz" $BASE_DIR/tmp/signatures.tgz
-tar --strip 1 -xzf $BASE_DIR/tmp/signatures.tgz -C $SIG_DIR
+# The LFSC signatures live in the main cvc5 repository
+SIG_DIR="$BASE_DIR/../proofs/lfsc/signatures"
 
 # install signatures and scripts
 mkdir -p $BASE_DIR/share/lfsc
-cp -r $SIG_DIR/lfsc/new/signatures $BASE_DIR/share/lfsc
+cp -r $SIG_DIR $BASE_DIR/share/lfsc
 
 # based on https://github.com/CVC4/signatures/blob/master/lfsc/new/scripts/cvc4_gen_and_check.sh
 cat << EOF > $BASE_DIR/bin/cvc5-lfsc-check.sh