Commit e0afcfd0 authored by Simon Braß's avatar Simon Braß
Browse files

Fix rivet bootstrap URI and use RIVET_CONFIG.

parent 8b42ca90
Pipeline #7352 passed with stage
in 13 minutes and 40 seconds
......@@ -39,7 +39,7 @@ url_whizard_git="git@gitlab.tp.nt.uni-siegen.de:whizard/development.git"
url_whizard="http://www.hepforge.org/archive/whizard/whizard-2.6.4.tar.gz"
# Analysis Tools
url_rivet="http://rivet.hepforge.org/hg/bootstrap/raw-file/3.1.0/rivet-bootstrap"
url_rivet="https://gitlab.com/hepcedar/rivetbootstrap/raw/3.1.0/rivet-bootstrap"
########################################################################
......@@ -146,6 +146,7 @@ build_pythia8 () {
build_rivet () {
local url="${1}"
local config="${2:-}"
local name="$(basename ${url})"
local version="$(basename $(dirname ${url}))" && \
local dirname="rivet-${version}"
......@@ -154,13 +155,8 @@ build_rivet () {
chmod u+x "${name}" && \
mkdir -p "${dirname}")
cd "${dirname}" && \
INSTALL_PREFIX="${PREFIX}" \
MAKE="make -j${NPROC} -s V=0" \
INSTALL_HEPMC=0 \
INSTALL_FASTJET=0 \
HEPMCPATH="${PREFIX}" \
FASTJETPATH="${PREFIX}" \
../rivet-bootstrap && \
# Wrap rivet-bootstrap and ENV variables into an eval statement.
eval "${config} ../rivet-bootstrap" && \
mv "${PREFIX}/rivetenv.csh" "${PREFIX}/bin" && \
mv "${PREFIX}/rivetenv.sh" "${PREFIX}/bin" && \
mv "${PREFIX}/yodaenv.sh" "${PREFIX}/bin" && \
......@@ -337,6 +333,15 @@ WHIZARD_CONFIG=(
FCFLAGS="\"-O2 -g -fbacktrace\""
)
RIVET_CONFIG=(
INSTALL_PREFIX="\"${PREFIX}\""
MAKE="\"make -j${NPROC} -s V=0\""
INSTALL_HEPMC=0
INSTALL_FASTJET=0
HEPMCPATH="\"${PREFIX}\""
FASTJETPATH="\"${PREFIX}\""
)
function main() {
mkdir -p "${LOG}"
mkdir -p "${BUILD}"
......@@ -381,7 +386,8 @@ function main() {
build_and_log_pythia8 "${url_pythia8}" "${CONFIG}"
;;
rivet)
build_and_log_rivet "${url_rivet}"
CONFIG="${RIVET_CONFIG[@]}"
build_and_log_rivet "${url_rivet}" "${CONFIG}"
;;
whizard-config)
echo "${WHIZARD_CONFIG[@]}"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment