From b5a35c9138ae4d8fa1b5fee8ed6a5635a6d0f66b Mon Sep 17 00:00:00 2001
From: Doru Bercea <gheorghe-teod.bercea@ibm.com>
Date: Thu, 19 Dec 2019 16:28:53 -0500
Subject: [PATCH] Update buildbot scripts.

---
 .buildbot/p9.sh  | 36 ++++++++++++++++++------------------
 .buildbot/z13.sh |  8 ++++----
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.buildbot/p9.sh b/.buildbot/p9.sh
index bd2f903..82967ea 100644
--- a/.buildbot/p9.sh
+++ b/.buildbot/p9.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Check for required env variables DLC_DEP_DIR, LLVM_PROJECT_ROOT
-if [[ -z "${DLC_DEP_DIR}" ]]; then
-  echo "DLC_DEP_DIR env var is missing."
+# Check for required env variables ONNF_DEP_DIR, LLVM_PROJECT_ROOT
+if [[ -z "${ONNF_DEP_DIR}" ]]; then
+  echo "ONNF_DEP_DIR env var is missing."
   exit 1
 fi
 if [[ -z "${LLVM_PROJECT_ROOT}" ]]; then
@@ -10,11 +10,11 @@ if [[ -z "${LLVM_PROJECT_ROOT}" ]]; then
   exit 1
 fi
 
-# Set up env variables to expose dlc dependencies:
-export PATH=$DLC_DEP_DIR/bin:$PATH
-export LD_LIBRARY_PATH=$DLC_DEP_DIR/lib:$DLC_DEP_DIR/lib64:
-export CPATH=$DLC_DEP_DIR/include:$CPATH
-export PATH=$DLC_DEP_DIR/bin:$PATH
+# Set up env variables to expose onnf dependencies:
+export PATH=$ONNF_DEP_DIR/bin:$PATH
+export LD_LIBRARY_PATH=$ONNF_DEP_DIR/lib:$ONNF_DEP_DIR/lib64:
+export CPATH=$ONNF_DEP_DIR/include:$CPATH
+export PATH=$ONNF_DEP_DIR/bin:$PATH
 
 # Set up mock installation path within current workspace:
 export INSTALL_PATH=$WORKSPACE/INSTALL_PATH
@@ -24,19 +24,19 @@ export LD_LIBRARY_PATH=$INSTALL_PATH/lib:$INSTALL_PATH/lib64:$LD_LIBRARY_PATH
 export CPATH=$INSTALL_PATH/include:$CPATH
 
 # Create virtual environment specific to the current build instance:
-conda create -n dlc_conda_workspace_"${BUILD_NUMBER}" python=3.7 numpy
-source activate dlc_conda_workspace_"${BUILD_NUMBER}"
+conda create -n onnf_conda_workspace_"${BUILD_NUMBER}" python=3.7 numpy
+source activate onnf_conda_workspace_"${BUILD_NUMBER}"
 
 # Create build directory and generate make files:
 mkdir build && cd build
-CC=$DLC_DEP_DIR/bin/gcc                       \
-CXX=$DLC_DEP_DIR/bin/g++                      \
-BOOST_ROOT=$DLC_DEP_DIR                       \
-LLVM_PROJECT_SRC=$LLVM_PROJECT_ROOT           \
-LLVM_PROJECT_BUILD=$LLVM_PROJECT_ROOT/build   \
-cmake3 -DDLC_ENABLE_MODEL_TEST_CPP=ON         \
-       -DDLC_ENABLE_BENCHMARK=ON              \
-       -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" \
+CC=$ONNF_DEP_DIR/bin/gcc                       \
+CXX=$ONNF_DEP_DIR/bin/g++                      \
+BOOST_ROOT=$ONNF_DEP_DIR                       \
+LLVM_SRC=$LLVM_PROJECT_ROOT/llvm               \
+LLVM_BUILD=$LLVM_PROJECT_ROOT/build            \
+cmake3 -DONNF_ENABLE_MODEL_TEST_CPP=ON         \
+       -DONNF_ENABLE_BENCHMARK=ON              \
+       -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH"  \
        ..
 
 # Build and test:
diff --git a/.buildbot/z13.sh b/.buildbot/z13.sh
index 98a2c16..e027970 100644
--- a/.buildbot/z13.sh
+++ b/.buildbot/z13.sh
@@ -26,10 +26,10 @@ cmake -DCMAKE_C_COMPILER=$CC \
       -DCMAKE_CXX_COMPILER=$CXX \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH \
-      -DDLC_ENABLE_NODE_TEST_JAVA=ON \
-      -DDLC_ENABLE_NODE_TEST_JNI=ON \
-      -DDLC_ENABLE_NODE_TEST_CPP=OFF \
-      -DDLC_TARGET_ARCH=z13 ..
+      -DONNF_ENABLE_NODE_TEST_JAVA=ON \
+      -DONNF_ENABLE_NODE_TEST_JNI=ON \
+      -DONNF_ENABLE_NODE_TEST_CPP=OFF \
+      -DONNF_TARGET_ARCH=z13 ..
 
 make -j "$(nproc)" install
 ctest -j "$(nproc)"