Changeset 1045 for trunk/config


Ignore:
Timestamp:
May 15, 2009, 12:28:43 PM (15 years ago)
Author:
garnier
Message:

maj en aussi sur CVS

Location:
trunk/config
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/config/G4UI_USE.gmk

    r850 r1045  
    1 # $Id: G4UI_USE.gmk,v 1.12 2008/05/14 09:48:19 gbarrand Exp $
     1# $Id: G4UI_USE.gmk,v 1.15 2009/03/05 09:19:37 gbarrand Exp $
    22# -------------------------------------------------------------
    33# GNUmakefile for CPPFLAGS for interfaces USE phase.
    44#   John Allison, 6th July 1998.
    55
    6 ########################### interfaces/basic #######################
    7 ifndef G4UI_USE_INCLUDED
    8   G4UI_USE_INCLUDED = 1
    9  
    106ifndef G4UI_NONE
    117
    12 UILIBS :=
     8ifndef G4UI_USE_INCLUDED
     9G4UI_USE_INCLUDED = 1
     10 
     11ifndef UILIBS
     12  UILIBS :=
     13endif
    1314
    1415# Sessions not needing external packages or libraries.  These
    … …  
    8182endif
    8283
    83 ifdef G4UI_USE_OSC
    84   CPPFLAGS += -DG4UI_USE_OSC
    85   ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
    86     # need a syntax that both g++ and CL.exe understand :
    87     G4OSC_TMP_1 := $(shell echo "`osc-config --g4lab_incs`")
    88     CPPFLAGS += $(patsubst /I%,-I"%",$(G4OSC_TMP_1))
    89   else
    90     CPPFLAGS += `osc-config --g4lab_incs`
    91   endif
    92   INTYLIBS += `osc-config --g4lab_libs`
    93   INTYLIBS += `osc-config --iv_libs`
    94   #   
    95   ifndef G4ANALYSIS_AIDA_CONFIG_CFLAGS
    96     ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
    97       # need a syntax that both g++ and CL.exe understand :
    98       G4OSC_TMP_2 := $(shell echo "`aida-config --include`")
    99       G4ANALYSIS_AIDA_CONFIG_CFLAGS := $(patsubst /I%,-I"%",$(G4OSC_TMP_2))
    100     endif
    101   endif
    102 endif
    103 
    104 ########################### interfaces/XVT - not currently implemented #####
    105 
    10684##################### Default to TERMINAL if no environment variables set ##
    107 ##################### (No need actually to use it - see above.) ############
    10885
    10986ifndef G4UI_USE
    110   G4UI_USE  = 1
    11187  CPPFLAGS += -DG4UI_USE_TERMINAL
    11288endif
    11389
    114 endif #G4UI_NONE
     90########################### and finally... #######################
     91
     92G4UI_USE  = 1
     93CPPFLAGS += -DG4UI_USE
     94
    11595endif # G4UI_USE_INCLUDED
     96endif # G4UI_NONE

  • trunk/config/G4VIS_USE.gmk

    r921 r1045  
    7777  INC_GL    = 1
    7878  LOAD_GL   = 1
    79   LOAD_GL2PS= 1
    8079endif
    8180
    … …  
    104103  INC_IV    = 1
    105104  LOAD_IV   = 1
    106   LOAD_GL2PS= 1
    107105endif
    108106

  • trunk/config/History

    r999 r1045  
    1 cvs log $Id: History,v 1.354 2009/04/20 10:10:25 lgarnier Exp $
     1cvs log $Id: History,v 1.355 2009/04/27 07:44:07 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     ----------------------------------------------------------
    1818
    19 20 April 2009  Laurent Garnier
    20 - sys/Linux-g++.gmk: Corrections to respect Standard location for include
    21   and lib paths for Qt. Try to find better if Qt is not located in a standard
    22   place 
    23 
    24 8 Mars 2009  Laurent Garnier
    25 - sys/Darwin-g++.gmk: Bug fix for Qt non standard installation
    26 - sys/Linux-g++.gmk: Change way to fing QtLib by default
    27 - sys+Win32-VC.gmk: Bug fix for building GLQTLIBS
    28 
    29 5 Mars 2009  Guy Barrand
    30 - analysis.gmk: WIN32-VC : arrange so that what is returned
    31   by `aida-config --lib`, which may have the Windows LINK.exe syntax,
    32   be understood by g++ which is in fact used on CYGWIN
    33   to link applications. Then we transform /LIBPATH options to
    34   -libpath options and change the path backslash syntax to
    35   a slash syntax. With that someone can use the AIDA implementation
    36   coming from an osc-batch or osc-vis binary kit built for
    37   Windows-VisualC++, in a G4 example using AIDA built from CYGWIN with
    38   a G4 built with the VisualC++ compiler (then having a WIN32-VC G4SYSTEM).
    39 - G4UI_USE.gmk: suppress the G4UI_USE_OSC logic.
    40   From OpenScientist/16.8, the osc-g4-vis program can instrument
    41   directly the GNUmakefile of an example or of a user application
    42   which is a clone of some G4 example. And then we let clean
    43   the G4 make files concerning OpenScientist.
     1927th April 2009  Gabriele Cosmo (config-V09-02-05)
     20- Linux-icc.gmk: removed "-lcxa -lunwind" LOADLIBS addition, no longer
     21  necessary since icc-11.0.83.
     22
     2320th April 2009  Laurent Garnier
     24- Linux-g++.gmk: corrections to respect standard location for include
     25  and lib paths for Qt. Improved setup for non-standard Qt3 location.
     26
     278th March 2009  Laurent Garnier
     28- Darwin-g++.gmk: bug fix for Qt non standard installation.
     29- Linux-g++.gmk: changed way to fing QtLib by default.
     30- WIN32-VC.gmk: bug fix for building GLQTLIBS.
     31
     325th March 2009  Guy Barrand
     33- analysis.gmk: arrange configuration for WIN32-VC so that what is returned
     34  by `aida-config --lib` (which may have the Windows LINK.exe syntax) is
     35  understood by g++ which is in fact used by CygWin for linking applications.
     36  Then transforming /LIBPATH options to -libpath options and change the path
     37  '\' syntax to a '/' syntax. Allowing now to use the AIDA implementation
     38  coming from an osc-batch or osc-vis binary kit built for WIN32-VC, in a
     39  example using AIDA built from CygWin with Geant4 built with the VisualC++
     40  compiler.
     41- G4UI_USE.gmk: suppressed G4UI_USE_OSC logic. From OpenScientist/16.8, the
     42  osc-g4-vis program can instrument directly the GNUmakefile of an example or
     43  of a user application which is a clone of some Geant4 example.
    4444
    454527th February 2009  Gabriele Cosmo (config-V09-02-04)

  • trunk/config/analysis.gmk

    r850 r1045  
    1515      # Then we transform to use the -I syntax which is understood by
    1616      # both g++ and CL.exe compilers :
    17       G4ANALYSIS_TMP := $(shell echo "`aida-config --include`")
    18       G4ANALYSIS_AIDA_CONFIG_CFLAGS := $(patsubst /I%,-I"%",$(G4ANALYSIS_TMP))
     17      G4ANALYSIS_TMP_1 := $(shell echo "`aida-config --include`")
     18      G4ANALYSIS_AIDA_CONFIG_CFLAGS := $(patsubst /I%,-I"%",$(G4ANALYSIS_TMP_1))
    1919    else
    2020      G4ANALYSIS_AIDA_CONFIG_CFLAGS := `aida-config --include`
    … …  
    2222  endif
    2323  ifndef G4ANALYSIS_AIDA_CONFIG_LIBS
    24     G4ANALYSIS_AIDA_CONFIG_LIBS := `aida-config --lib`
     24    ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
     25      # The "aida-config --lib" for VC may return information
     26      # by using the Windows /LIBPATH syntax which is not understood
     27      # by g++ used by the Geant4 make system to link applications.
     28      G4ANALYSIS_TMP_2 := $(shell echo "`aida-config --lib`" | sed -e 's:\\:/:g')
     29      G4ANALYSIS_AIDA_CONFIG_LIBS := $(patsubst /LIBPATH:%,'-libpath:'%,$(G4ANALYSIS_TMP_2))
     30    else
     31      G4ANALYSIS_AIDA_CONFIG_LIBS := `aida-config --lib`
     32    endif
    2533  endif
    2634  CPPFLAGS += $(G4ANALYSIS_AIDA_CONFIG_CFLAGS)

  • trunk/config/architecture.gmk

    r886 r1045  
    1 # $Id: architecture.gmk,v 1.116 2008/11/13 16:15:14 gcosmo Exp $
     1# $Id: architecture.gmk,v 1.120 2009/01/26 11:08:02 gcosmo Exp $
    22# ------------------------------------------------------------------------
    33#       GEANT 4 - Architecture configuration script for GNU Make
    … …  
    270270  ifndef GDMLLIBS
    271271    ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
    272       GDMLLIBS := $(LIB_PATH)$(XERCESCROOT)/lib xerces-c_2.lib
     272      GDMLLIBS := $(LIB_PATH)$(XERCESCROOT)/lib xerces-c.lib
    273273    else
    274274      GDMLLIBS := -L$(XERCESCROOT)/lib -lxerces-c
    … …  
    308308#
    309309SED := sed
     310
     311# Default find used with source/GNUmakefile.  Changed for WIN32.
     312#
     313FIND := find
     314
     315# Default sort used with source/GNUmakefile.  Changed for WIN32.
     316#
     317SORT := sort
     318
     319# Default touch used with source/GNUmakefile.  Changed for WIN32.
     320#
     321TOUCH := touch
    310322
    311323# Include architecture dependent setups...

  • trunk/config/binmake.gmk

    r921 r1045  
    1 # $Id: binmake.gmk,v 1.138 2008/11/14 19:58:19 gcosmo Exp $
     1# $Id: binmake.gmk,v 1.139 2008/12/03 13:35:36 gcosmo Exp $
    22# ----------------------------------------------------------
    33# Script defining rules and paths for making binaries.
    … …  
    3434# Verify the existance of granular shared libraries (Unix) or global DLLs (Windows)
    3535#
     36ifndef SHAREDLIBS
     37  SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4globman.$(SHEXT) && echo yes)
     38endif
    3639ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
    3740  SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/G4global.$(SHEXT) && echo yes)
    … …  
    273276# (why?) the user is not supposed to be able to define...
    274277#
    275 LDLIBS5 += $(LOADLIBS)
     278LDLIBS4 += $(LOADLIBS)
    276279
    277280# Finally assemble libraries...
    … …  
    282285else
    283286# Again, do not use := or +=.  See note on LDLIBS2 above.
    284   LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3) $(LDLIBS4)
     287  LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
    285288# Version leaving out EXTRALIBS
    286   LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3) $(LDLIBS4)
    287 endif
    288 LDLIBS_PREFINAL += $(LDLIBS5)
    289 LDLIBS_KERNEL   += $(LDLIBS5)
     289  LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
     290endif
     291LDLIBS_PREFINAL += $(LDLIBS4)
     292LDLIBS_KERNEL   += $(LDLIBS4)
    290293
    291294ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
    … …  
    351354ifdef CPPVERBOSE
    352355        $(CXX) $(CXXFLAGS) $(CPPFLAGS) \
    353           $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS)  \
     356          $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
    354357          $(LDLIBS)
    355358else
    356359        @echo Linking $(G4TARGET) ...
    357360        @$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
    358           $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS)\
     361          $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
    359362          $(LDLIBS)
    360363        @if [ \( -f $(G4BINDIR)/$(G4TARGET) \) ]; then \
    … …  
    368371$(G4TMPDIR)/exe/obj.last: $(objects)
    369372endif
    370         @touch $@
     373        @$(TOUCH) $@
    371374
    372375# Make the $(G4TARGET).$(TARGOBJEXT) file.

  • trunk/config/common.gmk

    r790 r1045  
    1 # $Id: common.gmk,v 1.52 2008/04/30 10:40:12 lgarnier Exp $
     1# $Id: common.gmk,v 1.54 2009/02/26 16:29:08 gcosmo Exp $
    22# ----------------------------------------------------------------
    33# Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
    … …  
    8989# Touch the versioning file
    9090$(G4TMPDIR)/obj.last: $(objects)
    91         @touch $@
     91        @$(TOUCH) $@
    9292
    9393# Make the .d file(s) and include it(them).
    … …  
    151151        @rm -f $(G4LIBDIR)/lib$(name).$(SHEXT)
    152152        @rm -rf $(G4TMPDIR)
     153        @rm -rf moc
    153154endif
    154155

  • trunk/config/globlib.gmk

    r472 r1045  
    1 # $Id: globlib.gmk,v 1.28 2005/12/07 09:53:46 gcosmo Exp $
     1# $Id: globlib.gmk,v 1.29 2009/02/26 16:40:40 gcosmo Exp $
    22# --------------------------------------------------------------
    33# Script for compound libraries.  Gabriele Cosmo, 25/6/98.
    … …  
    116116                                 rm -f $(G4LIBDIR)/*$$lib.$(SHEXT) );\
    117117                                done
     118        @for dir in $(SUBDIRS); do (rm -rf $$dir/moc); done
    118119        @rm -f $(G4LIBDIR)/*$(name).a
    119120        @rm -f $(G4LIBDIR)/*$(name).lib

  • trunk/config/moc.gmk

    r893 r1045  
    1 # $Id: moc.gmk,v 1.2 2008/11/24 14:19:44 lgarnier Exp $
     1# $Id: moc.gmk,v 1.3 2008/12/03 13:35:36 gcosmo Exp $
    22# ----------------------------------------------------------------
    33# Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
    … …  
    1313
    1414ifneq ($(G4INTY_BUILD_QT),)
    15   moc_inc := $(shell (grep -l "Q_OBJECT" include/*.hh))
     15  moc_inc := $(shell ($(GREP) -l "Q_OBJECT" include/*.hh))
    1616  moc_sources := $(patsubst include/%.hh, moc/%_moc.cc, $(moc_inc))
    1717  moc_objects := $(patsubst moc/%_moc.cc,$(G4TMPDIR)/%_moc.o,$(moc_sources))
    … …  
    4646        @echo Making moc file for $< ...
    4747        @if [ ! -d moc ] ; then mkdir -p moc  ;fi
    48         @if [ `$(QTMOC) -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \
     48        @if [ `$(QTMOC) -v 2>&1 | $(GREP) "Qt 3" | wc -l ` -gt 0 ]; then \
    4949        $(QTMOC) -o $@ $<;\
    5050        else $(QTMOC) $(MOC_MACRO) -o $@ $<; \

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

    r886 r1045  
    577577if ( ${?LD_LIBRARY_PATH} )  then
    578578setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    579 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     579setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    580580
    581581if ( ${?G4LIB_BUILD_GDML} ) then
    … …  
    585585else
    586586setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
    587 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     587setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    588588
    589589if ( ${?G4LIB_BUILD_GDML} ) then
    … …  
    602602if ( ${?DYLD_LIBRARY_PATH} )  then
    603603setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    604 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     604setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    605605
    606606if ( ${?G4LIB_BUILD_GDML} ) then
    … …  
    610610else
    611611setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
    612 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     612setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    613613
    614614if ( ${?G4LIB_BUILD_GDML} ) then

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

    r886 r1045  
    591591export QTLIBS
    592592export QTMOC
     593if test "x\$g4non_display" = "x" ; then
    593594echo "On this machine the QTFLAGS=\$QTFLAGS"
    594595echo "On this machine the QTLIBS=\$QTLIBS"
    595596echo "On this machine the QTMOC=\$QTMOC"
     597fi
    596598fi
    597599
    … …  
    609611export QTMOC
    610612export GLQTLIBS
     613if test "x\$g4non_display" = "x" ; then
    611614echo "On this machine the QTFLAGS=\$QTFLAGS"
    612615echo "On this machine the GLQTLIBS=\$GLQTLIBS"
    613616echo "On this machine the QTMOC=\$QTMOC"
    614617fi
     618fi
    615619
    616620
    … …  
    623627G4LIB_BUILD_GDML=1
    624628export G4LIB_BUILD_GDML
     629if test "x\$g4non_display" = "x" ; then
    625630echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
     631fi
    626632fi
    627633
    … …  
    629635XERCESCROOT=$g4gdml_xercesc_root
    630636export XERCESCROOT
     637if test "x\$g4non_display" = "x" ; then
    631638echo "On this machine the XERCESCROOT=\$XERCESCROOT"
     639fi
    632640fi
    633641
    … …  
    771779if [ $G4LIB_BUILD_SHARED ] ; then
    772780#
    773 # Warning about LD_LIBRARY_PATH
    774 #
    775 echo ''
    776 echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
    777 echo ''
    778 echo 'NOTE : verify that the correct path for the CLHEP library'
    779 echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
    780 echo 'variable in your environment, and no other outdated installations'
    781 echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
    782 echo 'present in your system !'
    783 echo ''
     781# Warning about LD_LIBRARY_PATH unless g4non_display is set!
     782#
     783if test "x\$g4non_display" = "x" ; then
     784    echo ''
     785    echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     786    echo ''
     787    echo 'NOTE : verify that the correct path for the CLHEP library'
     788    echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
     789    echo 'variable in your environment, and no other outdated installations'
     790    echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
     791    echo 'present in your system !'
     792    echo ''
     793fi
    784794
    785795if [ $LD_LIBRARY_PATH ] ; then
    786796LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    787 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     797LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    788798
    789799if [ $G4LIB_BUILD_GDML ] ; then
    … …  
    794804else
    795805LD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
    796 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     806LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    797807
    798808if [ $G4LIB_BUILD_GDML ] ; then
    … …  
    812822if [ $DYLD_LIBRARY_PATH ] ; then
    813823DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    814 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     824DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    815825
    816826if [ $G4LIB_BUILD_GDML ] ; then
    … …  
    821831else
    822832DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
    823 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     833DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    824834
    825835if [ $G4LIB_BUILD_GDML ] ; then

  • trunk/config/sys/Darwin-g++.gmk

    r1017 r1045  
    1313  CXX       := g++
    1414  CXXFLAGS  := -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
    15 # CXXFLAGS  += -Wunused-parameter -Winline -Wunreachable-code
    16   CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
     15  CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe -Wextra
     16#  CXXFLAGS  := -Wall -Wextra -ansi -pedantic -Wuninitialized -Winline -Wunreachable-code
    1717  ifdef G4OPTIMISE
    18     CXXFLAGS  += -O2
    19     FCFLAGS   := -O2
    20     CCFLAGS   := -O2
     18#    CXXFLAGS  += -O2
     19#    FCFLAGS   := -O2
     20#    CCFLAGS   := -O2
    2121  else
    2222    ifdef G4DEBUG

  • trunk/config/sys/Linux-icc.gmk

    r1017 r1045  
    5353  endif
    5454  DLDLIBS   := -ldl
    55   LOADLIBS  += -lcxa -lunwind
    5655  ifndef OGLFLAGS
    5756    OGLFLAGS  := -I$(OGLHOME)/include
Note: See TracChangeset for help on using the changeset viewer.