From 8458e02d513cce7ee17e1da8c94e0c563149f53e Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Sat, 1 May 2021 22:02:48 -0500
Subject: [PATCH] deleted: bin/build_common.sh modified:
share/common.yml
---
bin/build_common.sh | 33 ---------------------------------
share/common.yml | 2 +-
2 files changed, 1 insertion(+), 34 deletions(-)
delete mode 100755 bin/build_common.sh
diff --git a/bin/build_common.sh b/bin/build_common.sh
deleted file mode 100755
index 62a52c1..0000000
--- a/bin/build_common.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-## =============================================================================
-## Build and install common scripts and libraries for benchmarks
-## =============================================================================
-
-## make sure we launch this script from the project root directory
-PROJECT_ROOT="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"/..
-pushd ${PROJECT_ROOT}
-
-# Check there is a local install prefix set and create the directory
-# structure for the install.
-
-if [[ -n "${LOCAL_PREFIX}" ]] ; then
- mkdir -p "${LOCAL_PREFIX}/include"
- mkdir -p "${LOCAL_PREFIX}/bin"
- mkdir -p "${LOCAL_PREFIX}/lib"
-
- #if [ -d common_bench ]; then
- # echo "cleaning existing common_bench"
- # rm -rf common_bench
- #fi
- #echo "Fetching common_bench"
- #git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git
- cp -r common_bench/bin/* "${LOCAL_PREFIX}/bin/."
- cp -r common_bench/bin/* "${LOCAL_PREFIX}/bin/."
- cp -r common_bench/bin/* "${LOCAL_PREFIX}/bin/."
- cp -r common_bench/include/* "${LOCAL_PREFIX}/include/."
-
-fi
-
-## =============================================================================
-echo "common_bench install complete!"
diff --git a/share/common.yml b/share/common.yml
index 30951bf..5e944ae 100644
--- a/share/common.yml
+++ b/share/common.yml
@@ -12,7 +12,7 @@ common:setup:
- config
script:
- git clone "${CI_REPOSITORY_URL}" setup
- - source setup/bin/env.sh && ./setup/bin/build_common.sh
+ - source setup/bin/env.sh && ./setup/bin/install_common.sh
common:detector:
stage: initialize
--
GitLab