Changeset 1349 for trunk/config/scripts


Ignore:
Timestamp:
Jan 5, 2011, 12:20:17 PM (15 years ago)
Author:
garnier
Message:

update

Location:
trunk/config/scripts
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/config/scripts/CVS/Entries

    r1337 r1349  
    1 /GNUmakefile/1.8/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
    2 /binmake.gmk/1.11/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
    3 /env.csh.SH/1.49/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
    4 /env.sh.SH/1.54/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
    5 /install.sh.SH/1.45/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
    6 /move.sh.SH/1.18/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
     1/GNUmakefile/1.8/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-ref-00
     2/binmake.gmk/1.11/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-ref-00
     3/env.csh.SH/1.50/Wed Dec 22 10:21:15 2010//Tgeant4-09-04-ref-00
     4/env.sh.SH/1.55/Wed Dec 22 10:21:15 2010//Tgeant4-09-04-ref-00
     5/install.sh.SH/1.46/Wed Dec 22 10:21:15 2010//Tgeant4-09-04-ref-00
     6/move.sh.SH/1.18/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-ref-00
    77D

  • trunk/config/scripts/CVS/Tag

    r1331 r1349  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/config/scripts/env.csh.SH

    r1337 r1349  
    4242unsetenv  G4REALSURFACEDATA
    4343unsetenv  G4NEUTRONXSDATA
     44unsetenv  G4PIIDATA
    4445
    4546unsetenv  G4LIB
    … …  
    170171endif
    171172
     173#+
     174if ( X$g4piidata != X ) then
     175    setenv G4PIIDATA "$g4piidata"
     176    echo "On this machine the G4PIIDATA=\$G4PIIDATA"
     177endif
     178
     179
    172180
    173181#

  • trunk/config/scripts/env.sh.SH

    r1337 r1349  
    4242unset  G4REALSURFACEDATA
    4343unset  G4NEUTRONXSDATA
     44unset  G4PIIDATA
    4445
    4546unset  G4LIB
    … …  
    198199    if [ X\$g4non_display = X ] ; then
    199200        echo "On this machine the G4NEUTRONXSDATA=\$G4NEUTRONXSDATA"
     201    fi
     202fi
     203
     204#+
     205if [ X$g4piidata != X ] ; then
     206    G4PIIDATA="$g4piidata"
     207    export G4PIIDATA
     208    if [ X\$g4non_display = X ] ; then
     209        echo "On this machine the G4PIIDATA=\$G4PIIDATA"
    200210    fi
    201211fi

  • trunk/config/scripts/install.sh.SH

    r1337 r1349  
    630630
    631631if test -f \$G4INSTALL/config/scripts/GNUmakefile.db ; then
    632 mv \$G4INSTALL/config/scripts/GNUmakefile.db \$G4LIB/\$G4SYSTEM/GNUmakefile.db.bac
     632    mv \$G4INSTALL/config/scripts/GNUmakefile.db \$G4LIB/\$G4SYSTEM/GNUmakefile.db.bac
    633633fi
    634634
    … …  
    642642echo "Starting build..."
    643643echo ""
     644
     645echo "Cleaning up $g4conf/g4make.log"
     646rm -rf $g4conf/g4make.log
     647
    644648cd $g4install/source
    645 #echo `pwd`
     649
     650if test $g4make_jobs -gt 1 ; then
     651    $g4make obj -j $g4make_jobs
     652fi
    646653
    647654# There is no env!
    648655if [ X$g4global = Xy ] ; then
    649 echo ""
    650 rm -rf $g4conf/g4make.log
    651 $g4make global 2>&1 | tee $g4conf/g4make.log
     656    echo "Building global libraries..."
     657    $g4make global 2>&1 | tee $g4conf/g4make.log
    652658fi
    653659
    654660# There is env for binaries - for User: should be set in env.[c]sh!
    655661if [ X$g4granular = Xy ] ; then
    656 G4LIB_USE_GRANULAR=1
    657 export G4LIB_USE_GRANULAR
    658 rm -rf $g4conf/g4make.log
    659 $g4make 2>&1 | tee $g4conf/g4make.log
     662    echo "Building granular libraries..."
     663    G4LIB_USE_GRANULAR=1
     664    export G4LIB_USE_GRANULAR
     665    $g4make 2>&1 | tee $g4conf/g4make.log
    660666fi
    661667
    662668if [ X$g4lib_build_dll = Xy ] ; then
    663 echo ""
    664 rm -rf $g4conf/g4make.log
    665 $g4make dll 2>&1 | tee $g4conf/g4make.log
     669    echo "Building WIN32 DLLs..."
     670    $g4make dll 2>&1 | tee $g4conf/g4make.log
    666671fi
    667672
    668673if [ X$g4lib_build_dyn = Xy ] ; then
    669 echo ""
    670 rm -rf $g4conf/g4make.log
    671 $g4make global G4LIB_BUILD_SHARED=1 2>&1 | tee $g4conf/g4make.log
     674    echo ""
     675    rm -rf $g4conf/g4make.log
     676    $g4make global G4LIB_BUILD_SHARED=1 2>&1 | tee $g4conf/g4make.log
    672677fi
    673678
    674679# Check for errors in log file
    675680if test -f \$g4conf/g4make.log ; then
    676 
    677 # There are two (at least) shells 'sh' and 'bash' with
    678 # different arithmetic expansion...So we are doing it by 'text'
    679 # in two steps...
     681    # There are two (at least) shells 'sh' and 'bash' with
     682    # different arithmetic expansion...So we are doing it by 'text'
     683    # in two steps...
    680684 
    681 err=\`grep " Error " $g4conf/g4make.log | wc -w\`
    682 int=\`grep " Interrupt " $g4conf/g4make.log | wc -w\`
    683 stp=\`grep Stop\. $g4conf/g4make.log | wc -w\`
    684 
    685 err2=\`echo \$err\`
    686 int2=\`echo \$int\`
    687 stp2=\`echo \$stp\`
    688 
    689 if [ X\$err2 = X0 -a X\$int2 = X0 ] ; then
    690 echo ""
    691 echo "####################################################"
    692 echo "# Your Geant4 installation seems to be successful!  "
    693 echo "# To be sure please have a look into the log file:  "
    694 echo "# $g4conf/g4make.log                                "
    695 echo "####################################################"
    696 echo ""
     685    err=\`grep " Error " $g4conf/g4make.log | wc -w\`
     686    int=\`grep " Interrupt " $g4conf/g4make.log | wc -w\`
     687    stp=\`grep Stop\. $g4conf/g4make.log | wc -w\`
     688
     689    err2=\`echo \$err\`
     690    int2=\`echo \$int\`
     691    stp2=\`echo \$stp\`
     692
     693    if [ X\$err2 = X0 -a X\$int2 = X0 ] ; then
     694        echo ""
     695        echo "####################################################"
     696        echo "# Your Geant4 installation seems to be successful!  "
     697        echo "# To be sure please have a look into the log file:  "
     698        echo "# $g4conf/g4make.log                                "
     699        echo "####################################################"
     700        echo ""
     701    else
     702        echo ""
     703        echo "############################################################"
     704        echo "# It looks like you had errors during Geant4 installation   "
     705        echo "# (or interrupted installation)!                            "
     706        echo "# Please check log file:                                    "
     707        echo "# $g4conf/g4make.log                                        "
     708        echo "############################################################"
     709        echo ""
     710    fi
    697711else
    698 echo ""
    699 echo "############################################################"
    700 echo "# It looks like you had errors during Geant4 installation   "
    701 echo "# (or interrupted installation)!                            "
    702 echo "# Please check log file:                                    "
    703 echo "# $g4conf/g4make.log                                        "
    704 echo "############################################################"
    705 echo ""
    706 fi
    707 else
    708 echo ""
    709 echo "############################################################"
    710 echo "# It looks like you had errors during Geant4 installation   "
    711 echo "# (or interrupted installation)!                            "
    712 echo "# You have no log file:                                     "
    713 echo "# $g4conf/g4make.log                                        "
    714 echo "############################################################"
    715 echo ""
     712    echo ""
     713    echo "############################################################"
     714    echo "# It looks like you had errors during Geant4 installation   "
     715    echo "# (or interrupted installation)!                                "
     716    echo "# You have no log file:                                         "
     717    echo "# $g4conf/g4make.log                                    "
     718    echo "############################################################"
     719    echo ""
    716720fi
    717721
Note: See TracChangeset for help on using the changeset viewer.