Skip to content

Commit

Permalink
Use git-scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
Ao-senXiong committed Jun 27, 2024
1 parent f0b3c9f commit cdf5a5e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .ci-build-without-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ 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}"
# Don't use `AT=${AFU}/..` which causes a git failure.
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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion scripts/buildDLJC
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit cdf5a5e

Please sign in to comment.