Merge branch 'master' into PICO-pull-in

.ci-build-without-test.sh

@@ -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/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
@@ -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)

.ci-build.sh

@@ -46,7 +46,7 @@ if [[ "${GROUP}" == downstream* && "${SLUGOWNER}" == "opprop" ]]; then
     clone_downstream () {
         DOWNSTREAM_PROJ="$(pwd -P)/../$1"
         echo "clone downstream to: ${DOWNSTREAM_PROJ}"
-        COMMAND="/tmp/plume-scripts/git-clone-related opprop $1 ${DOWNSTREAM_PROJ}"
+        COMMAND="/tmp/git-scripts/git-clone-related opprop $1 ${DOWNSTREAM_PROJ}"
         echo "Running: ($COMMAND)"
         (eval $COMMAND)
         echo "... done: ($COMMAND)"

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