Import Geant4 3.2.0 source tree

Author: gcosmo

Configure

@@ -1,4 +1,4 @@
-# $Id: G4VIS_BUILD.gmk,v 1.3 2000/01/29 00:41:49 asaim Exp $
+# $Id: G4VIS_BUILD.gmk,v 1.5 2001/06/19 20:38:12 johna Exp $
 # -------------------------------------------------------------
 # Visualization-specific CPPFLAGS for BUILD phase.
 #   John Allison, 24th January 1998.
@@ -78,8 +78,16 @@ ifdef G4VIS_BUILD_VRMLFILE_DRIVER
 endif
 # End of VRML and VRMLFILE drivers
 
-ifdef G4VIS_BUILD
-  CPPFLAGS += -DG4VIS_BUILD
+ifdef G4VIS_BUILD_ASCIITREE_DRIVER
+  G4VIS_BUILD = 1
+  CPPFLAGS += -DG4VIS_BUILD_ASCIITREE_DRIVER
 endif
 
+ifdef G4VIS_BUILD_GAGTREE_DRIVER
+  G4VIS_BUILD = 1
+  CPPFLAGS += -DG4VIS_BUILD_GAGTREE_DRIVER
+endif
 
+ifdef G4VIS_BUILD
+  CPPFLAGS += -DG4VIS_BUILD
+endif

ReleaseNotes/ReleaseNotes4.3.2.txt

@@ -1,4 +1,4 @@
-# $Id: G4VIS_USE.gmk,v 1.3 2000/01/29 00:41:49 asaim Exp $
+# $Id: G4VIS_USE.gmk,v 1.5 2001/06/19 20:38:31 johna Exp $
 # -------------------------------------------------------------
 # GNUmakefile for CPPFLAGS for visualization USE phase.
 #   John Allison, 24th January 1998.
@@ -91,6 +91,20 @@ ifdef G4VIS_USE_VRML_OR_VRMLFILE
   VISLIBS += -lG4VRML
 endif
 
+ifdef G4VIS_USE_ASCIITREE
+  G4VIS_USE_TREE = 1
+  CPPFLAGS += -DG4VIS_USE_ASCIITREE
+endif
+ifdef G4VIS_USE_GAGTREE
+  G4VIS_USE_TREE = 1
+  CPPFLAGS += -DG4VIS_USE_GAGTREE
+endif
+ifdef G4VIS_USE_TREE
+  G4VIS_USE = 1
+  CPPFLAGS += -I$(G4BASE)/visualization/Tree/include
+  VISLIBS += -lG4Tree
+endif
+
 ifdef G4VIS_USE
   ifdef G4_SOLVE_TEMPLATES
     G4_SOLVE_VIS_TEMPLATES = 1

config/G4VIS_BUILD.gmk

@@ -1,5 +1,6 @@
-$Id: History,v 1.132.2.1 2001/03/22 14:00:01 gunter Exp $
-$Name: geant4-03-01 $
+$Id: History,v 1.149 2001/06/29 12:49:25 gcosmo Exp $
+$Name:  $
+
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,7 +18,68 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
-22 March 2001 Gunter Folger (config-V03-00-03)
+29th June 2001 Gabriele Cosmo (config-V03-01-10)
+- Updated source scripts for 'Configure'.
+
+26th June 2001 Youhei Morita (config-V03-01-09)
+- globlib.gmk: added block for copying headers for persistency in $G4INCLUDE
+  when invoking the 'includes' target.
+
+25th June 2001 Youhei Morita (config-V03-01-08)
+- Restored lib_d target (again) in common.gmk with a protection of G4ODBMS.
+- Linux-g++.gmk (G.Cosmo)
+  o Commented out -ansi setup for public release
+  o Fixed logic for activating G4OODDLX_FLAGS on egcs compiler
+
+22nd June Gabriele Cosmo (config-V03-01-07)
+- common.gmk (G.Folger):
+  o removed lib_d target (again).
+  o restored G4SKIP_DEPEND.
+- Linux-g++.gmk:
+  o added temporary cludge for identify compiler version
+    and define G4DDLX_FLAGS for egcs-1.1.2.
+- binmake.gmk:
+  o added mechanism to correctly handle include paths when source headers
+    are centrally installed in $G4INCLUDE. Temporarly disabled, requires
+    update (re-design?) of liblist.c to properly generate the list of
+    libraries from the map.
+    Once activated, also G4UI_USE.gmk, G4VIS_USE.gmk and analysis.gmk
+    have to be modified accordingly.
+
+22nd June 2001 Youhei Morita (config-V03-01-06)
+- Restored lib_d target in common.gmk with a protection of G4ODBMS.
+- Get rid of G4SKIP_DEPEND in binmake.gmk.
+- Comment out G4DDLX_FLAGS options in sys/Linux-g++.gmk for gcc-2.95.2.
+
+21st June 2001 Gunter Folger (config-V03-01-05)
+- Removed bin_d and lib_d targets and thus the re-start of make.
+
+21st June 2001 Gunter Folger (config-V03-01-04)
+- common.gmk, binmake.gmk: run gmake via $(MAKE).
+
+19th June 2001 John Allison (config-V03-01-03)
+- Added GAG_TREE to G4VIS_BUILD.gmk and G4VIS_USE.gmk.
+
+20th June 2001 (Japan Time - still 19th in Europe!)
+               Youhei Morita (config-V03-01-02)
+- A few bug fixes in binmake.gmk, common_objy.gmk, sys/SUN-CC5.gmk,
+  sys/Linux-g++.gmk, sys/Win32-g++.gmk.
+
+19th June 2001 Gabriele Cosmo
+- Removed G4_NO_CBRT flag from WIN32-VC setup. No more necessary.
+
+30th May 2001 Gunter Folger
+- Do changes for persistency from Youhei: common.gmk is now split in three,
+  one general, and one for specific for transient and persistent each. 
+  Dependencies now much better handled in persistency.
+
+2nd May 2001 Gabriele Cosmo (config-V03-01-01)
+- Added options "-Wall -ansi -pedantic" to Linux-g++ setup.
+
+10th April 2001  John Allison  (config-V03-01-00)
+- Added G4VIS_BUILD_ASCIITREE_DRIVER and G4VIS_USE_ASCIITREE to G4VIS*gmk.
+
+22nd March 2001 Gunter Folger (config-V03-00-03)
 - binmake.gmk, only store in executable PATH to libs from example/test; 
   other libs should be taken/found from LD_LIBRARY_PATH
 - sys/{Linux-g++,SUN-CC}.gmk: enable storing of PATH to libs in executable 

config/G4VIS_USE.gmk

@@ -1,4 +1,4 @@
-# $Id: architecture.gmk,v 1.70 2000/12/08 09:41:26 gcosmo Exp $
+# $Id: architecture.gmk,v 1.71 2001/05/30 15:04:13 gunter Exp $
 # ------------------------------------------------------------------------
 #       GEANT 4 - Architecture configuration script for GNU Make
 #
@@ -123,7 +123,8 @@ ifdef G4ODBMS
 # set to $G4LIB/$G4SYSTEM/schema ...
 #
 ifndef G4SCHEMA_DIR
-  G4SCHEMA_DIR := $(G4LIB)/$(G4SYSTEM)/schema
+  G4SCHEMA_DIR     := $(G4LIB)/$(G4SYSTEM)/schema
+  G4SCHEMA_BOOT    := $(G4SCHEMA_DIR)/G4SCHEMA
   G4SCHEMA_INCLUDE := $(G4SCHEMA_DIR)/include
 endif
 ifndef G4SCHEMA_FDID
@@ -133,16 +134,6 @@ endif
 G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4SCHEMA_DIR) ] && mkdir -p $(G4SCHEMA_DIR) )
 G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4SCHEMA_INCLUDE) ] && mkdir -p $(G4SCHEMA_INCLUDE) )
 
-# If not specified, the default path for G4 temporary schema G4TMPSCHEMA_DIR is
-# set to $G4TMP/$G4SYSTEM/schema (for building persistency library)...
-#
-ifndef G4TMPSCHEMA_DIR
-  G4TMPSCHEMA_DIR := $(G4TMP)/$(G4SYSTEM)/schema
-  G4TMPSCHEMA_BOOT := $(G4TMPSCHEMA_DIR)/G4SCHEMA
-endif
-
-G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4TMPSCHEMA_DIR) ] && mkdir -p $(G4TMPSCHEMA_DIR) )
-
 # If not specified, the default path for G4 example schema G4EXAMPLE_BOOT_DIR is
 # set to $G4WORKDIR/exampleSchema (for persistency examples)...
 #
@@ -165,7 +156,7 @@ ifndef G4EXAMPLE_FD_DIR
 endif
 
 G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4EXAMPLE_FD_DIR) ] && mkdir -p $(G4EXAMPLE_FD_DIR) )
-G4OODDLX_FLAGS := -DTEMPLATEP_HIDES_FNCD
+G4DDLX_FLAGS := -DTEMPLATEP_HIDES_FNCD
 
 ifndef G4EXAMPLE_FD
   G4EXAMPLE_FD = $(G4EXAMPLE_FD_DIR)/$(name)

config/History

@@ -1,7 +1,7 @@
-# $Id: binmake.gmk,v 1.56.2.1 2001/03/22 13:54:24 gunter Exp $
+# $Id: binmake.gmk,v 1.63 2001/06/22 16:11:21 gcosmo Exp $
 # ----------------------------------------------------------
 # Script defining rules and paths for making binaries.
-#                          Gabriele Cosmo, 25/06/1998.
+#    First implementation: Gabriele Cosmo, 25/06/1998.
 # ----------------------------------------------------------
 
 ifndef LDFLAGS
@@ -10,12 +10,20 @@ endif
 
 G4LIBDIR := $(G4LIB)/$(G4SYSTEM)
 
+# Define variable checking for existence of centrally installed headers.
+# If check will be true, avoid explicit definition of paths to INCFLAGS.
+#
+# G4INCLUDE_EXEC := $(shell [ -r $(G4INCLUDE)/globals.hh ] && echo 1)
+
 include $(G4INSTALL)/config/G4UI_USE.gmk
 include $(G4INSTALL)/config/G4VIS_USE.gmk
 include $(G4INSTALL)/config/interactivity.gmk
 include $(G4INSTALL)/config/analysis.gmk
 
 ifndef INCFLAGS
+# ifeq ($(G4INCLUDE_EXEC),1)
+#   INCFLAGS := -I$(G4INCLUDE)
+# else
   INCFLAGS := \
               -I$(G4BASE)/global/management/include \
               -I$(G4BASE)/global/HEPRandom/include \
@@ -83,9 +91,11 @@ ifndef INCFLAGS
               -I$(G4BASE)/graphics_reps/include \
               -I$(G4BASE)/intercoms/include \
               -I$(G4BASE)/g3tog4/include
+# endif
 endif
 
 ifdef G4ODBMS
+# ifneq ($(G4INCLUDE_EXEC),1)
   INCFLAGS += \
               -I$(G4BASE)/persistency/global/include \
               -I$(G4BASE)/persistency/digits+hits/hits/include \
@@ -95,8 +105,9 @@ ifdef G4ODBMS
               -I$(G4BASE)/persistency/geometry/solids/CSG/include \
               -I$(G4BASE)/persistency/geometry/solids/Boolean/include \
               -I$(G4BASE)/persistency/geometry/management/include \
-              -I$(G4BASE)/persistency/management/include \
-              -I$(G4SCHEMA_INCLUDE) \
+              -I$(G4BASE)/persistency/management/include
+# endif
+  INCFLAGS += -I$(G4SCHEMA_INCLUDE) \
               -I$(OBJY_DIR)/include \
               -I$(HEP_ODBMS_DIR)/include \
               -DHep_HAS_BUILDIN_BOOL_CONSTANTS
@@ -125,8 +136,8 @@ ifdef G4EXLIB
   LDFLAGS += -L$(G4LIBDIR)
   ifdef SHAREDLIBS
     ifdef G4RUNPATHOPTION
-#        for the example dependant directory, keep the path to the shared lib 
-#          in the executable.
+#         For the example dependent directory, keep the 
+#         path to the shared lib in the executable.
       LDFLAGS += $(G4RUNPATHOPTION)$(G4LIBDIR)
     endif
   endif
@@ -253,7 +264,13 @@ else
 .PHONY: bin clean clean_bin debug cleandb newboot newfd
 endif
 
+#
+# Target "bin" requires dependency files when G4ODBMS=1.
+# gmake must be recursively called with MAKE_DFILES=1.
+#
+
 # Make $(G4TARGET) executable.
+
 bin: $(G4BINDIR)/$(G4TARGET)
 
 $(G4BINDIR)/$(G4TARGET): $(LINK_DEPENDENCIES)
@@ -313,17 +330,14 @@ else
 endif
 
 # Make the $(G4TARGET).d file and include it.
-ifdef G4SKIP_DEPEND
-$(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc
-	@echo Skip dependency file creation for file $< ...
-else
 $(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) $(G4TMPDIR)/exe/\\c ; \
 	g++ $(GPPFLAGS) $(CPPFLAGS) $< ) | sed 's!$(G4TMPDIR)/exe/$*.o!& $@!' >$@
+ifneq ($(dependencies),)
 -include $(dependencies)
 endif
 
@@ -347,6 +361,14 @@ ifdef G4ODBMS
 
 cleandb: clean newboot
 
+$(G4EXAMPLE_BOOT):
+	@echo Copying schema file to $(G4EXAMPLE_BOOT) for FDID $(G4EXAMPLE_FDID)
+	@rm -f $(G4EXAMPLE_BOOT_DIR)/$(name)
+	@rm -f $(G4EXAMPLE_BOOT_DIR)/$(name).FDDB
+	@rm -f $(G4EXAMPLE_BOOT_DIR)/*.$(name).DB
+	@$(HEP_ODBMS_DIR)/etc/getdb $(G4SCHEMA_DIR)/G4SCHEMA \
+	                            $(G4EXAMPLE_BOOT) $(G4SCHEMA_FDID)
+
 newboot:
 	@echo Copying schema file to $(G4EXAMPLE_BOOT) for FDID $(G4EXAMPLE_FDID)
 	@rm -f $(G4EXAMPLE_BOOT_DIR)/$(name)
@@ -355,17 +377,22 @@ newboot:
 	@$(HEP_ODBMS_DIR)/etc/getdb $(G4SCHEMA_DIR)/G4SCHEMA \
 	                            $(G4EXAMPLE_BOOT) $(G4SCHEMA_FDID)
 
+$(G4EXAMPLE_FD):
+	@echo Creating new runtime federated database $(G4EXAMPLE_BOOT) for FDID $(G4EXAMPLE_FDID)
+	@rm -f $(G4EXAMPLE_FD_DIR)/$(name)
+	@rm -f $(G4EXAMPLE_FD_DIR)/$(name).FDDB
+	@rm -f $(G4EXAMPLE_FD_DIR)/*.$(name).DB
+	@$(HEP_ODBMS_DIR)/etc/getdb $(G4EXAMPLE_BOOT) \
+	                            $(G4EXAMPLE_FD) $(G4EXAMPLE_FDID)
+
 newfd:
-ifndef G4EXAMPLE_FDID
-	@echo G4EXAMPLE_FDID is not defined.  Stop.
-	exit 1
-endif
 	@echo Creating new runtime federated database $(G4EXAMPLE_BOOT) for FDID $(G4EXAMPLE_FDID)
 	@rm -f $(G4EXAMPLE_FD_DIR)/$(name)
 	@rm -f $(G4EXAMPLE_FD_DIR)/$(name).FDDB
 	@rm -f $(G4EXAMPLE_FD_DIR)/*.$(name).DB
 	@$(HEP_ODBMS_DIR)/etc/getdb $(G4EXAMPLE_BOOT) \
 	                            $(G4EXAMPLE_FD) $(G4EXAMPLE_FDID)
+
 endif
 ############################- targets for G4ODBMS -############################