Merge pull request #646 from tpersson/lxplus7updates

New build file for lxplus7 and reverting back to gc 7.2.

Author: madcern

Makefile_pre

@@ -20,7 +20,7 @@ SED    = sed
 GREP   = grep
 
 ifeq ($(USEGC),yes)
-GCDIR := gc-7.6.4
+GCDIR := gc-7.2f
 endif
 
 # end of makefile

VERSION

@@ -1,3 +1,3 @@
 VERSION      = 5.04.01
 VERSION_NUM  = 50401
-VERSION_DATE = 2018.06.08
+VERSION_DATE = 2018.09.10

libs/gc/Makefile_pre

@@ -16,6 +16,6 @@
 # | $Id$
 # |
 
-GCDIR := gc-7.6.4
+GCDIR := gc-7.2f
 
 # end of makefile

scripts/build-test-lxplus7.sh

@@ -0,0 +1,199 @@
+#! /bin/bash
+# run:
+# bash scripts/build-test-lxplus7.sh [noecho] [clone|update|clean] [nobuild] [notest]
+
+# env settings
+export PATH="`pwd`:$PATH"
+
+# error handler
+check_error ()
+{
+  if [ "$?" != "0" ] ; then
+    echo -e "\nERROR: $1"
+    [ "$2" != "no-exit" ] && exit 1
+  fi
+}
+
+# I/O redirection
+rm -f build-test-lxplus7.out
+if [ "$1" = "noecho" ] ; then
+  shift
+  export NOCOLOR=yes
+  exec > build-test-lxplus7.out 2>&1
+  check_error "redirection with noecho failed"
+else
+  exec > >(tee build-test-lxplus7.out) 2>&1
+  check_error "redirection with tee failed"
+fi
+
+# store lxplus7 node name in a file for cross platform debugging
+uname -n > build-test-lxplus7.run
+
+echo -e "\n===== Start of build and tests ====="
+echo "Date  : `date`"
+echo "UserId: `whoami`"
+echo "System: `uname -m -n -r -s`"
+echo "Script: $0 $@"
+echo "Shell : `echo $SHELL`"
+echo "User  : `echo $USER`"
+echo "Home  : `echo $HOME`"
+echo "Lang  : `echo $LANG`"
+echo "PWD   : `echo $PWD`"
+
+echo -e "\n===== Git clone/update/clean ====="
+if [ "$1" = "clone" ] ; then
+  shift # git clone
+  rm -rf madx-nightly7 && \
+  git clone https://github.com/MethodicalAcceleratorDesign/MAD-X.git madx-nightly7
+  check_error "git clone failed"
+  [ -d madx-nightly7 ] && cd madx-nightly7 && echo "moving down to cloned madx-nightly7"
+
+elif [ "$1" = "update" ] ; then
+  shift # faster "clone" + git cleanup
+  [ -d madx-nightly7 ] && cd madx-nightly7 && echo "moving down to updated madx-nightly7"
+  git fetch && \
+  git fetch --tags && \
+  git reset --hard origin/master
+  check_error "git update failed"
+  git clean -dfqx
+  check_error "git cleanup failed" "no-exit"
+
+elif [ "$1" = "clean" ] ; then
+  shift # git cleanup
+  [ -d madx-nightly7 ] && cd madx-nightly7 && echo "moving down to cleaned madx-nightly7"
+  git clean -fqx
+  check_error "git cleanup failed" "no-exit"
+
+else
+  echo "Skipped (no explicit request)."
+fi
+
+echo -e "\n===== Git info ====="
+git log -1 --format="Branch:  %d%nCommit:   %H%nAuthor:   %an <%ae>%nDate:     %ad (%ar)%nSubject:  %s"
+
+lasttest=`git for-each-ref refs/tags --sort=-committerdate --format='%(refname)' --count=1`
+echo -e "\nFiles changed since (last) release: ${lasttest##*/}"
+git diff --name-status $lasttest
+
+################################################################################
+if [ "$1" = "nobuild" ] ; then
+  echo -e "\nBuild and tests skipped (explicit request)."
+  echo -e "\nFinish: `date`"
+  echo -e "\n===== End ====="
+  exit
+fi
+################################################################################
+
+echo -e "\n===== Release number ====="
+cat VERSION
+
+echo -e "\n===== Gnu build ====="
+#source /afs/cern.ch/sw/lcg/contrib/gcc/4.8.1/i686-slc6/setup.sh
+#gcc      --version
+#g++      --version
+#gfortran --version
+
+#make all-linux32-gnu
+#check_error "make all-linux32-gnu failed" "no-exit"
+
+source /afs/cern.ch/sw/lcg/contrib/gcc/4.8.1/x86_64-slc6/setup.sh
+gcc      --version
+g++      --version
+gfortran --version
+
+make all-linux64-gnu
+check_error "make all-linux64-gnu failed" "no-exit"
+
+echo -e "\n===== Intel build ====="
+
+if [ -f "/cvmfs/projects.cern.ch/intelsw/psxe/linux/all-setup.sh" ] ; then
+  source /cvmfs/projects.cern.ch/intelsw/psxe/linux/all-setup.sh intel64
+fi
+
+if [ "`which icc`" != "" -a "`which ifort`" != "" ] ; then
+#  source /cvmfs/projects.cern.ch/intelsw/psxe/linux/all-setup.sh ia32
+#  icc      --version
+#  ifort    --version
+
+#  make all-linux32-intel
+#  check_error "make all-linux32-intel failed" "no-exit"
+
+  source /cvmfs/projects.cern.ch/intelsw/psxe/linux/all-setup.sh intel64
+  icc      --version
+  ifort    --version
+
+  make all-linux64-intel
+  check_error "make all-linux64-intel failed" "no-exit"
+else
+  echo "Intel compilers not found, skipped."
+fi
+
+echo -e "\n===== NagFor build ====="
+echo -e "\nNo more supported on AFS, skipped..."
+
+#export PATH="${PATH}:/afs/cern.ch/sw/fortran/nag2012/bin"
+#export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/afs/cern.ch/sw/fortran/nag2012/lib"
+#export NAG_KUSARI_FILE="/afs/cern.ch/sw/fortran/nag2012/lib/nag.licence.5.2,lxlicen04.cern.ch:"
+
+#make madx-linux32-nagfor
+#check_error "make madx-linux32-nagfor failed" "no-exit"
+
+#make madx-linux65-nagfor
+#check_error "make madx-linux64-nagfor failed" "no-exit"
+
+echo -e "\n===== Lahey 32 build ====="
+echo -e "\nNo more supported on AFS, skipped..."
+
+#source /afs/cern.ch/sw/lcg/contrib/gcc/4.8.1/i686-slc6/setup.sh
+#export PATH="${PATH}:/afs/cern.ch/sw/fortran/lahey/lf9562e/bin"
+#export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/afs/cern.ch/sw/fortran/lahey/lf9562e/lib"
+
+#make madx-linux32-lahey
+#check_error "make madx-linux32-lahey failed" "no-exit"
+
+echo -e "\n===== Binaries dependencies ====="
+make infobindep
+check_error "make infobindep failed" "no-exit"
+
+echo -e "\n===== Tests pointless files ====="
+make cleantest && make infotestdep
+check_error "make infotestdep failed" "no-exit"
+
+echo -e "\n===== Running tests (long) ====="
+if [ "$1" = "notest" ] ; then
+  shift
+  echo "Skipped (explicit request)."
+else
+  echo ""
+
+if [ "`which icc`" != "" -a "`which ifort`" != "" ] ; then
+#  echo -e "\n===== Testing madx-linux32-intel ====="
+#  make madx-linux32-intel && ls -l madx32 && make cleantest && make tests-all COMP=intel ARCH=32 NOCOLOR=$NOCOLOR
+#  check_error "make tests-all for madx-linux32-intel failed"  "no-exit"
+
+  echo -e "\n===== Testing madx-linux64-intel ====="
+  make madx-linux64-intel && ls -l madx64 && make cleantest && make tests-all COMP=intel ARCH=64 NOCOLOR=$NOCOLOR
+  check_error "make tests-all for madx-linux64-intel failed" "no-exit"
+else
+  echo "Intel compilers not found, skipped."
+fi
+
+#  echo -e "\n===== Testing madx-linux32-gnu ====="
+#  make madx-linux32-gnu && ls -l madx32 && make cleantest && make tests-all COMP=gnu ARCH=32 NOCOLOR=$NOCOLOR
+#  check_error "make tests-all for madx-linux32-gnu failed"  "no-exit"
+
+  echo -e "\n===== Testing madx-linux64-gnu ====="
+  make madx-linux64-gnu && ls -l madx64 && make cleantest && make tests-all COMP=gnu ARCH=64 NOCOLOR=$NOCOLOR
+  check_error "make tests-all for madx-linux64-gnu failed"  "no-exit"
+fi
+
+# restore the default version
+#make madx-linux32-gnu > /dev/null && \
+make madx-linux64-gnu > /dev/null
+check_error "unable to restore the default version" "no-exit"
+
+# date & end marker
+echo -e "\nFinish: `date`"
+echo -e "\n===== End of build and tests ====="
+
+exit