Merge branch 'DELPHI-367' into 'master'

version CERNLIB

See merge request !12

install/Makefile

@@ -7,6 +7,7 @@ SHELL=/bin/bash
 #
 # for 32bit set the environment variable LEGACY to "-m32"
 #
+CERNVER = 2023.02.16.0
 PRO     = 161018
 OLD     = 100710
 NEW     = 'prerelease'
@@ -77,7 +78,8 @@ cernlib: profiles logs
 	$(eval export CERN=$(shell set -x;DELPHI_INSTALL_DIR=$(DELPHI_INSTALL_DIR) source ./delphi.sh ; echo ${CERN}))
 	echo "starting cernlib"
 	mkdir -p $(CERN)
-	./make_cernlib $(CERN) $(LEGACY) > logs/make_cernlib.log 2>&1 || ( cat logs/make_cernlib.log; /bin/false )
+	./make_cernlib $(CERN) $(CERNVER) 0 $(LEGACY) > logs/make_cernlib-imake.log 2>&1 || ( cat logs/make_cernlib-imake.log; /bin/false )
+	./make_cernlib $(CERN) $(CERNVER) 1 $(LEGACY) > logs/make_cernlib-cmake.log 2>&1 || ( cat logs/make_cernlib-cmake.log; /bin/false )
 
 dstana_pre: profiles setup logs
 	./make_dstana $(NEW) $(DELPHI_SWCD) $(DELPHI_INSTALL_DIR) > logs/make_dstana_$(NEW).log 2>&1  || ( cat logs/make_dstana_$(NEW).log; /bin/false )

install/make_cernlib

-#!/bin/bash -x
+#!/bin/bash
 
 #
 # get and compile the community cernlib version
@@ -12,8 +12,8 @@ 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
+export version=$2
+export use_cmake=$3
 
 echo "compiling community CERNLIB in $instdir"
 if [ "x$CERN" = "x" ]; then
@@ -26,42 +26,44 @@ if [ "x$CERN" = "x" ]; then
     fi
 fi
 # create build directory and checkout the code
+if [ -d build ]; then
+    rm -rf build
+fi
 mkdir build
 cd build
-#git clone https://:@gitlab.cern.ch:8443/dphep/cernlib/cernlib.git
-git clone https://:@gitlab.cern.ch:8443/schwicke/cernlib.git
+git clone https://:@gitlab.cern.ch:8443/dphep/cernlib/cernlib.git
 cd cernlib
-git checkout cmake_review
+git checkout tags/cernlib-$version
 
 # select 2022 extensions
 echo '#define CERNLIB_2022 yes' >> config/host.def
 
-if [ "x$use_cmake" != "x" ]; then
-
+if [ "x$use_cmake" = "x1" ]; then
     mkdir build
     cd build
-    if [ -z $2 ]; then
+    if [ -z $4 ]; 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
+    cmake --install . --prefix ${CERN}/${version}-cm
 else
-    # always use buildin xbae for backward compatibility
+    # we always use buildin xbae for backward compatibility
     echo '#define CERNLIB_NOLIBXBAE YES' >> config/host.def
-    if [ -z $2 ]; then
+    if [ -z $4 ]; then
 	sh ./make_cernlib
     else
 	sh ./make_cernlib 32bit
     fi
-
+    mv $CERN/new $CERN/${version}-im
 fi
 
 if [ $? = 0 ]; then
     cd $CERN
-    ln -s new pro
+    ln -s ${version}-im pro
+    ln -s ${version}-cm new
     cd -
 else
     echo "Building of cernlib failed"

install/scripts/check_install

@@ -2,8 +2,26 @@
 rc=0;
 if [[ ! -z "${GROUP_DIR}" ]]; then
     cd delphi
+    epawx11=2
+    # check Motif CERN apps
+    fpawx11=`find . -name pawX11 | wc -l`
+    if [ "x$epawx11" = "x$fpawx11" ]; then
+	echo "pawX11 has been correctly created"
+    else
+	echo "pawX11 is missing."
+	rc=2
+    fi
+    epawpp=2
+    # check Motif CERN apps
+    fpawpp=`find . -name paw++ | wc -l`
+    if [ "x$epawpp" = "x$fpawpp" ]; then
+	echo "paw++ has been correctly created"
+    else
+	echo "paw++ is missing."
+	rc=2
+    fi
     # count testing libraries
-    elibs=442
+    elibs=471
     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

@@ -2,8 +2,26 @@
 rc=0;
 if [[ ! -z "${GROUP_DIR}" ]]; then
     cd $GROUP_DIR
+    epawx11=2
+    # check Motif CERN apps
+    fpawx11=`find . -name pawX11 | wc -l`
+    if [ "x$epawx11" = "x$fpawx11" ]; then
+	echo "pawX11 has been correctly created"
+    else
+	echo "pawX11 is missing."
+	rc=2
+    fi
+    epawpp=2
+    # check Motif CERN apps
+    fpawpp=`find . -name paw++ | wc -l`
+    if [ "x$epawpp" = "x$fpawpp" ]; then
+	echo "paw++ has been correctly created"
+    else
+	echo "paw++ is missing."
+	rc=2
+    fi
     # count testing libraries
-    elibs=436
+    elibs=465
     flibs=`find . -name \*.a | wc -l`
     if [ "x$elibs" = "x$flibs" ]; then
 	echo "All expected $elibs libraries have been created"