v96r4

CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
 
-set(Geant4_version 4.9.5.p02)
+set(Geant4_version 4.9.6.p04)
 
 if(DEFINED ENV{G4_NATIVE_VERSION})
   # Override the version of Geant4 from the variable
@@ -13,11 +13,8 @@ if(DEFINED ENV{G4_NATIVE_VERSION})
 endif()
 
 find_package(GaudiProject)
-gaudi_project(Geant4 v95r2p8g2
-              DATA Geant4Files VERSION v95r*)
-
-file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX})
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../include ${CMAKE_INSTALL_PREFIX}/include)
+gaudi_project(Geant4 v96r4
+              DATA Geant4Files VERSION v96r*)
 
 # FIXME: hack for compatibility with CMT build
 file(WRITE ${CMAKE_BINARY_DIR}/dummy.cpp "")

Geant4/G4GDML/cmt/requirements

 package        G4GDML
-version        v1r0
+version        v2r0
 branches cmt doc G4GDML
 
 # =============================================================================
@@ -12,7 +12,7 @@ use  XercesC     v*   LCG_Interfaces
 # =============================================================================
 # ============ library ========================================================
 # =============================================================================
-library        G4GDML  $(G4LibraryFlags) \ 
+library        G4persistency  $(G4LibraryFlags) \ 
                          ../src/*.cc 
 
 # =============================================================================
@@ -20,7 +20,12 @@ library        G4GDML  $(G4LibraryFlags) \
 # =============================================================================
 
 # =============================================================================
-apply_pattern   G4AllCMTpatterns
+apply_pattern  package_stamps
+apply_pattern  packageDir
+apply_pattern  library_Softlinks library=G4persistency
+apply_pattern  linker_library    library=G4persistency
+#apply_pattern  package_linkopts
+apply_pattern  package_shlibflags
 
 apply_pattern disable_package_on platform=target-darwin
 apply_pattern disable_package_on platform=target-winxp
@@ -28,5 +33,6 @@ apply_pattern disable_package_on platform=target-winxp
 private
 # script and pattern to copy from $G4SRC/persistency/gdml
 apply_pattern G4_copy_gdml_source
+macro_append G4persistency_dependencies ' G4GDML_gdml_source_copy '
 end_private
 

Geant4/G4GDML/doc/release.notes

@@ -3,6 +3,22 @@
 ! Responsible :  
 ! Purpose     : Package holding the GDML code
 !-----------------------------------------------------------------------------
+! ======================= G4GDML v2r0 2015-03-06 ========================
+
+! 2015-03-06 - Nigel Watsoncic
+  - Tagged for 9.6
+
+! 2013-09-23 - Marco Clemencic
+ - Removed wrong pattern.
+
+! 2013-09-20 - Marco Clemencic
+ - Fixed missing dependency.
+
+! 2013-09-19 - Marco Clemencic
+ - Fixed compilation.
+
+! 2013-09-17 - Marco Clemencic
+ - Fixes for compatibility between CMake build and CMT.
 
 ! ======================= G4GDML v1r0 2012-07-18 ========================
 ! 2012-07-18 - Nigel Watson

Geant4/G4UIGAG/cmt/requirements

 package        G4UIGAG
-version        v4r2
+version        v4r3
 branches       cmt doc G4UIGAG 
 
 # =============================================================================
 # ============ dependencies ===================================================
 # =============================================================================
-use            G4UIbasic   v*   Geant4
+#use            G4UIbasic   v*   Geant4
+use             G4UIcommon  v*   Geant4
 
 # =============================================================================
 # ============ dependencies ===================================================

Geant4/G4UIGAG/doc/release.notes

@@ -4,6 +4,13 @@
 ! Purpose     : 
 !-----------------------------------------------------------------------------
 
+!========================== G4UIGAG v4r3 2015-03-02 ==========================
+! 20154-03-06 - Nigel Watson
+ - For release with 9.6 G4
+
+! 2014-03-06 - James Mccarthy
+ - Changed dependecnies to build G4UIGAG before G4basic
+
 !========================== G4UIGAG v4r2 2011-04-12 ==========================
 ! 2011-04-12 - Gloria Corti
  - Introduce use of pattern to switch off building this package on MacOS and

Geant4/G4UIbasic/cmt/requirements

 package         G4UIbasic
-version         v4r3
+version         v4r4
 branches        cmt doc G4UIbasic 
 
 # =============================================================================
 # ============ dependencies ===================================================
 # =============================================================================
 use            G4UIcommon   v*   Geant4
+use            G4UIGAG      v*   Geant4
 use            G4run        v*   Geant4
 
 # =============================================================================

Geant4/G4UIbasic/doc/release.notes

@@ -3,6 +3,11 @@
 ! Responsible : Gloria CORTI, Silvia MIGLIORANZI
 ! Purpose     : 
 !-----------------------------------------------------------------------------
+!========================== G4UIbasic v4r4 2015-03-06 ========================
+! 2015-03-06 - Nigel Watson
+ - tagged for release with G4 9.6
+! 2014-03-06 - James Mccarthy
+ - Changed dependencies to build G4UIGAG before G4UIbasic
 
 !========================== G4UIbasic v4r3 2011-04-12 ========================
 ! 2011-04-12 - Gloria Corti

Geant4/G4config/CMakeLists.txt

@@ -9,6 +9,18 @@ else()
   set(G4VERBOSE ON)
 endif()
 
+if(NOT G4DATA AND Geant4Files_XENV)
+  execute_process(COMMAND ${env_cmd} --xml ${Geant4Files_XENV} printenv G4DATA
+                  OUTPUT_VARIABLE G4DATA)
+  string(STRIP "${G4DATA}" G4DATA)
+  if(G4DATA)
+    message(STATUS "Using G4DATA from ${G4DATA}")
+    set(G4DATA "${G4DATA}" CACHE PATH "Directory with Geant4 data")
+  endif()
+else()
+  set(G4DATA ../share)
+endif()
+
 include(ExternalProject)
 
 ExternalProject_Add(Geant4
@@ -26,12 +38,12 @@ ExternalProject_Add(Geant4
               -DGEANT4_USE_NETWORKDAWN=ON
               -DGEANT4_USE_INVENTOR=OFF
               -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/InstallArea/$ENV{CMTCONFIG}
-              -DCMAKE_INSTALL_INCLUDEDIR=../include
-              -DCMAKE_INSTALL_DATAROOTDIR=../share
+              -DGEANT4_INSTALL_DATADIR=${G4DATA}
               -DGEANT4_BUILD_VERBOSE_CODE=${G4VERBOSE}
               -DCMAKE_USE_CCACHE=${CMAKE_USE_CCACHE}
               -DCMAKE_USE_DISTCC=${CMAKE_USE_DISTCC}
               -DLCG_USE_NATIVE_COMPILER=${LCG_USE_NATIVE_COMPILER}
+              -DCMAKE_MODULE_PATH=${Geant4Files_DIR}
 )
 
 # Hardcoded list of external packages used by Geant4, needed to prepare the

Geant4/G4config/cmt/copy_UI_source.bat

-echo nothing to do

Geant4/G4config/cmt/copy_UI_source.sh

-#set echo on
-#copy files from G4Dir = interfaces
-G4Dir="interfaces"
-
-here=$PWD
- 
-pack=`cmt -quiet show macro_value package`
-if [ "$pack" == "G4UIbasic" -o "$pack" == "G4UIcommon" ]
-then
-  pp=`echo $pack | tr -d "G4UI"`
-  p="${pp}/src"
-elif [ "$pack" == "G4UIGAG" ] 
-then
-  p="GAG/src"
-fi  
-
-
-cd $here/..
-
-if [ ! -d $p ] 
- then
-   mkdir -p $p
-   $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/*.* ${p}/.
-   $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/../include/*.* ${pack}/.
-   echo ' source files have been copied from '${G4SRC}'/'${G4Dir}
-else
-   echo ${G4Dir}/${p} ' exists - skip copy'
-fi
-
-cd $here
-
-unset echo
-

Geant4/G4config/cmt/copy_externalslcg_source.sh

-#set echo on
-#nkw 21-jun-2012
-#copy files from G4 directory  = externals
-# expat available on most linux, and also in LCG external area, but propose to adopt the version packaged within G4 to reduce unnecessary external dependences.
-# Initially, set up for copying only expat, but anticipate we re-use this to use the g4 provided version of clhep as well.
-G4Dir="externals"
-
-here=$PWD
- 
-pack=`cmt -quiet show macro_value package`
-if [ "$pack" == "G4externalslcg" ]
-then
-  p="expat/src"
-fi  
-
-
-cd $here/..
-
-if [ ! -d $p ] 
- then
-   mkdir -p $p
-   $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/*.* ${p}/.
-   $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/../include/*.* ${pack}/.
-   echo "Source files have been copied from ${G4SRC}/${G4Dir}/${p}"
-else
-   echo "${G4Dir}/${p} already exists, skipped copy"
-fi
-
-cd $here
-
-unset echo
-

Geant4/G4config/cmt/copy_gdml_source.sh

-#!/usr/bin/env csh
-# NKW  18-Jul-2012
-# Non-standard copy script required to get GDML sources from G4 release area.
-#set -x
-G4Dir = "persistency/gdml"
-
-here = $PWD
-list="" 
-pack = `cmt -quiet show macro_value package`
-if [ "$pack" == "G4GDML" ] then
-  list = "src schema"
-fi
-
-cd $here/..
-
-for p in $list
- do
-  if [ ! -d $p ] 
-   then
-   mkdir -p $p
-   $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/*.* ${p}/.
-# Easier to just copy includes a second time.
-   $G4_UNIX_COPY ${G4SRC}/${G4Dir}/${p}/../include/*.* ${pack}/.
-   echo "Source files have been copied from ${G4SRC}/{$G4Dir}/${p}"
-  else
-   echo "${G4SRC}/${p} already exists, skipped copy"
-  fi
-done
-
-cd $here
-
-#set +x
-

Geant4/G4config/cmt/copy_hadlists_source.sh

-#set -x
-
-here=$PWD
-package="G4hadlists"
-pack="physics_lists"
-
-src_dir=${G4SRC}/../${pack}/hadronic
-list="LHEP/src QGSP_BERT_HP/src LHEP_BERT_HP/src QGSP/src QGSP_HP/src Packaging/src"
-incl="LHEP/include QGSP_BERT_HP/include LHEP_BERT_HP/include QGSP/include QGSP_HP/include Packaging/include"
-
-cd $here/..
-
-n=yes
-for p in $list
-do
-   if [ ! -d $p ] 
-   then
-    mkdir -p $p
-    cp -a ${src_dir}/${p}/*.* ${p}/.
-   else
-#   echo ' ' ${src_dir}/${p} ' exists - skip copy'
-    n=no
-   fi
-done
-
-if [ "$n" == "yes" ] 
-then 
-  echo ' source files have been copied from '${src_dir}
-else 
-  echo ' source files exist - NO copy'
-fi
-#
-# copy include files if not yet done
-if [ !  -f ${package}.stamp ]
-then
-  for p in $incl
-  do
-     cp -a ${src_dir}/${p}/*.* ${package}/.
-  done
-  touch ${package}.stamp
-  echo ' include files have been copied from '${src_dir}
-else 
-  echo ' include files exist - NO copy'
-fi
-
-cd $here
-
-
-

Geant4/G4config/cmt/copy_include.bat

-echo nothing to do

Geant4/G4config/cmt/copy_include.sh

-here=$PWD
-
-cd ../../..
-
-incl_dir=${G4SHARE}/include/
-
-
- if [ ! -d InstallArea/include ] 
-  then
-    if [ ! -d InstallArea ]
-     then
-       mkdir -p InstallArea
-    fi
-    cd InstallArea
-    $G4_UNIX_COPY ${incl_dir} .
-    echo ' include files have been copied from '${incl_dir}
-  else
-    echo ' include files exist - NO copy from '${incl_dir}
- fi
-
-cd $here

Geant4/G4config/cmt/copy_proc_source.sh

-G4PSRC=${G4SRC}/processes
-here=$PWD
-
-pack=`cmt -quiet show macro_value package | tr -d "G4"`
-if [ "$pack" == "progen" ] 
- then
-   cd $G4PSRC
-   dir=$PWD
-   list1=`find . -maxdepth 2 -name src -print | sed -e 's;^./;;'`
-   list="${list1} electromagnetic/utils/src"
- else
-   cd ${G4PSRC}/${pack}
-   dir=$PWD
-   list=`find . -name src -print | sed -e 's;^./;;'`
-fi
-
-cd $here/..
-
-n=yes
-for p in $list
-do
- test=`echo $p | awk '{print(index($0,"test/"))}'`
- if [ "${test}" == "0" ]
- then
-  if [ ! -d $p ] 
-  then
-    mkdir -p $p
-    $G4_UNIX_COPY ${dir}/${p}/*.* ${p}/.
-    $G4_UNIX_COPY ${dir}/${p}/../include/*.* G4${pack}/.
-  else
-#  echo ' ' ${dir}/${p} ' exists - skip copy'
-   n=no 
-  fi
- fi
-done
-
-if [ "$n" == "yes" ] 
- then 
-   echo ' source files have been copied from '${dir}
- else 
-   echo ' source files exist - NO copy'
-fi
-
-cd $here
-

Geant4/G4config/cmt/copy_source.bat

-echo nothing to do

Geant4/G4config/cmt/copy_source.csh

@@ -55,10 +55,10 @@ cd $here
 
 # NKW 22/02/2014
 #Not pretty but will work.
-#if ( $pack == "processes" ) then
-#  echo "Copying patched CHIPS sources"
-#   ./copyPatchedSource.py
-#endif
+if ( $pack == "processes" ) then
+  echo "Copying patched sources"
+   ./copyPatchedSource.py
+endif
 unset echo