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

Bump Delphes and ROOT versions; fix FORCE_ROOT

parent e9db477d
Pipeline #9756 failed with stage
in 11 minutes and 30 seconds
......@@ -101,7 +101,7 @@ url_ocaml="https://github.com/ocaml/ocaml/archive/4.12.0.tar.gz"
dir_ocaml="ocaml-4.12.0"
# External tool dependencies
url_root="https://github.com/root-project/root/archive/v6-23-01.tar.gz"
url_root="https://github.com/root-project/root/archive/v6-24-00.tar.gz"
# Whizard External Dependencies
url_hepmc="https://hepmc.web.cern.ch/hepmc/releases/hepmc2.06.10.tgz"
......@@ -111,7 +111,7 @@ url_lhapdf="https://lhapdf.hepforge.org/downloads/?f=LHAPDF-6.3.0.tar.gz"
url_fastjet="http://fastjet.fr/repo/fastjet-3.3.4.tar.gz"
url_openloops="https://openloops.hepforge.org/downloads?f=OpenLoops-2.1.2.tar.gz"
url_pythia8="http://home.thep.lu.se/~torbjorn/pythia8/pythia8305.tgz"
url_delphes="https://github.com/delphes/delphes/archive/3.4.2.tar.gz"
url_delphes="https://github.com/delphes/delphes/archive/3.4.3pre12.tar.gz"
# WHIZARD
url_whizard="https://launchpad.net/whizard/3.0.x/3.0.0/+download/whizard-3.0.0.tar.gz"
......@@ -472,7 +472,10 @@ ROOT_CONFIG=(
# Delphes comes with its own FastJet build chain.
DELPHES_CONFIG=(
-DCMAKE_INSTALL_PREFIX="${PREFIX}"
-DROOT_DIR="${ROOT_DIR}/cmake"
-DPYTHIA8_INCLUDE_DIR="${PREFIX}/include"
-DPYTHIA8_LIBRARY="${PREFIX}/lib/libpythia8.so"
)
# https://hepmc.web.cern.ch/hepmc/building.html
......@@ -564,7 +567,7 @@ function main() {
cmake_and_log "ROOT" "${url_root}" "${ROOT_CONFIG[*]}"
;;
hepmc3)
if test "${FORCE_ROOT}" = true; then
if test "${FORCE_ROOT}" = True; then
if ! test -d "${ROOT_DIR}/cmake" || ! test -f "${ROOT_DIR}/cmake/ROOTConfig.cmake"; then
cmake_and_log "ROOT" "${url_root}" "${ROOT_CONFIG[*]}"
fi
......@@ -581,8 +584,8 @@ function main() {
cmake_and_log "HepMC3" "${url_hepmc3}" "${HEPMC3_CONFIG[*]}"
;;
delphes)
if test "${FORCE_ROOT}" = true; then
if test -z "${ROOT_DIR}" && ! test -f "${ROOT_DIR}/cmake/ROOTConfig.cmake"; then
if test "${FORCE_ROOT}" = True; then
if ! test -d "${ROOT_DIR}/cmake" || ! test -f "${ROOT_DIR}/cmake/ROOTConfig.cmake"; then
cmake_and_log "ROOT" "${url_root}" "${ROOT_CONFIG[*]}"
fi
fi
......@@ -595,8 +598,6 @@ function main() {
build_and_log_rivet "${url_rivet}" "${RIVET_CONFIG[*]}"
;;
whizard)
export PATH="${PREFIX}/bin:${PATH}"
export LD_LIBRARY_PATH="${PREFIX}/lib:${PREFIX}/OpenLoops/lib:${LD_LIBRARY_PATH}"
make_and_log "WHIZARD" "${url_whizard}" "${WHIZARD_CONFIG[*]}"
;;
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