From cdf5a5e403093299c910a9fa1d0ea4c489bc81c3 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Thu, 27 Jun 2024 14:51:46 -0400 Subject: [PATCH] Use git-scripts --- .ci-build-without-test.sh | 10 +++++----- scripts/buildDLJC | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci-build-without-test.sh b/.ci-build-without-test.sh index 80ae29cb..a1c0adb2 100755 --- a/.ci-build-without-test.sh +++ b/.ci-build-without-test.sh @@ -13,10 +13,10 @@ else export JAVA_HOME=${JAVA_HOME:-$(dirname $(dirname $(readlink -f $(which javac))))} fi -if [ -d "/tmp/plume-scripts" ] ; then - git -C /tmp/plume-scripts pull -q +if [ -d "/tmp/git-scripts" ] ; then + git -C /tmp/git-scripts pull -q else - git -C /tmp clone --depth 1 -q https://github.com/eisop-plume-lib/plume-scripts.git + git -C /tmp clone --depth 1 -q https://github.com/eisop-plume-lib/git-scripts.git fi export AFU="${AFU:-../annotation-tools/annotation-file-utilities}" @@ -24,7 +24,7 @@ export AFU="${AFU:-../annotation-tools/annotation-file-utilities}" AT=$(dirname "${AFU}") ## Build annotation-tools (Annotation File Utilities) -/tmp/plume-scripts/git-clone-related opprop annotation-tools "${AT}" +/tmp/git-scripts/git-clone-related opprop annotation-tools "${AT}" if [ ! -d ../annotation-tools ] ; then ln -s "${AT}" ../annotation-tools fi @@ -39,7 +39,7 @@ export CHECKERFRAMEWORK="${CHECKERFRAMEWORK:-$(pwd -P)/../checker-framework}" export PATH=$AFU/scripts:$JAVA_HOME/bin:$PATH ## Build Checker Framework -/tmp/plume-scripts/git-clone-related opprop checker-framework ${CHECKERFRAMEWORK} +/tmp/git-scripts/git-clone-related opprop checker-framework ${CHECKERFRAMEWORK} # This also builds annotation-tools (cd $CHECKERFRAMEWORK && ./gradlew assembleForJavac) diff --git a/scripts/buildDLJC b/scripts/buildDLJC index 5cda5e67..43b74362 100755 --- a/scripts/buildDLJC +++ b/scripts/buildDLJC @@ -21,5 +21,5 @@ ROOT=$(cd ${myDir}/../../ && pwd) if [ -d $ROOT/do-like-javac ] ; then (cd $ROOT/do-like-javac && git pull) else - (/tmp/plume-scripts/git-clone-related opprop do-like-javac $ROOT/do-like-javac) + (/tmp/git-scripts/git-clone-related opprop do-like-javac $ROOT/do-like-javac) fi