Import Geant4 6.2.0 source tree
This commit is contained in:
@@ -73,6 +73,12 @@ setenv NeutronHPCrossSections "$g4neutronhpcrosssections"
|
||||
echo "On this machine the NeutronHPCrossSections=\$NeutronHPCrossSections"
|
||||
endif
|
||||
|
||||
#+
|
||||
if ( X$g4elasticdata != X ) then
|
||||
setenv G4ELASTICDATA "$g4elasticdata"
|
||||
echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
|
||||
endif
|
||||
|
||||
#
|
||||
# g4clhep.U
|
||||
#
|
||||
@@ -303,26 +309,8 @@ else
|
||||
# Check for Windows!
|
||||
if ( "X$G4SYSTEM" == "XWIN32-VC" || "X$G4SYSTEM" == "XWIN32-VC7" ) then
|
||||
|
||||
setenv checkdrive `echo $HOME|cut -d"/" -f2`
|
||||
|
||||
if ( "X$checkdrive" == "Xcygdrive" ) then
|
||||
|
||||
setenv windrive `echo $HOME|cut -d"/" -f3`
|
||||
setenv winpath `echo $HOME|cut -d"/" -f4-`
|
||||
|
||||
setenv fullwinpath "$windrive:/$winpath"
|
||||
setenv G4WORKDIR $fullwinpath
|
||||
|
||||
endif # if cygwin syntax is used
|
||||
|
||||
if ( "X$winpath" == "X" ) then
|
||||
echo "G4WORKDIR will be set to ${G4WORKDIR}geant4 (in "native" Windows syntax)."
|
||||
setenv G4WORKDIR ${G4WORKDIR}geant4
|
||||
else
|
||||
echo "G4WORKDIR will be set to $G4WORKDIR/geant4 (in "native" Windows syntax)."
|
||||
setenv G4WORKDIR $G4WORKDIR/geant4
|
||||
endif
|
||||
|
||||
echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)."
|
||||
setenv G4WORKDIR "c:/geant4"
|
||||
|
||||
else # if Unix
|
||||
|
||||
|
||||
+12
-20
@@ -97,6 +97,15 @@ echo "On this machine the NeutronHPCrossSections=\$NeutronHPCrossSections"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4elasticdata != X ] ; then
|
||||
G4ELASTICDATA="$g4elasticdata"
|
||||
export G4ELASTICDATA
|
||||
if [ X\$g4non_display = X ] ; then
|
||||
echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
# g4clhep.U
|
||||
#
|
||||
@@ -430,26 +439,9 @@ if [ X$g4non_display = X ] ; then
|
||||
# Check for Windows!
|
||||
if test "X$G4SYSTEM" = "XWIN32-VC" -o "X$G4SYSTEM" = "XWIN32-VC7"; then
|
||||
|
||||
checkdrive=`echo $HOME|cut -d"/" -f2`
|
||||
|
||||
if test "X$checkdrive" = "Xcygdrive"; then
|
||||
|
||||
windrive=`echo $HOME|cut -d"/" -f3`
|
||||
winpath=`echo $HOME|cut -d"/" -f4-`
|
||||
|
||||
fullwinpath="$windrive:/$winpath"
|
||||
G4WORKDIR=$fullwinpath
|
||||
|
||||
fi # if cygwin syntax is used
|
||||
|
||||
if test "X$winpath" = "X"; then
|
||||
echo "G4WORKDIR will be set to ${G4WORKDIR}geant4 (in "native" Windows syntax)"
|
||||
export G4WORKDIR=${G4WORKDIR}geant4
|
||||
else
|
||||
echo "G4WORKDIR will be set to $G4WORKDIR/geant4 (in "native" Windows syntax)"
|
||||
export G4WORKDIR=${G4WORKDIR}/geant4
|
||||
fi
|
||||
|
||||
echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)"
|
||||
G4WORKDIR="c:/geant4"
|
||||
export G4WORKDIR
|
||||
|
||||
else # if Unix
|
||||
|
||||
|
||||
@@ -60,6 +60,12 @@ export G4LIB
|
||||
echo "On this machine the G4LIB=\$G4LIB"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4lib != X ] ; then
|
||||
G4BIN="$g4lib/../bin"
|
||||
export G4BIN
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4levelgammadata != X ] ; then
|
||||
G4LEVELGAMMADATA="$g4levelgammadata"
|
||||
@@ -88,6 +94,13 @@ export NeutronHPCrossSections
|
||||
echo "On this machine the NeutronHPCrossSections=\$NeutronHPCrossSections"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4elasticdata != X ] ; then
|
||||
G4ELASTICDATA="$g4elasticdata"
|
||||
export G4ELASTICDATA
|
||||
echo "On this machine the G4ELASTICDATA=\$g4elasticdata"
|
||||
fi
|
||||
|
||||
#
|
||||
# g4clhep.U
|
||||
#
|
||||
@@ -335,8 +348,6 @@ fi
|
||||
|
||||
#####################################################################
|
||||
|
||||
echo g4conf=$g4conf
|
||||
|
||||
#####################################################################
|
||||
# Create GNUmakefile.db to keep ALL GNUmakefile DB :)
|
||||
|
||||
@@ -371,29 +382,59 @@ rm -rf $g4conf/g4make.log
|
||||
$g4make 2>&1 | tee $g4conf/g4make.log
|
||||
fi
|
||||
|
||||
# Check for errors in log file
|
||||
export err=\$[ \`grep Error $g4conf/g4make.log | wc -w\` ]
|
||||
export int=\$[ \`grep Stop\. $g4conf/g4make.log | wc -w\` ]
|
||||
# echo err=\$err
|
||||
if [ X$g4lib_build_dll = Xy ] ; then
|
||||
echo ""
|
||||
rm -rf $g4conf/g4make.log
|
||||
$g4make dll 2>&1 | tee $g4conf/g4make.log
|
||||
fi
|
||||
|
||||
if [ X\$err = X0 -a X\$int = X0 ] ; then
|
||||
if [ X$g4lib_build_dyn = Xy ] ; then
|
||||
echo ""
|
||||
rm -rf $g4conf/g4make.log
|
||||
$g4make global G4LIB_BUILD_SHARED=1 2>&1 | tee $g4conf/g4make.log
|
||||
fi
|
||||
|
||||
# Check for errors in log file
|
||||
if test -f \$g4conf/g4make.log ; then
|
||||
|
||||
# There are two (at least) shells 'sh' and 'bash' with
|
||||
# different arithmetic expansion...So we are doing it by 'text'
|
||||
# in two steps...
|
||||
|
||||
err=\`grep Error $g4conf/g4make.log | wc -w\`
|
||||
int=\`grep Stop\. $g4conf/g4make.log | wc -w\`
|
||||
|
||||
err2=\`echo \$err\`
|
||||
int2=\`echo \$int\`
|
||||
|
||||
if [ X\$err2 = X0 -a X\$int2 = X0 ] ; then
|
||||
echo ""
|
||||
echo "####################################################"
|
||||
echo "# Your Geant4 installation seems to be successful! #"
|
||||
echo "# To be sure please have a look into the log file: #"
|
||||
echo "# $g4conf/g4make.log #"
|
||||
echo "# Your Geant4 installation seems to be successful! "
|
||||
echo "# To be sure please have a look into the log file: "
|
||||
echo "# $g4conf/g4make.log "
|
||||
echo "####################################################"
|
||||
echo ""
|
||||
else
|
||||
echo ""
|
||||
echo "############################################################"
|
||||
echo "# It looks like you had errors during Geant4 installation #"
|
||||
echo "# (or interrupted installation)! #"
|
||||
echo "# Please check log file: #"
|
||||
echo "# $g4conf/g4make.log #"
|
||||
echo "# It looks like you had errors during Geant4 installation "
|
||||
echo "# (or interrupted installation)! "
|
||||
echo "# Please check log file: "
|
||||
echo "# $g4conf/g4make.log "
|
||||
echo "############################################################"
|
||||
echo ""
|
||||
fi
|
||||
else
|
||||
echo ""
|
||||
echo "############################################################"
|
||||
echo "# It looks like you had errors during Geant4 installation "
|
||||
echo "# (or interrupted installation)! "
|
||||
echo "# You have no log file: "
|
||||
echo "# $g4conf/g4make.log "
|
||||
echo "############################################################"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
# There is no env!
|
||||
if [ X$g4includes_flag = Xy ] ; then
|
||||
|
||||
Reference in New Issue
Block a user