diff --git a/cmake.sh b/cmake.sh index e4151904e6..1e10f01d14 100644 --- a/cmake.sh +++ b/cmake.sh @@ -24,8 +24,6 @@ SET(Java_JAVAC_EXECUTABLE FALSE CACHE BOOL "" FORCE) # so just disable it. SET(BUILD_CursesDialog FALSE CACHE BOOL "" FORCE) -# OpenSSL is problematic -set(CMAKE_USE_OPENSSL FALSE CACHE BOOL "" FORCE) EOF $SOURCEDIR/bootstrap --prefix=$INSTALLROOT \ diff --git a/defaults-prod-latest.sh b/defaults-prod-latest.sh index 75684799f7..0b9d14a682 100644 --- a/defaults-prod-latest.sh +++ b/defaults-prod-latest.sh @@ -44,6 +44,23 @@ overrides: - CMake - "Xcode:(osx.*)" + # Use VMC packages compatible with ROOT 5 + GEANT3: + version: "v2-7-p1" + tag: "v2-7-p1" + GEANT4_VMC: + version: "v3-6-p6-inclxx-biasing-p2" + tag: "v3-6-p6-inclxx-biasing-p2" + requires: + - GEANT4 + - vgm + GEANT4: + version: "v10.4.2" + tag: "v10.4.2" + vgm: + version: "v4-4" + tag: "v4-4" + # ROOT 5 requires GSL < 2 GSL: prefer_system_check: | diff --git a/defaults-release.sh b/defaults-release.sh index e89dc8d9a5..857b33c349 100644 --- a/defaults-release.sh +++ b/defaults-release.sh @@ -44,6 +44,23 @@ overrides: - CMake - "Xcode:(osx.*)" + # Use VMC packages compatible with ROOT 5 + GEANT3: + version: "v2-7-p1" + tag: "v2-7-p1" + GEANT4_VMC: + version: "v3-6-p6-inclxx-biasing-p2" + tag: "v3-6-p6-inclxx-biasing-p2" + requires: + - GEANT4 + - vgm + GEANT4: + version: "v10.4.2" + tag: "v10.4.2" + vgm: + version: "v4-4" + tag: "v4-4" + # ROOT 5 requires GSL < 2 GSL: prefer_system_check: | diff --git a/fairroot.sh b/fairroot.sh index e021a99392..6a8ac0ba06 100644 --- a/fairroot.sh +++ b/fairroot.sh @@ -1,6 +1,6 @@ package: FairRoot version: "%(short_hash)s" -tag: "6af7e848585ce720e96a01d5565b1bd5e3884430" +tag: "4ab2d2b1f0392ad93b92026d70fe049c38665f7d" source: https://github.com/FairRootGroup/FairRoot requires: - generators @@ -63,6 +63,7 @@ cmake $SOURCEDIR ${PROTOBUF_ROOT:+-DProtobuf_PROTOC_EXECUTABLE=$PROTOBUF_ROOT/bin/protoc} \ ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD} \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_PREFIX=$INSTALLROOT cmake --build . -- -j$JOBS install diff --git a/geant3.sh b/geant3.sh index 6601b8928b..58981e9e5d 100644 --- a/geant3.sh +++ b/geant3.sh @@ -1,6 +1,6 @@ package: GEANT3 version: "%(tag_basename)s" -tag: v2-7-p1 +tag: v3-3 requires: - ROOT build_requires: diff --git a/geant4.sh b/geant4.sh index e72ed6c954..03483cdc0c 100644 --- a/geant4.sh +++ b/geant4.sh @@ -1,6 +1,6 @@ package: GEANT4 version: "%(tag_basename)s" -tag: "v10.4.2" +tag: "v10.5.1" source: https://gitlab.cern.ch/geant4/geant4.git requires: - "GCC-Toolchain:(?!osx)" @@ -15,20 +15,20 @@ incremental_recipe: | env: G4INSTALL : $GEANT4_ROOT G4DATASEARCHOPT : "-mindepth 2 -maxdepth 4 -type d -wholename" + G4ABLADATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4ABLA*'`" ## v10.4.px only + G4ENSDFSTATEDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4ENSDFSTATE*'`" + G4INCLDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4INCL*'`" ## v10.5.px only G4LEDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4EMLOW*'`" G4LEVELGAMMADATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*PhotonEvaporation*'`" - G4RADIOACTIVEDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*RadioactiveDecay*'`" G4NEUTRONHPDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4NDL*'`" - G4NEUTRONXSDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4NEUTRONXS*'`" - G4SAIDXSDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4SAIDDATA*'`" + G4NEUTRONXSDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4NEUTRONXS*'`" ## v10.4.px only + G4PARTICLEXSDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4PARTICLEXS*'`" ## v10.5.px only G4PIIDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4PII*'`" + G4RADIOACTIVEDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*RadioactiveDecay*'`" G4REALSURFACEDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*RealSurface*'`" - G4ENSDFSTATEDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4ENSDFSTATE*'`" ---- -#!/bin/bash -e - -[[ $CXXSTD > 14 ]] && CXXSTD=14 || true # Only C++14 is supported at the moment + G4SAIDXSDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4SAIDDATA*'`" +--- # if this variable is not defined default it to OFF : ${GEANT4_BUILD_MULTITHREADED:=OFF} @@ -50,7 +50,7 @@ cmake $SOURCEDIR \ -DGEANT4_INSTALL_DATA=ON \ -DGEANT4_USE_SYSTEM_EXPAT=OFF \ ${XERCESC_ROOT:+-DXERCESC_ROOT_DIR=$XERCESC_ROOT} \ - ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD} \ + ${CXXSTD:+-DGEANT4_BUILD_CXXSTD=$CXXSTD} \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON make ${JOBS+-j $JOBS} @@ -60,15 +60,18 @@ make install # in order to avoid putting hard-coded version numbers (which change with every G4 tag) # these variables are used to create the modulefile below G4DATASEARCHOPT="-mindepth 2 -maxdepth 4 -type d -wholename" -G4LEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT "*data*G4EMLOW*"` -G4LEVELGAMMADATA=`find ${INSTALLROOT} $G4DATASEARCHOPT "*data*PhotonEvaporation*"` -G4RADIOACTIVEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT "*data*RadioactiveDecay*"` -G4NEUTRONHPDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT "*data*G4NDL*"` -G4NEUTRONXSDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT "*data*G4NEUTRONXS*"` -G4SAIDXSDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT "*data*G4SAIDDATA*"` -G4PIIDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT "*data*G4PII*"` -G4REALSURFACEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT "*data*RealSurface*"` -G4ENSDFSTATEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT "*data*G4ENSDFSTATE*"` +G4ABLADATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4ABLA*'` ## v10.4.px only +G4ENSDFSTATEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4ENSDFSTATE*'` ## v10.5.px only +G4INCLDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4INCL*'` +G4LEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4EMLOW*'` +G4LEVELGAMMADATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*PhotonEvaporation*'` +G4NEUTRONHPDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4NDL*'` +G4NEUTRONXSDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4NEUTRONXS*'` ## v10.4.px only +G4PARTICLEXSDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4PARTICLEXS*'` ## v10.5.px only +G4PIIDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4PII*'` +G4RADIOACTIVEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*RadioactiveDecay*'` +G4REALSURFACEDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*RealSurface*'` +G4SAIDXSDATA=`find ${INSTALLROOT} $G4DATASEARCHOPT '*data*G4SAIDDATA*'` # Modulefile MODULEDIR="$INSTALLROOT/etc/modulefiles" @@ -91,13 +94,19 @@ setenv GEANT4_ROOT \$GEANT4_ROOT setenv G4INSTALL \$GEANT4_ROOT setenv G4INSTALL_DATA \$::env(G4INSTALL)/share/ setenv G4SYSTEM \$osname-g++ -setenv G4LEVELGAMMADATA $G4LEVELGAMMADATA -setenv G4RADIOACTIVEDATA $G4RADIOACTIVEDATA + +setenv G4ABLADATA $G4ABLADATA +setenv G4ENSDFSTATEDATA $G4ENSDFSTATEDATA +setenv G4INCLDATA $G4INCLDATA setenv G4LEDATA $G4LEDATA +setenv G4LEVELGAMMADATA $G4LEVELGAMMADATA setenv G4NEUTRONHPDATA $G4NEUTRONHPDATA -setenv G4NEUTRONXSDATA $G4NEUTRONXSDATA +setenv G4NEUTRONXSDATA #G4NEUTRONXSDATA +setenv G4PARTICLEXSDATA $G4PARTICLEXSDATA +setenv G4PIIDATA $G4PIIDATA +setenv G4RADIOACTIVEDATA $G4RADIOACTIVEDATA +setenv G4REALSURFACEDATA $G4REALSURFACEDATA setenv G4SAIDXSDATA $G4SAIDXSDATA -setenv G4ENSDFSTATEDATA $G4ENSDFSTATEDATA set G4BASE \$::env(GEANT4_ROOT) prepend-path PATH \$G4BASE/bin prepend-path ROOT_INCLUDE_PATH \$G4BASE/include/Geant4 diff --git a/geant4_vmc.sh b/geant4_vmc.sh index 7bfd7c0ff8..a384fc4241 100644 --- a/geant4_vmc.sh +++ b/geant4_vmc.sh @@ -1,6 +1,6 @@ package: GEANT4_VMC version: "%(tag_basename)s" -tag: "v3-6-p6" +tag: "v5-0-p2" source: https://github.com/vmc-project/geant4_vmc requires: - ROOT diff --git a/vgm.sh b/vgm.sh index 0834a54ff7..b6e0f17c54 100644 --- a/vgm.sh +++ b/vgm.sh @@ -1,6 +1,6 @@ package: vgm version: "%(tag_basename)s" -tag: "v4-4" +tag: "v4-7" source: https://github.com/vmc-project/vgm requires: - ROOT