Merge branch 'imake' into 'master'

switch back to imake build due to issues with cmake in 64bit for motif

See merge request !11

CI/al8_32.yml

@@ -132,6 +132,7 @@ idea_al8_32:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; echo $PATH; ls -l $CERN/pro/bin; which nypatchy; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/al8_64.yml

@@ -118,6 +118,7 @@ idea_al8_64:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/al9_32.yml

@@ -114,6 +114,7 @@ idea_al9_32:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/al9_64.yml

@@ -117,6 +117,7 @@ idea_al9_64:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/cc7_32.yml

@@ -134,6 +134,7 @@ idea_cc7_32:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/cc7_64.yml

@@ -121,6 +121,7 @@ idea_cc7_64:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/cs8_32.yml

@@ -132,6 +132,7 @@ idea_cs8_32:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; echo $PATH; ls -l $CERN/pro/bin; which nypatchy; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/cs8_64.yml

@@ -118,6 +118,7 @@ idea_cs8_64:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/cs9_32.yml

@@ -114,6 +114,7 @@ idea_cs9_32:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/cs9_64.yml

@@ -117,6 +117,7 @@ idea_cs9_64:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/ubuntu18_64.yml

@@ -174,6 +174,7 @@ idea_ubuntu18_64:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/ubuntu20_64.yml

@@ -174,6 +174,7 @@ idea_ubuntu20_64:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

CI/ubuntu22_64.yml

@@ -174,6 +174,7 @@ idea_ubuntu22_64:
     - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
     - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
     - path=`pwd`; cd install; export DELPHI_INSTALL_DIR=$path/delphi; make profiles; . delphi.sh; make idea
+  allow_failure: true
   artifacts:
     paths:
       - delphi

README.md

@@ -25,8 +25,8 @@ You need to have at least the following packages installed:
 * gcc and gfortran with 32bit support, including static libraries
 * X11 development libraries
 * Motif development libraries
-* OpenGL and devlepment libraries
-* xorg fonts
+* OpenGL and development libraries
+* Xorg fonts
 * tcsh
 
 ## Supported modules
@@ -36,13 +36,13 @@ The following DELPHI software components are supported by this script
 * simana for the years 1992-2000
 * delgra
 * DELPHI event server
+* Idea (unmaintained)
 
 ## New modules
 * OpenPhigs: forked from upstream version and added Fortran bindings
 
 ## Unsupported modules
 * WIRED (32bit, 64bit). As delgra support is continued, this is not considered to be a problem.
-* Idea, due to c++ language changes
 
 ## Operating systems
 This stack has been used on
@@ -50,6 +50,8 @@ This stack has been used on
 * CentOS7 (32bit, 64bit)
 * CentOSStream8 (32bit, 64bit)
 * CentOSStream9 (32bit, 64bit)
+* AlmaLinux 8 (32bit, 64bit)
+* AlmaLinux 9 (32bit, 64bit)
 * Ubuntu 16 (32bit) (unsupported)
 * Ubuntu 18 (32bit) (unsupported)
 * Ubuntu 20 (64bit)

install/make_cernlib

@@ -13,9 +13,11 @@ unset LDFLAGS
 # if $CERN is set we use that one, else we build from here
 export instdir=$1
 
+# export use_cmake=0 # uncomment to switch to cmake build
+
 echo "compiling community CERNLIB in $instdir"
 if [ "x$CERN" = "x" ]; then
-    if [ "x$instdir" == "x" ]; then
+    if [ "x$instdir" = "x" ]; then
 	export CERN=`pwd`/cern
     else
 	export CERN=$instdir
@@ -26,22 +28,36 @@ fi
 # create build directory and checkout the code
 mkdir build
 cd build
-git clone https://:@gitlab.cern.ch:8443/dphep/cernlib/cernlib.git
+#git clone https://:@gitlab.cern.ch:8443/dphep/cernlib/cernlib.git
+git clone https://:@gitlab.cern.ch:8443/schwicke/cernlib.git
 cd cernlib
+git checkout cmake_review
 
 # select 2022 extensions
 echo '#define CERNLIB_2022 yes' >> config/host.def
 
-mkdir build
-cd build
-if [ -z $2 ]; then
-    cmake -DCMAKE_INSTALL_DIR=/ -DCERNLIB_NO_SUFFIX=1 -DCERNLIB_2022=yes -DCERNLIB_ENABLE_TEST=ON -DCERNLIB_POSITION_INDEPENDENT_CODE=ON ..
+if [ "x$use_cmake" != "x" ]; then
+
+    mkdir build
+    cd build
+    if [ -z $2 ]; then
+	cmake -DCMAKE_INSTALL_DIR=/ -DCERNLIB_NO_SUFFIX=1 -DCERNLIB_2022=yes -DCERNLIB_ENABLE_TEST=ON -DCERNLIB_POSITION_INDEPENDENT_CODE=ON ..
+    else
+	cmake -DCMAKE_INSTALL_DIR=/ -DCERNLIB_NO_SUFFIX=1 -DCERNLIB_2022=yes -DCERNLIB_ENABLE_TEST=ON -DCERNLIB_FORCE_32=ON -DCERNLIB_POSITION_INDEPENDENT_CODE=ON ..
+    fi
+
+    make -j 20
+    cmake --install . --prefix $CERN/new
 else
-    cmake -DCMAKE_INSTALL_DIR=/ -DCERNLIB_NO_SUFFIX=1 -DCERNLIB_2022=yes -DCERNLIB_ENABLE_TEST=ON -DCERNLIB_FORCE_32=ON -DCERNLIB_POSITION_INDEPENDENT_CODE=ON ..
-fi
+    # always use buildin xbae for backward compatibility
+    echo '#define CERNLIB_NOLIBXBAE YES' >> config/host.def
+    if [ -z $2 ]; then
+	sh ./make_cernlib
+    else
+	sh ./make_cernlib 32bit
+    fi
 
-make -j 20
-cmake --install . --prefix $CERN/new
+fi
 
 if [ $? = 0 ]; then
     cd $CERN

install/scripts/check_install

 #!/bin/bash
 rc=0;
 if [[ ! -z "${GROUP_DIR}" ]]; then
-    cd $GROUP_DIR
+    cd delphi
     # count testing libraries
-    elibs=440
+    elibs=442
     flibs=`find . -name \*.a | wc -l`
     if [ "x$elibs" = "x$flibs" ]; then
 	echo "All expected $elibs libraries have been created"

install/scripts/check_install_nodelgra

@@ -3,7 +3,7 @@ rc=0;
 if [[ ! -z "${GROUP_DIR}" ]]; then
     cd $GROUP_DIR
     # count testing libraries
-    elibs=434
+    elibs=436
     flibs=`find . -name \*.a | wc -l`
     if [ "x$elibs" = "x$flibs" ]; then
 	echo "All expected $elibs libraries have been created"