Ignore:
Timestamp:
Sep 30, 2010, 2:47:17 PM (14 years ago)
Author:
garnier
Message:

tag geant4.9.4 beta 1 + modifs locales

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/config/scripts/env.csh.SH

    r1213 r1337  
    3131unsetenv  CLHEP_LIB_DIR
    3232
    33 unsetenv  G4ANALYSIS_USE
    3433unsetenv  G4DEBUG
    3534unsetenv  G4INCLUDE
     
    4241unsetenv  G4ABLADATA
    4342unsetenv  G4REALSURFACEDATA
     43unsetenv  G4NEUTRONXSDATA
    4444
    4545unsetenv  G4LIB
     
    5757unsetenv  G4UI_NONE
    5858unsetenv  G4UI_BUILD_WIN32_SESSION
     59unsetenv  G4UI_BUILD_XAW_SESSION
    5960unsetenv  G4UI_BUILD_XM_SESSION
    6061unsetenv  G4UI_USE_TCSH
    6162unsetenv  G4UI_USE_WIN32
     63unsetenv  G4UI_USE_XAW
    6264unsetenv  G4UI_USE_XM
    6365unsetenv  G4UI_USE_QT
     
    9799#+
    98100if ( X$g4install != X$g4final_install ) then
    99 setenv G4INSTALL "$g4final_install/src/geant4"
    100 echo "On this machine the G4INSTALL=\$G4INSTALL"
     101    setenv G4INSTALL "$g4final_install/src/geant4"
     102    echo "On this machine the G4INSTALL=\$G4INSTALL"
    101103else
    102 setenv G4INSTALL "$g4install"
    103 echo "On this machine the G4INSTALL=\$G4INSTALL"
     104    setenv G4INSTALL "$g4install"
     105    echo "On this machine the G4INSTALL=\$G4INSTALL"
    104106endif
    105107
    106108#+
    107109if ( X$g4includes_flag != Xn ) then
    108 if ( X$g4install != X$g4final_install ) then
    109 setenv G4INCLUDE "$g4final_install/include/geant4"
    110 else
    111 setenv G4INCLUDE "$g4final_install/include"
    112 endif
    113 echo "On this machine the G4INCLUDE=\$G4INCLUDE"
    114 #else
    115 #setenv G4BASE "$g4final_install/include/geant4/source"
    116 #echo "On this machine the G4BASE=\$G4BASE"
     110    if ( X$g4install != X$g4final_install ) then
     111        setenv G4INCLUDE "$g4final_install/include/geant4"
     112    else
     113        setenv G4INCLUDE "$g4final_install/include"
     114    endif
     115
     116    echo "On this machine the G4INCLUDE=\$G4INCLUDE"
    117117endif
    118118
    119119#+
    120120if ( X$g4lib != X ) then
    121 if ( X$g4install != X$g4final_install ) then
    122 setenv G4LIB "$g4final_install/lib/geant4"
    123 else
    124 setenv G4LIB "$g4final_install/lib"
    125 endif
    126 echo "On this machine the G4LIB=\$G4LIB"
     121    if ( X$g4install != X$g4final_install ) then
     122        setenv G4LIB "$g4final_install/lib/geant4"
     123    else
     124        setenv G4LIB "$g4final_install/lib"
     125    endif
     126
     127    echo "On this machine the G4LIB=\$G4LIB"
    127128endif
    128129
    129130#+
    130131if ( X$g4levelgammadata != X ) then
    131 setenv G4LEVELGAMMADATA "$g4levelgammadata"
    132 echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
     132    setenv G4LEVELGAMMADATA "$g4levelgammadata"
     133    echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
    133134endif
    134135
    135136#+
    136137if ( X$g4radioactivedata != X ) then
    137 setenv G4RADIOACTIVEDATA "$g4radioactivedata"
    138 echo "On this machine the G4RADIOACTIVEDATA=\$G4RADIOACTIVEDATA"
     138    setenv G4RADIOACTIVEDATA "$g4radioactivedata"
     139    echo "On this machine the G4RADIOACTIVEDATA=\$G4RADIOACTIVEDATA"
    139140endif
    140141
    141142#+
    142143if ( X$g4ledata != X ) then
    143 setenv G4LEDATA "$g4ledata"
    144 echo "On this machine the G4LEDATA=\$G4LEDATA"
     144    setenv G4LEDATA "$g4ledata"
     145    echo "On this machine the G4LEDATA=\$G4LEDATA"
    145146endif
    146147
    147148#+
    148149if ( X$g4neutronhpcrosssections != X ) then
    149 setenv G4NEUTRONHPDATA "$g4neutronhpcrosssections"
    150 echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
     150    setenv G4NEUTRONHPDATA "$g4neutronhpcrosssections"
     151    echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
    151152endif
    152153
    153154#+
    154155if ( X$g4abladata != X ) then
    155 setenv G4ABLADATA "$g4abladata"
    156 echo "On this machine the G4ABLADATA=\$G4ABLADATA"
     156    setenv G4ABLADATA "$g4abladata"
     157    echo "On this machine the G4ABLADATA=\$G4ABLADATA"
    157158endif
    158159
    159160#+
    160161if ( X$g4realsurfacedata != X ) then
    161 setenv G4REALSURFACEDATA "$g4realsurfacedata"
    162 echo "On this machine the G4REALSURFACEDATA=\$G4REALSURFACEDATA"
     162    setenv G4REALSURFACEDATA "$g4realsurfacedata"
     163    echo "On this machine the G4REALSURFACEDATA=\$G4REALSURFACEDATA"
     164endif
     165
     166#+
     167if ( X$g4neutronxsdata != X ) then
     168    setenv G4NEUTRONXSDATA "$g4neutronxsdata"
     169    echo "On this machine the G4NEUTRONXSDATA=\$G4NEUTRONXSDATA"
    163170endif
    164171
     
    168175#
    169176if ( X$g4clhep_base_dir != X ) then
    170 setenv CLHEP_BASE_DIR "$g4clhep_base_dir"
    171 echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
     177    setenv CLHEP_BASE_DIR "$g4clhep_base_dir"
     178    echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
    172179endif
    173180
    174181#+
    175182if ( X$g4clhep_include_dir != X ) then
    176 setenv CLHEP_INCLUDE_DIR "$g4clhep_include_dir"
    177 echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
     183    setenv CLHEP_INCLUDE_DIR "$g4clhep_include_dir"
     184    echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
    178185endif
    179186
    180187#+
    181188if ( X$g4clhep_lib_dir != X ) then
    182 setenv CLHEP_LIB_DIR "$g4clhep_lib_dir"
    183 echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
     189    setenv CLHEP_LIB_DIR "$g4clhep_lib_dir"
     190    echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
    184191endif
    185192
    186193#+
    187194if ( X$g4clhep_lib != X ) then
    188 setenv CLHEP_LIB "$g4clhep_lib"
    189 echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
     195    setenv CLHEP_LIB "$g4clhep_lib"
     196    echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
    190197endif
    191198
     
    195202#
    196203if ( X$g4debug == Xy ) then
    197 setenv G4DEBUG 1
    198 echo "On this machine the G4DEBUG=\$G4DEBUG"
    199 endif
    200 
    201 #
    202 # g4analysis
    203 #
    204 #+
    205 if ( X$g4wanalysis_use == Xy ) then
    206 setenv G4ANALYSIS_USE 1
    207 echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
    208 endif
     204    setenv G4DEBUG 1
     205    echo "On this machine the G4DEBUG=\$G4DEBUG"
     206endif
     207
    209208
    210209#
     
    213212#+
    214213if ( X$g4ui_none == Xy ) then
    215 setenv G4UI_NONE 1
    216 echo "On this machine G4UI_NONE is set, so no user interfaces are available"
     214    setenv G4UI_NONE 1
     215    echo "On this machine G4UI_NONE is set, so no user interfaces are available"
    217216endif
    218217
    219218# Check for Windows!
    220219if ( "X\$G4SYSTEM" != "XWIN32-VC" && "X\$G4SYSTEM" != "XWIN32-VC7" ) then
    221 if ( X$g4ui_none != Xy ) then
    222 setenv G4UI_USE_TCSH 1
    223 echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
    224 endif
     220    if ( X$g4ui_none != Xy ) then
     221        setenv G4UI_USE_TCSH 1
     222        echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
     223    endif
     224endif
     225
     226#+
     227if ( X$g4ui_build_xaw_session == Xy ) then
     228    setenv G4UI_BUILD_XAW_SESSION 1
     229    echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
     230endif
     231
     232#+
     233if ( X$g4ui_use_xaw == Xy ) then
     234    setenv G4UI_USE_XAW 1
     235    echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
    225236endif
    226237
    227238#+
    228239if ( X$g4ui_build_xm_session == Xy ) then
    229 setenv G4UI_BUILD_XM_SESSION 1
    230 echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
     240    setenv G4UI_BUILD_XM_SESSION 1
     241    echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
    231242endif
    232243
    233244#+
    234245if ( X$g4ui_use_xm == Xy ) then
    235 setenv G4UI_USE_XM 1
    236 echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
     246    setenv G4UI_USE_XM 1
     247    echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
    237248endif
    238249
    239250#+
    240251if ( X$g4ui_build_win32_session == Xy ) then
    241 setenv G4UI_BUILD_WIN32_SESSION 1
    242 echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
     252    setenv G4UI_BUILD_WIN32_SESSION 1
     253    echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
    243254endif
    244255
    245256#+
    246257if ( X$g4ui_use_win32 == Xy ) then
    247 setenv G4UI_USE_WIN32 1
    248 echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
     258    setenv G4UI_USE_WIN32 1
     259    echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
    249260endif
    250261
    251262#+
    252263if ( X$g4ui_build_qt_session == Xy ) then
    253 setenv G4UI_BUILD_QT_SESSION 1
    254 echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
     264    setenv G4UI_BUILD_QT_SESSION 1
     265    echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
    255266endif
    256267
    257268#+
    258269if ( X$g4ui_use_qt == Xy ) then
    259 setenv G4UI_USE_QT 1
    260 echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
     270    setenv G4UI_USE_QT 1
     271    echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
    261272endif
    262273
     
    268279#+
    269280if ( X$g4vis_none == Xy ) then
    270 setenv G4VIS_NONE 1
    271 echo "On this machine G4VIS_NONE is set, so no vis drivers are available"
     281    setenv G4VIS_NONE 1
     282    echo "On this machine G4VIS_NONE is set, so no vis drivers are available"
    272283endif
    273284
    274285#+
    275286if ( X$g4vis_build_dawn_driver == Xy ) then
    276 setenv G4VIS_BUILD_DAWN_DRIVER 1
    277 echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
     287    setenv G4VIS_BUILD_DAWN_DRIVER 1
     288    echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
    278289endif
    279290
    280291#+
    281292if ( X$g4vis_build_openglx_driver == Xy ) then
    282 setenv G4VIS_BUILD_OPENGLX_DRIVER 1
    283 echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
     293    setenv G4VIS_BUILD_OPENGLX_DRIVER 1
     294    echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
    284295endif
    285296
    286297#+
    287298if ( X$g4vis_build_openglxm_driver == Xy ) then
    288 setenv G4VIS_BUILD_OPENGLXM_DRIVER 1
    289 echo "On this machine the G4VIS_BUILD_OPENGLXM_DRIVER=\$G4VIS_BUILD_OPENGLXM_DRIVER"
     299    setenv G4VIS_BUILD_OPENGLXM_DRIVER 1
     300    echo "On this machine the G4VIS_BUILD_OPENGLXM_DRIVER=\$G4VIS_BUILD_OPENGLXM_DRIVER"
    290301endif
    291302
    292303#+
    293304if ( X$g4vis_build_openglwin32_driver == Xy ) then
    294 setenv G4VIS_BUILD_OPENGLWIN32_DRIVER 1
    295 echo "On this machine the G4VIS_BUILD_OPENGLWIN32_DRIVER=\$G4VIS_BUILD_OPENGLWIN32_DRIVER"
     305    setenv G4VIS_BUILD_OPENGLWIN32_DRIVER 1
     306    echo "On this machine the G4VIS_BUILD_OPENGLWIN32_DRIVER=\$G4VIS_BUILD_OPENGLWIN32_DRIVER"
    296307endif
    297308
    298309#+
    299310if ( X$g4vis_build_oix_driver == Xy ) then
    300 setenv G4VIS_BUILD_OIX_DRIVER 1
    301 echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
     311    setenv G4VIS_BUILD_OIX_DRIVER 1
     312    echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
    302313endif
    303314
    304315#+
    305316if ( X$g4vis_build_raytracerx_driver == Xy ) then
    306 setenv G4VIS_BUILD_RAYTRACERX_DRIVER 1
    307 echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
     317    setenv G4VIS_BUILD_RAYTRACERX_DRIVER 1
     318    echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
    308319endif
    309320
    310321#+
    311322if ( X$g4vis_build_oiwin32_driver == Xy ) then
    312 setenv G4VIS_BUILD_OIWIN32_DRIVER 1
    313 echo "On this machine the G4VIS_BUILD_OIWIN32_DRIVER=\$G4VIS_BUILD_OIWIN32_DRIVER"
     323    setenv G4VIS_BUILD_OIWIN32_DRIVER 1
     324    echo "On this machine the G4VIS_BUILD_OIWIN32_DRIVER=\$G4VIS_BUILD_OIWIN32_DRIVER"
    314325endif
    315326
    316327#+
    317328if ( X$g4vis_build_vrml_driver == Xy ) then
    318 setenv G4VIS_BUILD_VRML_DRIVER 1
    319 echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
     329    setenv G4VIS_BUILD_VRML_DRIVER 1
     330    echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
    320331endif
    321332
    322333#+
    323334if ( X$g4vis_build_openglqt_driver == Xy ) then
    324 setenv G4VIS_BUILD_OPENGLQT_DRIVER 1
    325 echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
     335    setenv G4VIS_BUILD_OPENGLQT_DRIVER 1
     336    echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
    326337endif
    327338
     
    329340#+
    330341if ( X$g4vis_use_dawn == Xy ) then
    331 setenv G4VIS_USE_DAWN 1
    332 echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
     342    setenv G4VIS_USE_DAWN 1
     343    echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
    333344endif
    334345
    335346#+
    336347if ( X$g4vis_use_openglx == Xy ) then
    337 setenv G4VIS_USE_OPENGLX 1
    338 echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
     348    setenv G4VIS_USE_OPENGLX 1
     349    echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
    339350endif
    340351
    341352#+
    342353if ( X$g4vis_use_openglxm == Xy ) then
    343 setenv G4VIS_USE_OPENGLXM 1
    344 echo "On this machine the G4VIS_USE_OPENGLXM=\$G4VIS_USE_OPENGLXM"
     354    setenv G4VIS_USE_OPENGLXM 1
     355    echo "On this machine the G4VIS_USE_OPENGLXM=\$G4VIS_USE_OPENGLXM"
    345356endif
    346357
    347358#+
    348359if ( X$g4vis_use_openglwin32 == Xy ) then
    349 setenv G4VIS_USE_OPENGLWIN32 1
    350 echo "On this machine the G4VIS_USE_OPENGLWIN32=\$G4VIS_USE_OPENGLWIN32"
     360    setenv G4VIS_USE_OPENGLWIN32 1
     361    echo "On this machine the G4VIS_USE_OPENGLWIN32=\$G4VIS_USE_OPENGLWIN32"
    351362endif
    352363
    353364#+
    354365if ( X$g4vis_use_oix == Xy ) then
    355 setenv G4VIS_USE_OIX 1
    356 echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
     366    setenv G4VIS_USE_OIX 1
     367    echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
    357368endif
    358369
    359370#+
    360371if ( X$g4vis_use_raytracerx == Xy ) then
    361 setenv G4VIS_USE_RAYTRACERX 1
    362 echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
     372    setenv G4VIS_USE_RAYTRACERX 1
     373    echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
    363374endif
    364375
    365376#+
    366377if ( X$g4vis_use_oiwin32 == Xy ) then
    367 setenv G4VIS_USE_OIWIN32 1
    368 echo "On this machine the G4VIS_USE_OIWIN32=\$G4VIS_USE_OIWIN32"
     378    setenv G4VIS_USE_OIWIN32 1
     379    echo "On this machine the G4VIS_USE_OIWIN32=\$G4VIS_USE_OIWIN32"
    369380endif
    370381
    371382#+
    372383if ( X$g4vis_use_vrml == Xy ) then
    373 setenv G4VIS_USE_VRML 1
    374 echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
     384    setenv G4VIS_USE_VRML 1
     385    echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
    375386endif
    376387
    377388#+
    378389if ( X$g4vis_use_openglqt == Xy ) then
    379 setenv G4VIS_USE_OPENGLQT 1
    380 echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
     390    setenv G4VIS_USE_OPENGLQT 1
     391    echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
    381392endif
    382393
    383394#+
    384395if ( X$g4vis_oglhome != X )  then
    385 setenv OGLHOME "$g4vis_oglhome"
    386 echo "On this machine the OGLHOME=\$OGLHOME"
     396    setenv OGLHOME "$g4vis_oglhome"
     397    echo "On this machine the OGLHOME=\$OGLHOME"
    387398endif
    388399
    389400#+
    390401if ( X$g4vis_oivhome != X )  then
    391 setenv OIVHOME "$g4vis_oivhome"
    392 echo "On this machine the OIVHOME=\$OIVHOME"
     402    setenv OIVHOME "$g4vis_oivhome"
     403    echo "On this machine the OIVHOME=\$OIVHOME"
    393404endif
    394405
     
    396407#+
    397408if ( X$g4vis_build_openglxm_driver != X )  then
    398 setenv XMFLAGS "$g4vis_xmflags"
    399 echo "On this machine the XMFLAGS=\$XMFLAGS"
     409    setenv XMFLAGS "$g4vis_xmflags"
     410    echo "On this machine the XMFLAGS=\$XMFLAGS"
    400411endif
    401412
    402413#+
    403414if ( X$g4vis_build_openglxm_driver != X )  then
    404 setenv XMLIBS "$g4vis_xmlibs"
    405 echo "On this machine the XMLIBS=\$XMLIBS"
     415    setenv XMLIBS "$g4vis_xmlibs"
     416    echo "On this machine the XMLIBS=\$XMLIBS"
    406417endif
    407418
    408419#+
    409420if ( X$g4ui_build_xm_session != X )  then
    410 setenv XMFLAGS "$g4vis_xmflags"
    411 echo "On this machine the XMFLAGS=\$XMFLAGS"
     421    setenv XMFLAGS "$g4vis_xmflags"
     422    echo "On this machine the XMFLAGS=\$XMFLAGS"
    412423endif
    413424
    414425#+
    415426if ( X$g4ui_build_xm_session != X )  then
    416 setenv XMLIBS "$g4vis_xmlibs"
    417 echo "On this machine the XMLIBS=\$XMLIBS"
    418 endif
     427    setenv XMLIBS "$g4vis_xmlibs"
     428    echo "On this machine the XMLIBS=\$XMLIBS"
     429endif
     430
     431#+
     432if ( X$g4ui_build_xaw_session != X )  then
     433    setenv XAWFLAGS "$g4ui_xawflags"
     434    echo "On this machine the XAWFLAGS=\$XAWFLAGS"
     435endif
     436
     437#+
     438if ( X$g4ui_build_xaw_session != X )  then
     439setenv XAWLIBS "$g4ui_xawlibs"
     440echo "On this machine the XAWLIBS=\$XAWLIBS"
     441endif
     442
    419443
    420444#
     
    422446#+
    423447if ( "X$g4ui_build_qt_session" == "Xy" || "X$g4ui_use_qt" == "Xy" )  then
    424 setenv QTFLAGS "$g4_qt_cxxflags"
    425 setenv QTLIBS "$g4_qt_libs"
    426 setenv QTMOC "$g4_qt_moc"
    427 echo "On this machine the QTFLAGS=\$QTFLAGS"
    428 echo "On this machine the QTLIBS=\$QTLIBS"
    429 echo "On this machine the QTMOC=\$QTMOC"
     448    setenv QTFLAGS "$g4_qt_cxxflags"
     449    setenv QTLIBS "$g4_qt_libs"
     450    setenv QTMOC "$g4_qt_moc"
     451    echo "On this machine the QTFLAGS=\$QTFLAGS"
     452    echo "On this machine the QTLIBS=\$QTLIBS"
     453    echo "On this machine the QTMOC=\$QTMOC"
    430454endif
    431455
    432456if ( "X$g4vis_build_openglqt_driver" == "Xy" || "X$g4vis_build_openglqt_driver" == "Xy" )  then
    433 if ( "X\$QTFLAGS" == "X" )  then
    434 setenv QTFLAGS "$g4_qt_cxxflags $g4_qt_gl_cxxflags"
    435 else
    436 setenv QTFLAGS "\$QTFLAGS $g4_qt_gl_cxxflags"
    437 endif
    438 if ( "X\$QTMOC" == "X" )  then
    439 setenv QTMOC "$g4_qt_moc"
    440 endif
    441 setenv GLQTLIBS "$g4_qt_libs $g4_qt_gl_libs"
    442 echo "On this machine the QTFLAGS=\$QTFLAGS"
    443 echo "On this machine the GLQTLIBS=\$GLQTLIBS"
    444 echo "On this machine the QTMOC=\$QTMOC"
     457    if ( "X\$QTFLAGS" == "X" )  then
     458        setenv QTFLAGS "$g4_qt_cxxflags $g4_qt_gl_cxxflags"
     459    else
     460        setenv QTFLAGS "\$QTFLAGS $g4_qt_gl_cxxflags"
     461    endif
     462
     463    if ( "X\$QTMOC" == "X" )  then
     464        setenv QTMOC "$g4_qt_moc"
     465    endif
     466
     467    setenv GLQTLIBS "$g4_qt_libs $g4_qt_gl_libs"
     468    echo "On this machine the QTFLAGS=\$QTFLAGS"
     469    echo "On this machine the GLQTLIBS=\$GLQTLIBS"
     470    echo "On this machine the QTMOC=\$QTMOC"
    445471endif
    446472
     
    454480#+
    455481if ( X$g4lib_build_gdml == Xy ) then
    456 setenv G4LIB_BUILD_GDML 1
    457 echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
     482    setenv G4LIB_BUILD_GDML 1
     483    echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
    458484endif
    459485
    460486if ( X$g4lib_build_gdml == Xy ) then
    461 setenv XERCESCROOT "$g4gdml_xercesc_root"
    462 echo "On this machine the XERCESCROOT=\$XERCESCROOT"
     487    setenv XERCESCROOT "$g4gdml_xercesc_root"
     488    echo "On this machine the XERCESCROOT=\$XERCESCROOT"
    463489endif
    464490
     
    471497#+
    472498if ( X$g4wlib_build_g3tog4 == Xy )  then
    473 setenv G4LIB_BUILD_G3TOG4 1
    474 echo "On this machine the G4LIB_BUILD_G3TOG4=\$G4LIB_BUILD_G3TOG4"
     499    setenv G4LIB_BUILD_G3TOG4 1
     500    echo "On this machine the G4LIB_BUILD_G3TOG4=\$G4LIB_BUILD_G3TOG4"
    475501endif
    476502
    477503if ( X$g4w_use_g3tog4 == Xy )  then
    478 setenv G4LIB_USE_G3TOG4 1
    479 echo "On this machine the G4LIB_USE_G3TOG4=\$G4LIB_USE_G3TOG4"
     504    setenv G4LIB_USE_G3TOG4 1
     505    echo "On this machine the G4LIB_USE_G3TOG4=\$G4LIB_USE_G3TOG4"
    480506endif
    481507
     
    486512#+
    487513if ( X$g4wlib_build_zlib == Xy )  then
    488 setenv G4LIB_BUILD_ZLIB 1
    489 echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
     514    setenv G4LIB_BUILD_ZLIB 1
     515    echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
    490516endif
    491517
    492518if ( X$g4w_use_ZLIB == Xy )  then
    493 setenv G4LIB_USE_ZLIB 1
    494 echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
     519    setenv G4LIB_USE_ZLIB 1
     520    echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
    495521endif
    496522
     
    500526#
    501527if ( X$g4lib_build_shared == Xy ) then
    502 setenv G4LIB_BUILD_SHARED 1
    503 echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
     528    setenv G4LIB_BUILD_SHARED 1
     529    echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
    504530endif
    505531
    506532if ( X$g4lib_build_static == Xy ) then
    507 setenv G4LIB_BUILD_STATIC 1
    508 echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
     533    setenv G4LIB_BUILD_STATIC 1
     534    echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
    509535endif
    510536
     
    514540#
    515541if ( X$g4lib_use_granular == Xy ) then
    516 setenv G4LIB_USE_GRANULAR 1
    517 echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
     542    setenv G4LIB_USE_GRANULAR 1
     543    echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
    518544endif
    519545
     
    531557#
    532558if ( ${?G4WORKDIR} ) then
    533 echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
     559    echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
    534560else
    535 # Check for Windows!
    536 if ( "X$G4SYSTEM" == "XWIN32-VC" || "X$G4SYSTEM" == "XWIN32-VC7" ) then
    537 
    538 echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)."
    539 setenv G4WORKDIR "c:/geant4"
    540 
    541 else # if Unix
    542 
    543 echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
    544 setenv G4WORKDIR $HOME/geant4
    545 
    546 endif
    547 endif
    548 
    549 #
    550 # Shared libraries
    551 #
     561    # Check for Windows!
     562    if ( "X$G4SYSTEM" == "XWIN32-VC" || "X$G4SYSTEM" == "XWIN32-VC7" ) then
     563        echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)."
     564        setenv G4WORKDIR "c:/geant4"
     565    else # if Unix
     566        echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
     567        setenv G4WORKDIR $HOME/geant4
     568    endif
     569endif
     570
     571#
     572# *NIX Shared Libraries
     573# If we built Geant4 with shared libraries, we need to add the Gean4
     574# library directory to (DY)LD_LIBRARY_PATH.
     575# In all cases, external shared library directories should be added to
     576# (DY)LD_LIBRARY_PATH
     577
     578if ( "X$G4SYSTEM" != "XDarwin-g++" ) then
     579    if ( ${?LD_LIBRARY_PATH} ) then
     580        if ( ${?G4LIB_BUILD_SHARED} ) then
     581            setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}     
     582        endif
     583
     584        setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     585
     586        if ( ${?G4LIB_BUILD_GDML} ) then
     587            setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
     588        endif
     589
     590    else
     591        if ( ${?G4LIB_BUILD_SHARED} ) then
     592            setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
     593            setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     594        else
     595            setenv LD_LIBRARY_PATH ${CLHEP_LIB_DIR}
     596        endif
     597
     598        if ( ${?G4LIB_BUILD_GDML} ) then
     599            setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
     600        endif
     601    endif
     602else
     603    #
     604    # Darwin Shared Libraries
     605    # we repeat the above logic, but for DYLD_LIBRARY_PATH
     606    #   
     607    if ( ${?DYLD_LIBRARY_PATH} ) then
     608        if ( ${?G4LIB_BUILD_SHARED} ) then
     609            setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM} 
     610        endif
     611
     612        setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     613
     614        if ( ${?G4LIB_BUILD_GDML} ) then
     615            setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
     616        endif
     617    else
     618        if ( ${?G4LIB_BUILD_SHARED} ) then
     619            setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
     620            setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     621        else
     622            setenv DYLD_LIBRARY_PATH ${CLHEP_LIB_DIR}
     623        endif
     624
     625        if ( ${?G4LIB_BUILD_GDML} ) then
     626            setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
     627        endif
     628    endif
     629endif
     630
     631
     632#
     633# Warning about LD_LIBRARY_PATH
     634#
     635echo ''
    552636if ( ${?G4LIB_BUILD_SHARED} ) then
    553 
    554 #
    555 # Warning about LD_LIBRARY_PATH
    556 #
     637    if ( "X$G4SYSTEM" == "XDarwin-g++" ) then
     638        echo 'DYLD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     639    else
     640        echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     641    endif
     642else
     643    if ( "X$G4SYSTEM" == "XDarwin-g++" ) then
     644        echo 'DYLD_LIBRARY_PATH is set to include CLHEP libraries. '
     645    else
     646        echo 'LD_LIBRARY_PATH is set to include CLHEP libraries. '
     647    endif
     648endif
     649echo 'NOTE : you should verify that the correct path for the CLHEP library'
    557650echo ''
    558 echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     651echo ${CLHEP_BASE_DIR}/lib
    559652echo ''
    560 echo 'NOTE : verify that the correct path for the CLHEP library'
    561 echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
    562 echo 'variable in your environment, and no other outdated installations'
    563 echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
    564 echo 'present in your system !'
     653echo 'is included in the dynamic library search path ahead of any other'
     654echo 'installations of CLHEP on your system that may be referenced by this'
     655echo 'path.'
    565656echo ''
    566 
    567 if ( ${?LD_LIBRARY_PATH} )  then
    568 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    569 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    570 
    571 if ( ${?G4LIB_BUILD_GDML} ) then
    572    setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
    573 endif
    574 
    575 else
    576 setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
    577 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    578 
    579 if ( ${?G4LIB_BUILD_GDML} ) then
    580    setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
    581 endif
    582 
    583 endif
    584 endif
    585 
    586 #
    587 # Shared libraries for Mac
    588 #
    589 if ( "X$G4SYSTEM" == "XDarwin-g++" ) then
    590 
    591 if ( ${?G4LIB_BUILD_SHARED} ) then
    592 if ( ${?DYLD_LIBRARY_PATH} )  then
    593 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    594 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    595 
    596 if ( ${?G4LIB_BUILD_GDML} ) then
    597    setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
    598 endif
    599 
    600 else
    601 setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
    602 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    603 
    604 if ( ${?G4LIB_BUILD_GDML} ) then
    605    setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
    606 endif
    607 
    608 endif
    609 endif
    610 
    611 endif
    612657
    613658#
Note: See TracChangeset for help on using the changeset viewer.