Import Geant4 6.2.0 source tree

Author: gcosmo

Configure

@@ -1,5 +1,5 @@
-$Id: History,v 1.238 2004/02/24 09:49:45 gcosmo Exp $
-$Name: geant4-06-01 $
+$Id: History,v 1.254 2004/06/23 10:56:23 gcosmo Exp $
+$Name: geant4-06-02 $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,73 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+23rd June 2004 Gabriele Cosmo (config-V06-01-10)
+- Updated win32def.c program to fix retrivial of public static data for
+  building DLLs on Windows (G.Barrand).
+- Updated Configure scripts.
+
+17th June 2004 Gabriele Cosmo (config-V06-01-09)
+- Darwin-g++.gmk: use twolevel_namespace and GLOBLIBS for shared-libs
+  build on MacOS. Shared-libs build are possible only global libraries
+  and requires shared-lib version of CLHEP build with compatible options
+  (G.Barrand).
+
+14th June 2004 Gabriele Cosmo (config-V06-01-08)
+- architecture.gmk: added specification for G4LIB_USE_DLL.
+
+11th June 2004 Gabriele Cosmo (config-V06-01-07)
+- binmake.gmk: activated shared-libs mechanism for Windows platforms;
+  forced creation of static library for examples/applications for the
+  usage with DLLs.
+
+8th June 2004 Gabriele Cosmo (config-V06-01-06)
+- binmake.gmk: restored global lib for interfaces which was missing
+  from linking list.
+- common.gmk, globlib.gmk: fixed clean/clean_libs target.
+- architecture.gmk: added definition of G4LIB_BUILD_DLL flag.
+- WIN32-VC.gmk: added targets for DLLs build.
+- Linux-g++.gmk: made -O2 the default optimisation mode.
+  Archived temporary setup Linux-gO2 introduced in "config-V06-01-01".
+
+7th June 2004 Gabriele Cosmo (config-V06-01-05)
+- Corrected setup for WIN32-VC7 for building of DLLs.
+- Cosmetics in build printout...
+
+1st June 2004 Gabriele Cosmo (config-V06-01-04)
+- binmake.gmk, added include paths to new hadronic models for
+  abrasion, em_dissociation, de_excitation/ablation and
+  de_excitation/fission.
+- architecture.gmk: updated comments to header.
+
+26th May 2004 Mark Donszelmann (config-V06-01-03)
+- Fixed small problem in previous fix.
+
+26th May 2004  Gunter Folger (config-V06-01-02)
+- binmake.gmk: fixed problem for WIN32 such that also LDLIBS (including
+  EXTRALIBS) will be mangled to replace -L by its WIN32 correspondance
+  libpath.
+
+11th May 2004  Gabriele Cosmo (config-V06-01-01)
+- Added new experimental setup for Linux-g++ using -O2 optimisation
+  as default. To trigger this setup G4SYSTEM must be set to "Linux-gO2".
+  It also includes (deactivated by default) Pentium4 chip specific options
+  for using chips-specific floating-point arithmetics based on the SSE unit.
+
+8th April 2004  Guy Barrand
+- architecture.gmk: revisited Inventor default. Removed HEPVis dependencies
+  (Inventor visualization driver does not need these libraries any longer).
+
+7th April 2004  Guy Barrand
+- Darwin-g++.gmk:
+  o Corrected options to build shared libraries (.dyn); use
+    "-dynamic -single_module" to have faster startup when Geant4 is
+    embedded in an external framework.
+  o Corrected options to retrieve Motif. 
+
+5th April 2004  Gabriele Cosmo (config-V06-01-00)
+- architecture.gmk: added check for definition of LDFLAGS.
+  Fixes bug report #603.
+
 24th February 2004  Gabriele Cosmo (config-V06-00-03)
 - Fixed link rpath definition in Linux-icc.gmk.
 

ReleaseNotes/ReleaseNotes4.6.2.html

@@ -1,4 +1,4 @@
-# $Id: architecture.gmk,v 1.91 2004/02/09 15:22:49 gunter Exp $
+# $Id: architecture.gmk,v 1.99 2004/06/14 10:42:12 gcosmo Exp $
 # ------------------------------------------------------------------------
 #       GEANT 4 - Architecture configuration script for GNU Make
 #
@@ -13,11 +13,11 @@
 # List of the supported architectures/compilers and related flavors for
 # the environment variable G4SYSTEM:
 #
-#          Linux-g++   Linux (Red Hat 7.3), gcc-2.95.2 or gcc-3.2 (default)
+#          Linux-g++   Linux (Red Hat 7.3), gcc-3.2.3 (default)
 #
 #          SUN-CC      SunOS 5.8, CC 5.4
 #
-#          WIN32-VC    Windows/2000/XP and Microsoft Visual C++ 6.0 - SP5
+#          WIN32-VC7   Windows/2000/XP and Microsoft Visual C++ 7.1 .NET
 #                      Adding CYGWIN32 tools
 # -------------------------------------------------------------------------
 
@@ -84,6 +84,18 @@ ifeq ($(G4LIB_BUILD_SHARED),)
   endif  
 endif
 
+# Specify if to build the DLL libraries on Windows. Default is NO.
+#
+ifneq ($(G4LIB_USE_DLL),)
+  G4LIB_BUILD_DLL = 1
+  CPPFLAGS += -DG4LIB_BUILD_DLL
+endif
+ifneq ($(G4LIB_BUILD_DLL),)
+  G4LIB_BUILD_DLL = 1
+  CPPFLAGS += -DG4LIB_BUILD_DLL
+  G4LIB_USE_DLL = 1
+endif
+
 # Specify if to build the G3TOG4 module or not. Default is NO.
 #
 ifneq ($(G4LIB_BUILD_G3TOG4),)
@@ -115,7 +127,7 @@ endif
 # CLHEP path, etc.
 #
 ifndef CLHEP_BASE_DIR
-  CLHEP_BASE_DIR    := /afs/cern.ch/sw/geant4/dev/CLHEP/$(G4SYSTEM)/pro
+  CLHEP_BASE_DIR    := $(shell ls CLHEP_BASE_DIR--UNDEFINED)
 endif
 ifndef CLHEP_INCLUDE_DIR
   CLHEP_INCLUDE_DIR := $(CLHEP_BASE_DIR)/include
@@ -151,7 +163,7 @@ ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
   OUT_LIB := '-out:'
   OUT_EXE := '-Fe'
   LIB_PATH := '-libpath:'
-  CERNLIB_PATH := "z:\p32\cern\new\df\lib"
+  CERNLIB_PATH := "c:\cern\pro\lib"
   PATH_DEL := \\
   #
   # pattern for next substitution
@@ -180,11 +192,14 @@ CPPFLAGS  += -I$(CLHEP_INCLUDE_DIR)
 
 # Positional qualifiers in action...
 #
+ifndef LDFLAGS
+  LDFLAGS :=
+endif
 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
-  LDFLAGS   := -link $(LIB_PATH)$(CLHEP_LIB_DIR)
+  LDFLAGS   += -link $(LIB_PATH)$(CLHEP_LIB_DIR)
   LOADLIBS  := $(CLHEP_LIB)
 else
-  LDFLAGS   := -L$(CLHEP_LIB_DIR)
+  LDFLAGS   += -L$(CLHEP_LIB_DIR)
   LOADLIBS  := -l$(CLHEP_LIB)
   LOADLIBS  += -lm
 endif
@@ -220,21 +235,19 @@ XAWLIBS    := -lXaw
 # are set below.  Most system-dependent code assumes OGLHOME is set.
 #
 # ------------- OpenInventor -----------------
-# The path to the installation of HEPVis and OpenInventor must be specified
-# in HEPVISDIR -only- if the packages are installed in a location different
+# The path to the installation of OpenInventor must be specified
+# if the package is installed in a location different
 # than default system directories (like... /usr or /usr/local).
 #
-ifndef HEPVISINC
-  HEPVISINC := $(HEPVISDIR)/include
-endif
-ifndef HEPVISLIB
-  HEPVISLIB := $(HEPVISDIR)/lib
+
+ifndef OIVHOME
+  OIVHOME  := /usr/local/Inventor
 endif
 ifndef OIVFLAGS
-  OIVFLAGS  := -I${HEPVISINC}
+  OIVFLAGS  := -I$(OIVHOME)/include 
 endif
 ifndef OIVLIBS
-  OIVLIBS   := -L${HEPVISLIB} -lHEPVis -lHEPVisXt -lInventor -lInventorXt
+  OIVLIBS   := -L$(OIVHOME)/lib -lInventorXt -lInventor
 endif
 
 # For cfront compilers the repository location is set to

config/History

@@ -1,4 +1,4 @@
-# $Id: binmake.gmk,v 1.94 2003/11/18 11:28:10 hpw Exp $
+# $Id: binmake.gmk,v 1.102 2004/06/11 14:07:47 gcosmo Exp $
 # ----------------------------------------------------------
 # Script defining rules and paths for making binaries.
 #    First implementation: Gabriele Cosmo, 25/06/1998.
@@ -20,6 +20,9 @@ include $(G4INSTALL)/config/G4VIS_USE.gmk
 include $(G4INSTALL)/config/interactivity.gmk
 include $(G4INSTALL)/config/analysis.gmk
 
+# Verify the existance of the global static libraries first.
+# if not verify the existance of global shared libraries (Unix only).
+#
 ifndef G4LIB_USE_GRANULAR
     GLOBALLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4global.a && echo yes)
   ifndef GLOBALLIBS
@@ -28,10 +31,15 @@ ifndef G4LIB_USE_GRANULAR
   endif
 endif
 
+# Verify the existance of granular shared libraries (Unix) or global DLLs (Windows)
+#
 ifndef SHAREDLIBS
   SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4globman.$(SHEXT) && echo yes)
 endif
-  
+ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+  SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/G4global.$(SHEXT) && echo yes)
+endif  
+
 ifndef INCFLAGS
  ifeq ($(G4INCLUDE_EXEC),1)
   INCFLAGS := -I$(G4INCLUDE)
@@ -64,44 +72,47 @@ ifndef INCFLAGS
               -I$(G4BASE)/processes/electromagnetic/lowenergy/include \
               -I$(G4BASE)/processes/hadronic/cross_sections/include \
 	      -I$(G4BASE)/processes/hadronic/management/include \
+	      -I$(G4BASE)/processes/hadronic/models/abrasion/include \
+              -I$(G4BASE)/processes/hadronic/models/binary_cascade/include \
 	      -I$(G4BASE)/processes/hadronic/models/cascade/cascade/include \
 	      -I$(G4BASE)/processes/hadronic/models/cascade/evaporation/include \
 	      -I$(G4BASE)/processes/hadronic/models/cascade/utils/include \
               -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
               -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
               -I$(G4BASE)/processes/hadronic/models/coherent_elastic/include \
-              -I$(G4BASE)/processes/hadronic/models/high_energy/include \
-              -I$(G4BASE)/processes/hadronic/models/isotope_production/include \
-              -I$(G4BASE)/processes/hadronic/models/leading_particle/include \
-              -I$(G4BASE)/processes/hadronic/models/low_energy/include \
-              -I$(G4BASE)/processes/hadronic/models/neutron_hp/include \
-              -I$(G4BASE)/processes/hadronic/models/binary_cascade/include \
+	      -I$(G4BASE)/processes/hadronic/models/de_excitation/ablation/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/evaporation/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/fermi_breakup/include \
-              -I$(G4BASE)/processes/hadronic/models/de_excitation/fission/include \
+	      -I$(G4BASE)/processes/hadronic/models/de_excitation/fission/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/gem_evaporation/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/handler/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/management/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/multifragmentation/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/photon_evaporation/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/util/include \
+              -I$(G4BASE)/processes/hadronic/models/em_dissociation/include \
+              -I$(G4BASE)/processes/hadronic/models/general_finalstate/include \
+              -I$(G4BASE)/processes/hadronic/models/high_energy/include \
+              -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
               -I$(G4BASE)/processes/hadronic/models/inucl/include \
+              -I$(G4BASE)/processes/hadronic/models/isotope_production/include \
+              -I$(G4BASE)/processes/hadronic/models/leading_particle/include \
+              -I$(G4BASE)/processes/hadronic/models/low_energy/include \
+              -I$(G4BASE)/processes/hadronic/models/management/include \
+              -I$(G4BASE)/processes/hadronic/models/neutron_hp/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/diffraction/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/hadronization/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/management/include \
+              -I$(G4BASE)/processes/hadronic/models/parton_string/qgsm/include \
               -I$(G4BASE)/processes/hadronic/models/photolepton_hadron/muon_nuclear/include \
               -I$(G4BASE)/processes/hadronic/models/pre_equilibrium/exciton_model/include \
               -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/body/include \
               -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/util/include \
+              -I$(G4BASE)/processes/hadronic/models/radioactive_decay/include \
               -I$(G4BASE)/processes/hadronic/models/relativistic_qmd/include \
               -I$(G4BASE)/processes/hadronic/models/relativistic_qmd/uplusplus/include \
-              -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
-              -I$(G4BASE)/processes/hadronic/models/management/include \
-              -I$(G4BASE)/processes/hadronic/models/parton_string/diffraction/include \
-              -I$(G4BASE)/processes/hadronic/models/parton_string/hadronization/include \
-              -I$(G4BASE)/processes/hadronic/models/parton_string/management/include \
-              -I$(G4BASE)/processes/hadronic/models/parton_string/qgsm/include \
               -I$(G4BASE)/processes/hadronic/models/theo_high_energy/include \
               -I$(G4BASE)/processes/hadronic/models/util/include \
-              -I$(G4BASE)/processes/hadronic/models/general_finalstate/include \
-              -I$(G4BASE)/processes/hadronic/models/radioactive_decay/include \
               -I$(G4BASE)/processes/hadronic/processes/include \
               -I$(G4BASE)/processes/hadronic/stopping/include \
               -I$(G4BASE)/processes/hadronic/util/include \
@@ -160,23 +171,32 @@ endif
 #
 ifndef USER_DEFINED_LDLIBS
 
-# LDLIBS1 contains the very high level libraries...
+# TARGETLIB is the library generated for the final user application...
 #
 ifdef G4EXLIB
-  LDLIBS1 := -l$(G4TARGET)
+  ifeq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+  # Unix
+    TARGETLIB := -l$(G4TARGET)
+  else
+  # Windows
+    TARGETLIB := lib$(G4TARGET).a   
+  endif
 endif
-LDLIBS1 += $(EXTRALIBS)
 
-# VISLIBS and UILIBS are now handled by the granular library script...
+# LDLIBS1 contains the very high level libraries...
+#
+LDLIBS1 := $(EXTRALIBS)
+
+# VISLIBS (and UILIBS?) is handled by the granular library script...
 #
 ifdef GLOBALLIBS
-  LDLIBS1 += $(VISLIBS) $(UILIBS) -lG4persistency
+  LDLIBS2 := $(VISLIBS) -lG4interfaces -lG4persistency
 
   ifdef G4USE_G3TOG4
-    LDLIBS1 += -lG3toG4
+    LDLIBS2 += -lG3toG4
   endif
 
-  LDLIBS2 := -lG4readout \
+  LDLIBS2 += -lG4readout \
              -lG4run \
              -lG4event \
              -lG4tracking \
@@ -241,13 +261,18 @@ LDLIBS_PREFINAL += $(LDLIBS4)
 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
   WIN32TMP := $(patsubst -L%,$(LIB_PATH)%,$(LDFLAGS))
   LDFLAGS  = $(patsubst /,$(PATH_DEL),$(WIN32TMP))
-  LDLIBS = $(patsubst -l%,lib%.a,$(LDLIBS_PREFINAL))
+  WIN32TMP2 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS_PREFINAL))
+  ifdef SHAREDLIBS
+	LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.lib,$(WIN32TMP2))
+  else
+  	LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP2))
+  endif
 else
-  LDLIBS = $(LDLIBS_PREFINAL)
+  LDLIBS = $(TARGETLIB) $(LDLIBS_PREFINAL)
 endif
 
 ifdef transform-RPath
-#invoke system specific transformation of 
+# Invoke system specific transformation of 
 include $(G4INSTALL)/config/sys/$(G4SYSTEM)-runpath.gmk
 endif
 
@@ -279,7 +304,7 @@ ifndef USER_DEFINED_LDLIBS
 	  echo "         gmake libmap"; \
 	  exit 1; fi
   else
-	@echo "Using global libraries."
+	@echo "Using global libraries ..."
   endif
 endif
 	@if [ ! -d $(G4BINDIR) ] ; then mkdir $(G4BINDIR) ;fi
@@ -339,7 +364,7 @@ $(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc
 	@if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi
 	@if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi
 	@if [ ! -d $(G4TMPDIR)/exe ] ; then mkdir $(G4TMPDIR)/exe ;fi
-	@echo Making dependency for file $<...
+	@echo Making dependency for file $< ...
 	@set -e;\
 	g++ $(GPPFLAGS) $(CPPFLAGS) -w $< |\
 	sed 's!$(G4TARGET)\.o!$(G4TMPDIR)/exe/& $@!' >$@;\