Changeset 1195 for trunk/config


Ignore:
Timestamp:
Nov 25, 2009, 5:02:54 PM (15 years ago)
Author:
garnier
Message:

update CVS release candidate geant4.9.3.01

Location:
trunk/config
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/config/History

    r1185 r1195  
    1 cvs log $Id: History,v 1.368 2009/11/17 15:17:55 gcosmo Exp $
     1cvs log $Id: History,v 1.370 2009/11/18 17:33:22 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1616     * Reverse chronological order (last date on top), please *
    1717     ----------------------------------------------------------
     18
     1918th November 2009  Gabriele Cosmo (config-V09-02-15)
     20- architecture.gmk: corrected inclusion of -lz for zlib.
     21- WIN32-VC.gmk: added gd32.lib to OGLLIBS.
    1822
    192317th November 2009  Gabriele Cosmo (config-V09-02-14)

  • trunk/config/binmake.gmk

    r1162 r1195  
    1 # $Id: binmake.gmk,v 1.141 2009/06/17 16:37:41 gunter Exp $
     1# $Id: binmake.gmk,v 1.143 2009/11/17 15:17:17 gcosmo Exp $
    22# ----------------------------------------------------------
    33# Script defining rules and paths for making binaries.
    … …  
    8787              -I$(G4BASE)/processes/hadronic/models/cascade/utils/include \
    8888              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
     89              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include \
     90              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include \
    8991              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
     92              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/processes/include \
     93              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/xs_dependent/include \
    9094              -I$(G4BASE)/processes/hadronic/models/coherent_elastic/include \
    9195              -I$(G4BASE)/processes/hadronic/models/de_excitation/ablation/include \
    … …  
    231235             -lG4intercoms \
    232236             -lG4global
     237
     238  ifdef G4LIB_USE_ZLIB
     239    LDLIBS2 += -lG4zlib
     240  endif
     241
    233242else
    234243# The next lines specifically should read LDLIBS2 = , not LDLIBS2 :=, so
    … …  
    257266endif
    258267
    259 ifdef G4LIB_USE_ZLIB
    260   LDLIBS2 += -lG4zlib
    261 endif
    262 
    263268# LDLIBS3 contains the first set of low level libraries...
    264269#
    … …  
    336341  ifndef GLOBALLIBS
    337342        @echo "Using granular libraries ..."
     343        @echo $(G4TMP)
    338344        @if [ ! \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
    339345          -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
    … …  
    353359        @if [ ! -d $(G4BINDIR) ] ; then mkdir $(G4BINDIR) ;fi
    354360ifdef CPPVERBOSE
    355         echo Linking 1 $(LDLIBS1); \
    356         echo Linking 2 $(LDLIBS2); \
    357         echo Linking 3 $(LDLIBS3); \
    358         echo Linking 4 $(LDLIBS4); \
    359         echo G4TMPDIR $(G4TMPDIR); \
    360 
    361361        $(CXX) $(CXXFLAGS) $(CPPFLAGS) \
    362362          $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \

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

    r1045 r1195  
    4141unsetenv  G4RADIOACTIVEDATA
    4242unsetenv  G4ABLADATA
     43unsetenv  G4REALSURFACEDATA
    4344
    4445unsetenv  G4LIB
    … …  
    5455unsetenv  G4SYSTEM
    5556
     57unsetenv  G4UI_NONE
    5658unsetenv  G4UI_BUILD_WIN32_SESSION
    5759unsetenv  G4UI_BUILD_XAW_SESSION
    … …  
    6365unsetenv  G4UI_USE_QT
    6466
     67unsetenv  G4VIS_NONE
    6568unsetenv  G4VIS_BUILD_DAWN_DRIVER
    6669unsetenv  G4VIS_BUILD_OIWIN32_DRIVER
    … …  
    156159endif
    157160
    158 
    159 #+
    160 #if ( X$g4elasticdata != X ) then
    161 #setenv G4ELASTICDATA "$g4elasticdata"
    162 #echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
    163 #endif
     161#+
     162if ( X$g4realsurfacedata != X ) then
     163setenv G4REALSURFACEDATA "$g4realsurfacedata"
     164echo "On this machine the G4REALSURFACEDATA=\$G4REALSURFACEDATA"
     165endif
     166
    164167
    165168#
    … …  
    211214#
    212215#+
     216if ( X$g4ui_none == Xy ) then
     217setenv G4UI_NONE 1
     218echo "On this machine G4UI_NONE is set, so no user interfaces are available"
     219endif
     220
     221# Check for Windows!
     222if ( "X\$G4SYSTEM" != "XWIN32-VC" && "X\$G4SYSTEM" != "XWIN32-VC7" ) then
     223if ( X$g4ui_none != Xy ) then
     224setenv G4UI_USE_TCSH 1
     225echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
     226endif
     227endif
     228
     229#+
    213230if ( X$g4ui_build_xaw_session == Xy ) then
    214231setenv G4UI_BUILD_XAW_SESSION 1
    … …  
    263280# g4vis
    264281#
     282#+
     283if ( X$g4vis_none == Xy ) then
     284setenv G4VIS_NONE 1
     285echo "On this machine G4VIS_NONE is set, so no vis drivers are available"
     286endif
     287
    265288#+
    266289if ( X$g4vis_build_dawn_driver == Xy ) then
    … …  
    520543setenv G4LIB_USE_GRANULAR 1
    521544echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
    522 endif
    523 
    524 # Check for Windows!
    525 if ( "X\$G4SYSTEM" != "XWIN32-VC" && "X\$G4SYSTEM" != "XWIN32-VC7" ) then
    526 setenv G4UI_USE_TCSH 1
    527 echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
    528545endif
    529546

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

    r1045 r1195  
    4141unset  G4RADIOACTIVEDATA
    4242unset  G4ABLADATA
     43unset  G4REALSURFACEDATA
    4344
    4445unset  G4LIB
    … …  
    5455unset  G4SYSTEM
    5556
     57unset  G4UI_NONE
    5658unset  G4UI_BUILD_WIN32_SESSION
    5759unset  G4UI_BUILD_XAW_SESSION
    … …  
    6365unset  G4UI_USE_QT
    6466
     67
     68unset  G4VIS_NONE
    6569unset  G4VIS_BUILD_DAWN_DRIVER
    6670unset  G4VIS_BUILD_OIWIN32_DRIVER
    … …  
    185189fi
    186190
    187 
    188 
    189 
    190 #+
    191 #if [ X$g4elasticdata != X ] ; then
    192 #G4ELASTICDATA="$g4elasticdata"
    193 #export G4ELASTICDATA
    194 #if [ X\$g4non_display = X ] ; then
    195 #echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
    196 #fi
    197 #fi
     191#+
     192if [ X$g4realsurfacedata != X ] ; then
     193G4REALSURFACEDATA="$g4realsurfacedata"
     194export G4REALSURFACEDATA
     195if [ X\$g4non_display = X ] ; then
     196echo "On this machine the G4REALSURFACEDATA=\$G4REALSURFACEDATA"
     197fi
     198fi
    198199
    199200#
    … …  
    263264#
    264265#+
     266if [ X$g4ui_none = Xy ] ; then
     267G4UI_NONE=1
     268export G4UI_NONE
     269if [ X\$g4non_display = X ] ; then
     270echo "On this machine, G4UI_NONE is set, so no user interfaces are available"
     271fi
     272fi
     273
     274
     275# Check for Windows!
     276if test "X\$G4SYSTEM" != "XWIN32-VC" -a "X\$G4SYSTEM" != "XWIN32-VC7"; then
     277#+
     278#
     279# UI_USE_TCSH for Unix
     280#
     281if [ X$g4ui_none != Xy ] ; then
     282G4UI_USE_TCSH=1
     283export G4UI_USE_TCSH
     284if [ X\$g4non_display = X ] ; then
     285echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
     286fi
     287fi
     288fi
     289
     290
     291#+
    265292if [ X$g4ui_build_xaw_session = Xy ] ; then
    266293G4UI_BUILD_XAW_SESSION=1
    … …  
    340367# g4vis
    341368#
     369#+
     370if [ X$g4vis_none = Xy ] ; then
     371G4VIS_NONE=1
     372export G4VIS_NONE
     373if [ X\$g4non_display = X ] ; then
     374echo "On this machine G4VIS_NONE is set, so no vis drivers are available"
     375fi
     376fi
     377
    342378#+
    343379if [ X$g4vis_build_dawn_driver = Xy ] ; then
    … …  
    715751fi
    716752
    717 # Check for Windows!
    718 if test "X\$G4SYSTEM" != "XWIN32-VC" -a "X\$G4SYSTEM" != "XWIN32-VC7"; then
    719 #+
    720 #
    721 # UI_USE_TCSH for Unix
    722 #
    723 G4UI_USE_TCSH=1
    724 export G4UI_USE_TCSH
    725 if [ X\$g4non_display = X ] ; then
    726 echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
    727 fi
    728 fi
    729753
    730754#####################################################################

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

    r886 r1195  
    5454unset  G4SYSTEM
    5555
     56unset  G4UI_NONE
    5657unset  G4UI_BUILD_WIN32_SESSION
    5758unset  G4UI_BUILD_XAW_SESSION
    … …  
    6465unset  G4UI_USE_QT
    6566
     67unset  G4VIS_NONE
    6668unset  G4VIS_BUILD_DAWN_DRIVER
    6769unset  G4VIS_BUILD_OIWIN32_DRIVER
    … …  
    233235#
    234236#+
     237if [ X$g4ui_none = Xy ] ; then
     238G4UI_NONE=1
     239export G4UI_NONE
     240echo "On this machine G4UI_NONE is set - no UIs will be built"
     241
     242else
     243echo "On this machine G4UI_NONE is not set - following UIs will be built:"
     244
     245#+
    235246if [ X$g4ui_build_xaw_session = Xy ] ; then
    236247G4UI_BUILD_XAW_SESSION=1
    … …  
    289300fi
    290301
     302fi
     303# END OF G4UI_NONE block
    291304
    292305#
    293306# g4vis
    294307#
     308#+
     309if [ X$g4vis_none = Xy ] ; then
     310G4VIS_NONE=1
     311export G4VIS_NONE
     312echo "On this machine G4VIS_NONE is set - no drivers will be built"
     313
     314else
     315echo "On this machine G4VIS_NONE is not set - following drivers will be built:"
     316
    295317#+
    296318if [ X$g4vis_build_dawn_driver = Xy ] ; then
    … …  
    422444
    423445
    424 
     446fi
     447# End of G4VIS_NONE block
    425448
    426449
Note: See TracChangeset for help on using the changeset viewer.