Skip to content

Commit 3a41f33

Browse files
Barthelemyktf
Barthelemy
authored and
ktf
committed
(O2-932) Cleanup modulefiles (#1913)
1 parent 45a62dd commit 3a41f33

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+543
-492
lines changed

‎aegis.sh‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ build_requires:
1010
source: https://github.com/AliceO2Group/AEGIS.git
1111
prepend_path:
1212
LD_LIBRARY_PATH: "$AEGIS_ROOT/lib"
13-
DYLD_LIBRARY_PATH: "$AEGIS_ROOT/lib"
1413
ROOT_INCLUDE_PATH: "$AEGIS_ROOT/include"
1514
---
1615
#!/bin/bash -e
@@ -35,8 +34,8 @@ module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@
3534
# Dependencies
3635
module load BASE/1.0 ROOT/$ROOT_VERSION-$ROOT_REVISION
3736
# Our environment
38-
setenv AEGIS_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
39-
prepend-path LD_LIBRARY_PATH \$::env(AEGIS_ROOT)/lib
40-
prepend-path ROOT_INCLUDE_PATH \$::env(AEGIS_ROOT)/include
41-
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(AEGIS_ROOT)/lib")
37+
set AEGIS_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
38+
setenv AEGIS_ROOT \$AEGIS_ROOT
39+
prepend-path LD_LIBRARY_PATH \$AEGIS_ROOT/lib
40+
prepend-path ROOT_INCLUDE_PATH \$AEGIS_ROOT/include
4241
EoF

‎agile.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ proc ModulesHelp { } {
4747
set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
4848
module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
4949
# Dependencies
50-
module load BASE/1.0 HepMC/$HEPMC_VERSION-$HEPMC_REVISION lhapdf5/${LHAPDF5_VERSION}-${LHAPDF5_REVISION} ${BOOST_ROOT:+boost/$BOOST_VERSION-$BOOST_REVISION} ${PYTHON_VERSION:+Python/$PYTHON_VERSION-$PYTHON_REVISION}
50+
module load BASE/1.0 HepMC/$HEPMC_VERSION-$HEPMC_REVISION lhapdf5/${LHAPDF5_VERSION}-${LHAPDF5_REVISION} ${BOOST_ROOT:+boost/$BOOST_VERSION-$BOOST_REVISION} ${PYTHON_REVISION:+Python/$PYTHON_VERSION-$PYTHON_REVISION}
5151
# Our environment
52-
setenv AGILE_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
53-
prepend-path PYTHONPATH \$::env(AGILE_ROOT)/lib/python2.7/site-packages
54-
prepend-path PATH \$::env(AGILE_ROOT)/bin
55-
prepend-path LD_LIBRARY_PATH \$::env(AGILE_ROOT)/lib
56-
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(AGILE_ROOT)/lib")
52+
set AGILE_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
53+
setenv AGILE_ROOT \$AGILE_ROOT
54+
prepend-path PYTHONPATH \$AGILE_ROOT/lib/python2.7/site-packages
55+
prepend-path PATH \$AGILE_ROOT/bin
56+
prepend-path LD_LIBRARY_PATH \$AGILE_ROOT/lib
5757
EoF

‎alf.sh‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ fi
2323

2424
cmake $SOURCEDIR \
2525
-DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
26-
${COMMON_O2_VERSION:+-DCommon_ROOT=$COMMON_O2_ROOT} \
27-
${DIM_VERSION:+-DDIM_ROOT=$DIM_ROOT} \
28-
${LIBINFOLOGGER_VERSION:+-DInfoLogger_ROOT=$LIBINFOLOGGER_ROOT} \
29-
${READOUTCARD_VERSION:+-DReadoutCard_ROOT=$READOUTCARD_ROOT} \
26+
${COMMON_O2_REVISION:+-DCommon_ROOT=$COMMON_O2_ROOT} \
27+
${DIM_REVISION:+-DDIM_ROOT=$DIM_ROOT} \
28+
${LIBINFOLOGGER_REVISION:+-DInfoLogger_ROOT=$LIBINFOLOGGER_ROOT} \
29+
${READOUTCARD_REVISION:+-DReadoutCard_ROOT=$READOUTCARD_ROOT} \
3030
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
3131

3232
cp ${BUILDDIR}/compile_commands.json ${INSTALLROOT}
@@ -45,15 +45,16 @@ module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@
4545
# Dependencies
4646
module load BASE/1.0 \\
4747
Common-O2/$COMMON_O2_VERSION-$COMMON_O2_REVISION \\
48-
${DIM_VERSION:+dim/$DIM_VERSION-$DIM_REVISION} \\
49-
${GCC_TOOLCHAIN_VERSION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} \\
48+
${DIM_REVISION:+dim/$DIM_VERSION-$DIM_REVISION} \\
49+
${GCC_TOOLCHAIN_REVISION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} \\
5050
libInfoLogger/$LIBINFOLOGGER_VERSION-$LIBINFOLOGGER_REVISION \\
5151
ReadoutCard/$READOUTCARD_VERSION-$READOUTCARD_REVISION
5252
5353
# Our environment
54-
setenv ALF_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
55-
prepend-path PATH \$::env(ALF_ROOT)/bin
56-
prepend-path LD_LIBRARY_PATH \$::env(ALF_ROOT)/lib
57-
prepend-path PYTHONPATH \$::env(ALF_ROOT)/lib
54+
set ALF_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
55+
setenv ALF_ROOT \$ALF_ROOT
56+
prepend-path PATH \$ALF_ROOT/bin
57+
prepend-path LD_LIBRARY_PATH \$ALF_ROOT/lib
58+
prepend-path PYTHONPATH \$ALF_ROOT/lib
5859
EoF
5960
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles

‎alidpg.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module load BASE/1.0
2222
# Our environment
2323
setenv ALIDPG_RELEASE \$version
2424
setenv ALIDPG_VERSION $PKGVERSION
25-
setenv ALIDPG_ROOT \$::env(BASEDIR)/$PKGNAME/\$::env(ALIDPG_RELEASE)
25+
set ALIDPG_ROOT \$::env(BASEDIR)/$PKGNAME/\$::env(ALIDPG_RELEASE)
26+
setenv ALIDPG_ROOT \$ALIDPG_ROOT
2627
EoF
2728
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles

‎alien-root-legacy.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ proc ModulesHelp { } {
5858
set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
5959
module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
6060
# Dependencies
61-
module load BASE/1.0 ${GCC_TOOLCHAIN_VERSION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} \\
62-
ROOT/${ROOT_VERSION}-${ROOT_REVISION} \\
63-
XRootD/${XROOTD_VERSION}-${XROOTD_REVISION} \\
61+
module load BASE/1.0 ${GCC_TOOLCHAIN_REVISION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} \\
62+
ROOT/${ROOT_VERSION}-${ROOT_REVISION} \\
63+
XRootD/${XROOTD_VERSION}-${XROOTD_REVISION} \\
6464
xalienfs/${XALIENFS_VERSION}-${XALIENFS_REVISION}
6565
6666
# Our environment

‎alien-workqueue.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@
2828
# Dependencies
2929
module load BASE/1.0 ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} cctools/$CCTOOLS_VERSION-$CCTOOLS_REVISION
3030
# Our environment
31-
setenv ALIEN_WORKQUEUE_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
32-
prepend-path PATH \$::env(ALIEN_WORKQUEUE_ROOT)/bin
33-
prepend-path LD_LIBRARY_PATH \$::env(ALIEN_WORKQUEUE_ROOT)/lib
34-
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(ALIEN_WORKQUEUE_ROOT)/lib")
31+
set ALIEN_WORKQUEUE_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
32+
setenv ALIEN_WORKQUEUE_ROOT \$ALIEN_WORKQUEUE_ROOT
33+
prepend-path PATH \$ALIEN_WORKQUEUE_ROOT/bin
34+
prepend-path LD_LIBRARY_PATH \$ALIEN_WORKQUEUE_ROOT/lib
3535
EoF

‎aligenmc.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@
2222
# Dependencies
2323
module load BASE/1.0
2424
# Our environment
25-
setenv ALIGENMC_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
26-
prepend-path PATH \$::env(ALIGENMC_ROOT)
25+
set ALIGENMC_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
26+
setenv ALIGENMC_ROOT \$ALIGENMC_ROOT
27+
prepend-path PATH \$ALIGENMC_ROOT
2728
EoF

‎aliphysics.sh‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,13 @@ proc ModulesHelp { } {
7979
set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
8080
module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
8181
# Dependencies
82-
module load BASE/1.0 AliRoot/$ALIROOT_VERSION-$ALIROOT_REVISION ${ROOUNFOLD_VERSION:+RooUnfold/$ROOUNFOLD_VERSION-$ROOUNFOLD_REVISION} ${TREELITE_VERSION:+treelite/$TREELITE_VERSION-$TREELITE_REVISION} ${KFPARTICLE_VERSION:+KFParticle/$KFPARTICLE_VERSION-$KFPARTICLE_REVISION}
82+
module load BASE/1.0 AliRoot/$ALIROOT_VERSION-$ALIROOT_REVISION ${ROOUNFOLD_REVISION:+RooUnfold/$ROOUNFOLD_VERSION-$ROOUNFOLD_REVISION} ${TREELITE_REVISION:+treelite/$TREELITE_VERSION-$TREELITE_REVISION} ${KFPARTICLE_REVISION:+KFParticle/$KFPARTICLE_VERSION-$KFPARTICLE_REVISION}
8383
# Our environment
8484
setenv ALIPHYSICS_VERSION \$version
8585
setenv ALIPHYSICS_RELEASE \$::env(ALIPHYSICS_VERSION)
8686
setenv ALICE_PHYSICS \$::env(BASEDIR)/$PKGNAME/\$::env(ALIPHYSICS_RELEASE)
87-
prepend-path PATH \$::env(ALICE_PHYSICS)/bin
88-
prepend-path LD_LIBRARY_PATH \$::env(ALICE_PHYSICS)/lib
89-
prepend-path ROOT_INCLUDE_PATH \$::env(ALICE_PHYSICS)/include
90-
$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(ALICE_PHYSICS)/lib")
87+
prepend-path PATH \$ALICE_PHYSICS/bin
88+
prepend-path LD_LIBRARY_PATH \$ALICE_PHYSICS/lib
89+
prepend-path ROOT_INCLUDE_PATH \$ALICE_PHYSICS/include
9190
EoF
9291
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles

‎aliroot-guntest.sh‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,22 @@ cd test/gun
1818
./runtest.sh
1919

2020
# test outcome and return the error code
21-
WITHESDCHECK=${ALIPHYSICS_VERSION:+yes} ./finalcheck.sh
21+
WITHESDCHECK=${ALIPHYSICS_REVISION:+yes} ./finalcheck.sh
22+
23+
# Modulefile
24+
MODULEDIR="$INSTALLROOT/etc/modulefiles"
25+
MODULEFILE="$MODULEDIR/$PKGNAME"
26+
mkdir -p "$MODULEDIR"
27+
cat > "$MODULEFILE" <<EoF
28+
#%Module1.0
29+
proc ModulesHelp { } {
30+
global version
31+
puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
32+
}
33+
set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
34+
module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
35+
# Dependencies
36+
module load BASE/1.0 AliRoot/$ALIROOT_VERSION-$ALIROOT_REVISION AliRoot-OCDB/$ALIROOT_OCDB_VERSION-$ALIROOT_OCDB_REVISION
37+
# Our environment
38+
set ALIROOT_GUNTEST_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
39+
EoF

‎aliroot-ocdb.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package: AliRoot-OCDB
2-
source: https://gitlab.cern.ch/alisw/AliRootOCDB.git
32
version: "%(short_hash)s"
43
tag: master
4+
source: https://gitlab.cern.ch/alisw/AliRootOCDB.git
55
---
66
#!/bin/bash -e
77
rsync -av --delete --exclude="**/.git" $SOURCEDIR/ $INSTALLROOT/
@@ -20,5 +20,6 @@ module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@
2020
# Dependencies
2121
module load BASE/1.0
2222
# Our environment
23-
setenv ALIROOT_OCDB_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
23+
set ALIROOT_OCDB_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
24+
setenv ALIROOT_OCDB_ROOT \$ALIROOT_OCDB_ROOT
2425
EoF

0 commit comments

Comments
 (0)