Import Geant4 0.1.1 source tree

config/G4ODBMS_BUILD.gmk

@@ -1,4 +1,4 @@
-# $Id: G4ODBMS_BUILD.gmk,v 1.1 1999/01/07 15:58:31 gunter Exp $
+# $Id: G4ODBMS_BUILD.gmk,v 1.2 1999/09/17 13:15:29 morita Exp $
 # ----------------------------------------------------------------
 # GNUmakefile for CPPFLAGS for HepODBMS and Objectivity/DB.
 #   Youhei Morita, 9th July 1998.
@@ -11,6 +11,7 @@ endif
 
 ifdef HEP_ODBMS_DIR
   CPPFLAGS += -I$(HEP_ODBMS_DIR)/include \
+              -DHEP_ODBMS_EXPORT="" \
               -DHep_HAS_BUILDIN_BOOL_CONSTANTS
 endif
 #--------------------------------------------------------------------

config/History

@@ -1,5 +1,5 @@
-$Id: History,v 1.50 1999/07/06 17:54:47 johna Exp $
-$Name: geant4-00-01 $
+$Id: History,v 1.61 1999/10/26 08:11:47 gcosmo Exp $
+$Name: geant4-00-01-patch1 $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,47 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+26th October 1999  Gabriele Cosmo (config-V00-01-03)
+- Removed AIX-xlC as default platform for G4SYSTEM in architecture.gmk.
+  Configuration is still kept but no longer supported.
+
+26th October 1999  Youhei Morita
+- architecture.gmk: include $(HEP_ODBMS_DIR)/etc/$(OS).mk instead of
+  defininig load module separately.  Defined G4ODBMS_LIBS.
+- binmake.gmk: Use G4ODBMS_LIBS.
+
+20th October 1999  Gabriele Cosmo (config-V00-01-02)
+- architecture.gmk: removed option -DOS_NO_TYPEDEF_5 from HP-aCC
+  OSpace setup. Not anymore needed.
+
+20th October 1999  John Allison
+- architecture.gmk: removed G4USE_EXPLICIT_TYPES_IN_TEMPLATES (was needed
+                    only for HP aCC; now not needed at all).
+
+19th Octobre 1999  Youhei Morita
+- common.gmk: Surpress verbose output for G4ODBMS if CPPVERBOSE 
+              is not defined.
+
+7th October 1999  John Allison (config-V00-01-01)
+- Removed WARNINGs about granular libraries.  Now standard usage.  Simple
+  using messages printed.
+
+17th Sep 1999  Youhei Morita
+- architecture.gmk: Defined G4TMPSCHEMA_DIR, G4TMPSCHEMA_BOOT
+                    Added OBJY_LDLIB definition for Objectivity 5.1
+- binmake.gmk: LDLIBS1 += -lG4persistency
+- common.gmk: Changed ooddlx boot file option to G4OODDLX_BOOT
+- globlib.gmk: Changed G4EXAMPLE_BOOT to G4TMPSCHEMA_BOOT
+- G4ODBMS_BUILD.gmk: Defined HEP_ODBMS_EXPORT for HepODBMS 0.3.0.x
+
+27th July 1999  Gonzalo Gracia Abril
+- Changed OSPACELIBS := '-libpath:c:\dev\ospace\lib std-2.1-vc5.0-mt.lib'
+  to      OSPACELIBS := '-libpath:$(OSPACEDIR)\lib std-2.1-vc5.0-mt.lib'
+  in architecture.gmk for NT  
+
+20th July 1999  John Allison (config-V00-01-00)
+- Added EXTRA_LINK_DEPENDENCIES to binmake.gmk.
+
 6th July 1999  John Allison (config-01-00-10)
 - Changed -L/usr/X11/lib to -L/usr/X11R6/lib for Linux.
 

config/architecture.gmk

@@ -1,4 +1,4 @@
-# $Id: architecture.gmk,v 1.36 1999/07/06 17:54:49 johna Exp $
+# $Id: architecture.gmk,v 1.42 1999/10/26 08:11:48 gcosmo Exp $
 # ------------------------------------------------------------------------
 #       GEANT 4 - Architecture configuration script for GNU Make
 #
@@ -13,9 +13,7 @@
 # List of the supported architectures/compilers and related flavors for
 # the environment variable G4SYSTEM:
 #
-#          AIX-xlC     AIX 4.3, (xlC) C Set ++ for AIX (default)
-#
-#          SUN-CC      SunOS 5.6, CC 4.2 compiler
+#          SUN-CC      SunOS 5.6, CC 4.2 compiler (default)
 #
 #          HP-aCC      HP-UX 10.20, aCC A.01.09 compiler
 #
@@ -26,9 +24,9 @@
 #          Linux-g++   Linux (Red Hat 5.1), egcs 1.1
 #
 #          WIN32-VC    NT and Microsoft Visual C++ 5.0 or Microsoft Visual C++ 6.0
-#                       and using CYGWIN32 tools ( make, g++ as "makedepend", sh...)
-#                       ( Note: you will need to set your environment, see installation
-#                               guide.)
+#                      and using CYGWIN32 tools ( make, g++ as "makedepend", sh...)
+#                      Note: you will need to set your environment, see installation
+#                            guide.
 #
 #          WIN32-VC-NICE  alias for the above, although NICE is not used anymore.
 #
@@ -37,6 +35,16 @@
 #				for g++ installed locally, because not full 
 #				installation on NICE)
 #
+#    Note: If G4ODBMS is defined, it calls for HEP_ODBMS setup files in
+#          $(HEP_ODBMS_DIR)/etc/.
+#
+
+# Definition of HEP_ODBMS_LIBS, OBJY_LIBS and OSPACE_LIBS by HepODBMS
+ifdef G4ODBMS
+  # variables LHCXXTOP and PLATF are used in HepODBMS setup
+  include $(HEP_ODBMS_DIR)/etc/$(OS).mk
+  G4ODBMS_LIBS := $(HEP_ODBMS_LIBS) $(OBJY_LIBS) $(OSPACE_LIBS)
+endif
 
 MAKEFLAGS= --no-print-directory
 
@@ -47,10 +55,10 @@ ifdef G4USE_STL
   CPPFLAGS  += -DG4USE_STL
 endif
 
-# If not specified, the default platform for G4SYSTEM is IBM-AIX ...
+# If not specified, the default platform for G4SYSTEM is SUN-CC ...
 #
 ifndef G4SYSTEM
-  G4SYSTEM := AIX-xlC
+  G4SYSTEM := SUN-CC
 endif
 
 # If not specified, the default path for G4 installation G4INSTALL is
@@ -110,6 +118,17 @@ ifdef G4ODBMS
   G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4SCHEMA_DIR) ] && mkdir -p $(G4SCHEMA_DIR) )
 endif
 
+# If not specified, the default path for G4 temporary schema G4TMPSCHEMA_DIR is
+# set to $G4WORKDIR/tmp/schema (for building persistency library)...
+#
+ifndef G4TMPSCHEMA_DIR
+  G4TMPSCHEMA_DIR := $(G4WORKDIR)/tmp/schema
+  G4TMPSCHEMA_BOOT := $(G4TMPSCHEMA_DIR)/G4SCHEMA
+endif
+ifdef G4ODBMS
+  G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4TMPSCHEMA_DIR) ] && mkdir -p $(G4TMPSCHEMA_DIR) )
+endif
+
 # If not specified, the default path for G4 example federated database is
 # set to $HOME/G4EXAMPLE ...
 #
@@ -168,7 +187,7 @@ ifdef G4USE_OSPACE
   ifeq ($(G4SYSTEM),WIN32-VC)
     OSPACEDIR  := $(OBJECT_SPACE_BASE)
     OSPACEINC  := -I$(OSPACEDIR)/ospace/std -I$(OSPACEDIR)/ospace/stl -I$(OSPACEDIR)
-    OSPACELIBS := '-libpath:c:\dev\ospace\lib std-2.1-vc5.0-mt.lib'
+    OSPACELIBS := '-libpath:$(OSPACEDIR)\lib std-2.1-vc5.0-mt.lib'
     CPPFLAGS   += -DG4USE_STL -DG4USE_OLDSTL 
     CPPFLAGS   += -DOS_WIN_NT_4_0 -DOS_MULTI_THREADED -D_WIN32_WINNT $(OSPACEINC)
   endif
@@ -408,11 +427,6 @@ ifeq ($(G4SYSTEM),AIX-xlC)
   ifndef OGLLIBS
     OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
   endif
-  ifdef G4ODBMS
-    ifeq ($(OBJY_VERS),4.0.2)
-      OBJY_LDLIB := oo_shar.4.02
-    endif
-  endif
   CPPFLAGS += -DG4NOT_ISO_DELETES
   ifdef G4USE_STL
     CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM)
@@ -453,11 +467,6 @@ ifeq ($(G4SYSTEM),SUN-CC)
   ifndef OGLLIBS
     OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
   endif
-  ifdef G4ODBMS
-    ifeq ($(OBJY_VERS),4.0.2)
-      OBJY_LDLIB := oo
-    endif
-  endif
   CPPFLAGS += -DSOCKET_IRIX_SOLARIS
   LOADLIBS += -L/usr/lib -lsocket -lnsl
   CPPFLAGS += -DG4NOT_ISO_DELETES
@@ -503,18 +512,13 @@ ifeq ($(G4SYSTEM),HP-aCC)
     OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
     OGLLIBS   += -L/opt/graphics/common/lib -lXwindow -lhpgfx -lXhp11 -ldld
   endif
-  ifdef G4ODBMS
-    ifeq ($(OBJY_VERS),4.0.2)
-      OBJY_LDLIB := oo
-    endif
-  endif
   CPPFLAGS += -DG4NOT_ISO_DELETES
   ifdef G4USE_STL
-    CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM) -DG4USE_EXPLICIT_TYPES_IN_TEMPLATES
+    CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM)
   endif
   ifdef G4USE_OSPACE
     CPPFLAGS += -DOS_HPUX_10_20 -DOS_NEW_CHECK -DOS_STL_ASSERT -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
-    CPPFLAGS += -DOS_NO_TYPEDEF_5 -D__HPACC_NOEH -DG4USE_EXPLICIT_TYPES_IN_TEMPLATES 
+    CPPFLAGS += -D__HPACC_NOEH
     CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM) $(OSPACEINC) -I$(OSPACEDIR)
   endif
 endif

config/binmake.gmk

@@ -1,4 +1,4 @@
-# $Id: binmake.gmk,v 1.29 1999/07/06 15:19:42 gunter Exp $
+# $Id: binmake.gmk,v 1.33 1999/10/26 07:54:16 morita Exp $
 # ----------------------------------------------------------
 # Script defining rules and paths for making binaries.
 #                          Gabriele Cosmo, 25/06/1998.
@@ -131,11 +131,12 @@ ifdef GLOBALLIBS
   LDLIBS1 += $(VISLIBS) $(UILIBS)
 endif
 
-ifdef G4ODBMS
-  LDLIBS1 += -lG4persistency
-endif
-
 ifdef GLOBALLIBS
+
+  ifdef G4ODBMS
+    LDLIBS1 += -lG4persistency
+  endif
+
   LDLIBS2 := -lG4readout \
              -lG4run \
              -lG4event \
@@ -176,10 +177,10 @@ ifdef G4ODBMS
   LDFLAGS  += -L$(OBJY_DIR)/lib \
               -L$(HEP_ODBMS_DIR)/lib
 
-#  Note: -l$(OBJY_LDLIB) and -lHepODBMS should be placed
+#  Note: $(G4ODBMS_LIBS) should be placed
 #        _before_ -l$(CLHEP_LIB) -l$(RWLIB)
 
-  LDLIBS4 += -l$(OBJY_LDLIB) -lHepODBMS
+  LDLIBS4 += $(G4ODBMS_LIBS)
 endif
 ifdef G4USE_OSPACE
   LDLIBS4 += $(OSPACELIBS)
@@ -210,7 +211,7 @@ sources := $(wildcard $(G4TARGET).cc)
 objects := $(patsubst %.cc,$(G4TMPDIR)/exe/%.o,$(sources))
 dependencies := $(patsubst %.cc,$(G4TMPDIR)/exe/%.d,$(sources))
 
-LINK_DEPENDENCIES := $(G4TMPDIR)/exe/obj.last
+LINK_DEPENDENCIES := $(G4TMPDIR)/exe/obj.last $(EXTRA_LINK_DEPENDENCIES)
 
 .PHONY: bin clean clean_bin debug
 
@@ -220,14 +221,7 @@ bin: $(G4BINDIR)/$(G4TARGET)
 $(G4BINDIR)/$(G4TARGET): $(LINK_DEPENDENCIES)
 ifndef USER_DEFINED_LDLIBS
   ifndef GLOBALLIBS
-	@echo "WARNING: This assumes you are using granular libraries!"
-	@echo "WARNING: It looked for your global library G4global and,"
-	@echo "         not finding it, assumes you are using granular"
-	@echo "         libraries."
-	@echo "WARNING: If you did not intend this, interrupt now (CTRL-C),"
-	@echo "         and go back and make global libraries, i.e.,"
-	@echo '           cd $$G4INSTALL/source'
-	@echo "           gmake global"
+	@echo "Using granular libraries."
 	@if [ ! \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
 	  -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
 	  echo "ERROR: No liblist program or library map file."; \
@@ -239,6 +233,8 @@ ifndef USER_DEFINED_LDLIBS
 	  echo "       granular libraries:"; \
 	  echo "         gmake libmap"; \
 	  exit 1; fi
+  else
+	@echo "Using global libraries."
   endif
 endif
 	@if [ ! -d $(G4BINDIR) ] ; then mkdir $(G4BINDIR) ;fi

config/common.gmk

@@ -1,4 +1,4 @@
-# $Id: common.gmk,v 1.1 1999/01/07 15:58:32 gunter Exp $
+# $Id: common.gmk,v 1.3 1999/10/19 13:07:01 morita Exp $
 # ----------------------------------------------------------------
 # Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
 # ----------------------------------------------------------------
@@ -66,21 +66,37 @@ else
 endif
 ifdef G4ODBMS
 $(G4TMPDIR)/%.o: $(G4TMPDIR)/%.cc
+ifdef CPPVERBOSE
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(G4TMPDIR)/$(*F).o $(G4TMPDIR)/$*.cc
+else
+	@echo Compiling $*.cc ...
+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(G4TMPDIR)/$(*F).o $(G4TMPDIR)/$*.cc
+endif
 endif
 # Make the temporary files.
 .PRECIOUS: $(G4TMPDIR)/%_ddl.cc ddl/%.hh $(G4TMPDIR)/%_ref.hh
 
 ifdef G4ODBMS
 $(G4TMPDIR)/%_ddl.cc $(G4TMPDIR)/%.hh $(G4TMPDIR)/%_ref.hh: include/%.ddl
+ifndef G4OODDLX_BOOT
+	@echo G4OODDLX_BOOT is not defined.  Stop.
+	exit 1
+endif
 	@if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi
 	@if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi
+ifdef CPPVERBOSE
 	ooddlx -notitle -header_suffix .hh -ref_suffix _ref.hh -c++_suffix _ddl.cc \
 	-DRW_NO_CONST_OVERLOAD  -DRW_NO_STL -DTEMPLATEP_HIDES_FNCD \
-	$(CPPFLAGS) $< $(G4EXAMPLE_BOOT)
-	mv -f $*.hh $(G4TMPDIR)/
-	mv -f $*_ref.hh $(G4TMPDIR)/
-	mv -f $*_ddl.cc $(G4TMPDIR)/
+	$(CPPFLAGS) $< $(G4OODDLX_BOOT)
+else
+	@echo Preprocessing $< ...
+	@ooddlx -notitle -header_suffix .hh -ref_suffix _ref.hh -c++_suffix _ddl.cc \
+	-DRW_NO_CONST_OVERLOAD  -DRW_NO_STL -DTEMPLATEP_HIDES_FNCD \
+	$(CPPFLAGS) $< $(G4OODDLX_BOOT)
+endif
+	@mv -f $*.hh $(G4TMPDIR)/
+	@mv -f $*_ref.hh $(G4TMPDIR)/
+	@mv -f $*_ddl.cc $(G4TMPDIR)/
 else
 $(G4TMPDIR)/%.hh: include/%.ddl
 	@if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi

config/globlib.gmk

@@ -1,4 +1,4 @@
-# $Id: globlib.gmk,v 1.2 1999/07/06 15:19:44 gunter Exp $
+# $Id: globlib.gmk,v 1.3 1999/09/17 13:28:04 morita Exp $
 # --------------------------------------------------------------
 # Script for compound libraries.  Gabriele Cosmo, 25/6/98.
 # --------------------------------------------------------------
@@ -20,6 +20,11 @@ else
 	@for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) headers); done
 	@for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) d_files); done
 	@for dir in $(SUBDIRS); do (cd $$dir; G4ODBMS_DEPEND=1; export G4ODBMS_DEPEND; $(MAKE)); done
+	@rm -f $(G4SCHEMA_DIR)/G4SCHEMA
+	@rm -f $(G4SCHEMA_DIR)/G4SCHEMA.FDDB
+	@echo Copying schema file to $(G4SCHEMA_DIR) for FDID $(G4SCHEMA_FDID)
+	@$(HEP_ODBMS_DIR)/etc/getdb $(G4TMPSCHEMA_BOOT) \
+	  $(G4SCHEMA_DIR)/G4SCHEMA $(G4SCHEMA_FDID)
 endif
 
 ifndef G4ODBMS
@@ -77,15 +82,13 @@ headers:
 d_files:
 	@for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) d_files); done
 
-$(G4SCHEMA_DIR)/G4SCHEMA.FDDB: $(G4EXAMPLE_BOOT_DIR)/G4EXAMPLE.FDDB
-ifdef G4SCHEMA_DIR
+$(G4SCHEMA_DIR)/G4SCHEMA.FDDB: $(G4TMPSCHEMA_DIR)/G4SCHEMA.FDDB
 	@rm -f $(G4SCHEMA_DIR)/G4SCHEMA
 	@rm -f $(G4SCHEMA_DIR)/G4SCHEMA.FDDB
 	@echo Copying schema file to $(G4SCHEMA_DIR) for FDID $(G4SCHEMA_FDID)
-	@$(HEP_ODBMS_DIR)/etc/getdb $(G4EXAMPLE_BOOT) \
+	@$(HEP_ODBMS_DIR)/etc/getdb $(G4TMPSCHEMA_BOOT) \
 	  $(G4SCHEMA_DIR)/G4SCHEMA $(G4SCHEMA_FDID)
 endif
-endif
 
 objs:
 	@for dir in $(SUBDIRS); \

examples/History

@@ -1,4 +1,4 @@
-$Id: History,v 1.16 1999/07/06 18:15:39 johna Exp $
+$Id: History,v 1.18 1999/08/05 12:29:59 stesting Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,12 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+5th August 1999  John Allison (examples-V00-01-00)
+- Updated exampleN04.EMtest.out and exampleN04.out for geant4-00-01.
+
+4th August 1999  John Allison
+ - Eliminated references to G4Ray in ExN02VisManager.cc and N03.
+
 6th July 1999  John Allison (examples-01-00-13)
 - Relaxed non-optimised compiling for ExN04PhysicsList.cc for Linux.