From c00a3b6c42bfd1867958150aa2d555adccc59c8d Mon Sep 17 00:00:00 2001
From: Sergio <sergio.garcia.de.la.cruz@cern.ch>
Date: Tue, 26 Nov 2024 12:12:35 +0100
Subject: [PATCH 1/5] Add -j $JOBS to the CMake invocations missing it

Also addressing some linting changes
---
 catch2.sh           |  2 +-
 faircmakemodules.sh | 12 ++++++------
 fmt.sh              |  8 ++++----
 ninja.sh            |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/catch2.sh b/catch2.sh
index 61c45f196e..18ae113bce 100644
--- a/catch2.sh
+++ b/catch2.sh
@@ -17,7 +17,7 @@ cmake "$SOURCEDIR"                                  \
       -DBUILD_SHARED_LIBS=ON                        \
       -GNinja -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"
 
-cmake --build . --target install
+cmake --build . --target install ${JOBS:+-- -j$JOBS}
 
 # Modulefile
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
diff --git a/faircmakemodules.sh b/faircmakemodules.sh
index 70d81546dc..2dfabe544b 100644
--- a/faircmakemodules.sh
+++ b/faircmakemodules.sh
@@ -8,16 +8,16 @@ build_requires:
 ---
 #!/bin/sh
 
-cmake -S $SOURCEDIR -B .                                        \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT                       \
-      ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"}                 \
+cmake -S "$SOURCEDIR" -B .                                        \
+      -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"                       \
+      ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"}                   \
       ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE}
 
-cmake --build . --target install
+cmake --build . --target install ${JOBS:+-- -j$JOBS}
 
 # Modulefile
 mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
+cat > etc/modulefiles/"$PKGNAME" <<EoF
 #%Module1.0
 proc ModulesHelp { } {
   global version
@@ -30,4 +30,4 @@ module load BASE/1.0
 # Our environment
 set FAIRCMAKEMODULES_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
+mkdir -p "$INSTALLROOT"/etc/modulefiles && rsync -a --delete etc/modulefiles/ "$INSTALLROOT"/etc/modulefiles
diff --git a/fmt.sh b/fmt.sh
index 370da2e944..1ea157d6d7 100644
--- a/fmt.sh
+++ b/fmt.sh
@@ -12,16 +12,16 @@ prepend_path:
   ROOT_INCLUDE_PATH: "$FMT_ROOT/include"
 ---
 #!/bin/bash -e
-cmake $SOURCEDIR -GNinja -DCMAKE_INSTALL_PREFIX=$INSTALLROOT -DFMT_TEST=OFF -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_SHARED_LIBS=ON
+cmake "$SOURCEDIR" -GNinja -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" -DFMT_TEST=OFF -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_SHARED_LIBS=ON
 
-cmake --build . --target install
+cmake --build . --target install ${JOBS:+-- -j$JOBS}
 
 # Modulefile
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 mkdir -p "$MODULEDIR"
 
-alibuild-generate-module --lib --cmake > $MODULEFILE
-cat << EOF >> $MODULEFILE
+alibuild-generate-module --lib --cmake > "$MODULEFILE"
+cat << EOF >> "$MODULEFILE"
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EOF
diff --git a/ninja.sh b/ninja.sh
index 87f35c9c22..b872587175 100644
--- a/ninja.sh
+++ b/ninja.sh
@@ -8,10 +8,10 @@ build_requires:
   - alibuild-recipe-tools
 ---
 #!/bin/bash
-cmake -Bbuild-cmake $SOURCEDIR
-cmake --build build-cmake
+cmake -Bbuild-cmake "$SOURCEDIR"
+cmake --build build-cmake ${JOBS:+-j$JOBS}
 
-mkdir -p $INSTALLROOT/bin
+mkdir -p "$INSTALLROOT"/bin
 cp build-cmake/ninja "$INSTALLROOT/bin"
 
 mkdir -p "$INSTALLROOT/etc/modulefiles"

From b08a5baf9c28371edcbe58d231a218816c023f4a Mon Sep 17 00:00:00 2001
From: Sergio <sergio.garcia.de.la.cruz@cern.ch>
Date: Thu, 28 Nov 2024 17:06:17 +0100
Subject: [PATCH 2/5] Bump fmt

---
 fmt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fmt.sh b/fmt.sh
index 1ea157d6d7..8c660f4bc3 100644
--- a/fmt.sh
+++ b/fmt.sh
@@ -1,6 +1,6 @@
 package: fmt
 version: "%(tag_basename)s"
-tag: 10.1.1
+tag: 11.0.2
 source: https://github.com/fmtlib/fmt
 requires:
   - "GCC-Toolchain:(?!osx)"

From 27ee190e8b1819a8dea0b58d2f1800245447d402 Mon Sep 17 00:00:00 2001
From: Sergio <sergio.garcia.de.la.cruz@cern.ch>
Date: Thu, 28 Nov 2024 17:45:51 +0100
Subject: [PATCH 3/5] Modernize module

---
 faircmakemodules.sh | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/faircmakemodules.sh b/faircmakemodules.sh
index 2dfabe544b..490b512c16 100644
--- a/faircmakemodules.sh
+++ b/faircmakemodules.sh
@@ -5,6 +5,7 @@ source: https://github.com/FairRootGroup/FairCMakeModules
 build_requires:
   - CMake
   - "GCC-Toolchain:(?!osx)"
+  - alibuild-recipe-tools
 ---
 #!/bin/sh
 
@@ -15,19 +16,5 @@ cmake -S "$SOURCEDIR" -B .                                        \
 
 cmake --build . --target install ${JOBS:+-- -j$JOBS}
 
-# Modulefile
-mkdir -p etc/modulefiles
-cat > etc/modulefiles/"$PKGNAME" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-set FAIRCMAKEMODULES_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-EoF
-mkdir -p "$INSTALLROOT"/etc/modulefiles && rsync -a --delete etc/modulefiles/ "$INSTALLROOT"/etc/modulefiles
+mkdir -p "$INSTALLROOT/etc/modulefiles"
+alibuild-generate-module --cmake > "$INSTALLROOT/etc/modulefiles/$PKGNAME"

From 30a4e2b4c9f31e357f3f98b2f964e8e528d3c118 Mon Sep 17 00:00:00 2001
From: Sergio <sergio.garcia.de.la.cruz@cern.ch>
Date: Sun, 8 Dec 2024 18:49:22 +0100
Subject: [PATCH 4/5] Revert "Bump fmt"

This reverts commit b08a5baf9c28371edcbe58d231a218816c023f4a.
---
 fmt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fmt.sh b/fmt.sh
index 8c660f4bc3..1ea157d6d7 100644
--- a/fmt.sh
+++ b/fmt.sh
@@ -1,6 +1,6 @@
 package: fmt
 version: "%(tag_basename)s"
-tag: 11.0.2
+tag: 10.1.1
 source: https://github.com/fmtlib/fmt
 requires:
   - "GCC-Toolchain:(?!osx)"

From 011755f82924b70374387f92782688e84c8be13c Mon Sep 17 00:00:00 2001
From: Sergio <sergio.garcia.de.la.cruz@cern.ch>
Date: Sun, 8 Dec 2024 18:49:30 +0100
Subject: [PATCH 5/5] Bump catch2

---
 catch2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catch2.sh b/catch2.sh
index 18ae113bce..67c807a08e 100644
--- a/catch2.sh
+++ b/catch2.sh
@@ -1,6 +1,6 @@
 package: Catch2
 version: "%(tag_basename)s"
-tag: v3.7.0
+tag: v3.7.1
 source: https://github.com/catchorg/Catch2
 requires:
   - "GCC-Toolchain:(?!osx)"