Import Geant4 5.0.0 source tree

config/sys/AIX-xlC.gmk

@@ -1,6 +1,7 @@
 #
 # -------- AIX ----------     !!! not supported !!!
-#                                 AIX-4.3.2 xlC
+#                               AIX-4.3.2 xlC 6.0
+
 ifeq ($(G4SYSTEM),AIX-xlC)
   CXX       := xlC
   ifdef G4OPTIMISE
@@ -27,13 +28,8 @@ ifeq ($(G4SYSTEM),AIX-xlC)
   ifndef OGLLIBS
     OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
   endif
-  CPPFLAGS += -DG4NOT_ISO_DELETES
-  CPPFLAGS += -I$(G4BASE)/global/management/include/g4std/wrappers/$(G4SYSTEM)
-  ifdef G4USE_OSPACE
-    CPPFLAGS += -DOS_AIX_4 -DOS_NEW_CHECK -DOS_STL_ASSERT
-    CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
-    CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR)
-  endif
+  G4USE_STD_NAMESPACE := yes
+  CPPFLAGS += -DG4USE_STD_NAMESPACE
 
   define build-granular-shared-lib
     @echo "Shared Libraries not supported on $(G4SYSTEM)

config/sys/DEC-cxx.gmk

@@ -1,6 +1,6 @@
 #
-# -------- DEC ---------
-#
+# -------- DEC ---------    !!! not supported !!!
+#                         OSF V4.0, cxx C++ V6.1-027
 ifeq ($(G4SYSTEM),DEC-cxx)
   CXX		:= cxx
   ifdef G4OPTIMISE
@@ -28,18 +28,9 @@ ifeq ($(G4SYSTEM),DEC-cxx)
 #   OGLLIBS   := -lMesaGLU -lMesaGL
   endif
   CPPFLAGS += -I$(G4BASE)/global/management/include/g4std/wrappers/$(G4SYSTEM)
-  ifdef G4USE_OSPACE
-    CPPFLAGS += -DG4USE_OSPACE -DOS_OSF1_4 -DOS_NEW_CHECK -DOS_STL_ASSERT -DOS_NO_WSTRING
-    CPPFLAGS += -DOS_NO_ALLOCATORS -D__NO_EDG_EXCEPTION_CLASSES
-    CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR)
-    CXXFLAGS += -nostdnew
-  else
-    ifndef G4NO_STD_NAMESPACE
-      G4USE_STD_NAMESPACE := yes
-      CXXFLAGS += -std strict_ansi
-      CPPFLAGS += -DG4USE_STD_NAMESPACE
-    endif
-  endif
+  G4USE_STD_NAMESPACE := yes
+  CXXFLAGS += -std strict_ansi
+  CPPFLAGS += -DG4USE_STD_NAMESPACE
 
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \

config/sys/Darwin-g++.gmk

@@ -1,13 +1,21 @@
 #
-# ------ MacOS-X ------      !!! not supported !!!
-#                          MacOS 10.1 GNU-gcc 2.92.2
+# ------ MacOS-X ------      !!! not generally supported !!!
 #
+# MacOS 10.1 GNU-gcc 2.92.2
+# MacOS 10.2 there is g++2 and g++3, choose consistently one,
+#            like g++2 which is 2.95.2
+# use   echo -n    (there is not the echo -e option of Linux)
+# 
 # Helmut Burkhardt - CERN
 #
 ifeq ($(G4SYSTEM),Darwin-g++)
-  CXX       := g++
+# choice of GNU compilers:
+  CXX       := g++2
+# CXX       := g++3
   GNU_GCC = 1
   CXXFLAGS  := -Wall -ansi -pedantic -pipe -fno-for-scope -DGNU_GCC
+# optionally add verbose flag
+# CXXFLAGS  += -v
   ifdef G4OPTIMISE
     CXXFLAGS  += -O
     FCFLAGS   := -O
@@ -33,7 +41,7 @@ ifeq ($(G4SYSTEM),Darwin-g++)
   FC := g77
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   FCLIBS := -lg2c -lnsl
-  ECHO    := /bin/echo -e
+  ECHO    := /bin/echo -n
   SHEXT   := so
   X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
   X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
@@ -52,9 +60,6 @@ ifeq ($(G4SYSTEM),Darwin-g++)
   OIVFLAGS  += -I$(OIHOME)/include 
   G4USE_STD_NAMESPACE := yes
   CPPFLAGS += -DG4USE_STD_NAMESPACE
-  ifdef G4ODBMS
-    G4DDLX_FLAGS += -DG4std=""
-  endif
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMPDIR); \

config/sys/HP-aCC.gmk

@@ -39,11 +39,6 @@ ifeq ($(G4SYSTEM),HP-aCC)
     OGLLIBS   += -L/opt/graphics/common/lib -lXwindow -lhpgfx -lXhp11 -ldld
   endif
   CPPFLAGS += -DG4NOT_ISO_DELETES -DG4NO_ISO_VECDIST
-  ifdef G4USE_OSPACE
-    CPPFLAGS += -DOS_HPUX_10_20 -DOS_NEW_CHECK -DOS_STL_ASSERT
-    CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS -D__HPACC_NOEH
-    CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR)
-  endif
 
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \

config/sys/Linux-egcs.gmk

@@ -1,6 +1,6 @@
 #
-# ------ GNU/LINUX ------ egcs-1.1.2 (gcc-2.91.66)
-#
+# ------ GNU/LINUX ------    !!! not supported !!!
+#                    Red-Hat 6.1, egcs-1.1.2 (gcc-2.91.66)
 ifeq ($(G4SYSTEM),Linux-egcs)
   CXX       := g++
   GNU_GCC = 1
@@ -44,14 +44,6 @@ ifeq ($(G4SYSTEM),Linux-egcs)
     OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
   endif
   OIVFLAGS  += -I$(OIHOME)/include 
-  ifdef G4USE_OSPACE
-    CPPFLAGS += -DOS_LINUX_2 -DOS_NEW_CHECK -DOS_STL_ASSERT
-    CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
-    CPPFLAGS += -I$(OSPACE_BASE_DIR)/ospace/std -I$(OSPACE_BASE_DIR)
-  endif
-  ifdef G4ODBMS
-    G4DDLX_FLAGS += -D__STL_CLASS_PARTIAL_SPECIALIZATION -Dstd="" -DG4std=""
-  endif
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMPDIR); \

config/sys/Linux-g++.gmk

@@ -28,6 +28,7 @@ ifeq ($(G4SYSTEM),Linux-g++)
     CCFLAGS   += -fPIC
   endif
   G4RUNPATHOPTION := -Wl,-rpath 
+  CC := gcc
   FC := g77
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   FCLIBS := -lg2c -lnsl
@@ -47,9 +48,6 @@ ifeq ($(G4SYSTEM),Linux-g++)
   OIVFLAGS  += -I$(OIHOME)/include 
   G4USE_STD_NAMESPACE := yes
   CPPFLAGS += -DG4USE_STD_NAMESPACE
-  ifdef G4ODBMS
-    G4DDLX_FLAGS += -DG4std=""
-  endif
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMPDIR); \

config/sys/SGI-CC.gmk

@@ -1,6 +1,6 @@
 #
 # -------- SGI ---------   !!! not supported !!!
-#                           Irix-6.5.5 CC-7.2.1
+#                             Irix-6.5.5 CC-8
 ifeq ($(G4SYSTEM),SGI-CC)
   CXX       := CC
   ifdef G4OPTIMISE
@@ -26,13 +26,8 @@ ifeq ($(G4SYSTEM),SGI-CC)
   ifndef OGLLIBS
     OGLLIBS   := -L/usr/lib -lGLU -lGL
   endif
-  CPPFLAGS += -DSOCKET_IRIX_SOLARIS
-  CPPFLAGS += -I$(G4BASE)/global/management/include/g4std/wrappers/$(G4SYSTEM)
-  ifdef G4USE_OSPACE
-    CPPFLAGS += -DOS_IRIX_6_5 -DOS_NEW_CHECK -DOS_STL_ASSERT
-    CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
-    CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR)
-  endif
+  G4USE_STD_NAMESPACE := yes
+  CPPFLAGS += -DSOCKET_IRIX_SOLARIS -DG4USE_STD_NAMESPACE
 
   define build-granular-shared-lib
     @echo "Shared Libraries not supported on $(G4SYSTEM)

config/sys/SUN-CC.gmk

@@ -13,7 +13,6 @@ ifeq ($(G4SYSTEM),SUN-CC)
     endif
   endif
   CXXFLAGS += -features=no%anachronisms -mt -lpthread
-#  CXXFLAGS += -fnonstd
   ifdef G4LIB_BUILD_SHARED
     CXXFLAGS += -KPIC
     FCFLAGS  += -KPIC
@@ -44,27 +43,10 @@ ifeq ($(G4SYSTEM),SUN-CC)
     OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
   endif
   CPPFLAGS += -DSOCKET_IRIX_SOLARIS
-  LOADLIBS += -L/usr/lib -lsocket -lnsl
+  LOADLIBS += -lsocket -lnsl
   CPPFLAGS += -DG4NOT_ISO_DELETES -DG4NO_ISO_VECDIST
-  ifdef G4ODBMS
-    G4DDLX_FLAGS += -noline
-  endif
-  ifdef G4USE_OSPACE
-    CPPFLAGS += -DOS_SOLARIS_2_5 -DOS_NEW_CHECK -DOS_STL_ASSERT
-    CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
-    CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR)
-    CXXFLAGS += -compat
-  else
-    ifndef G4NO_STD_NAMESPACE
-      G4USE_STD_NAMESPACE := yes
-      CPPFLAGS += -DG4USE_STD_NAMESPACE
-      ifdef G4ODBMS
-        G4DDLX_FLAGS += -DG4std="std"
-      endif
-    else
-      CXXFLAGS += -compat
-    endif
-  endif
+  G4USE_STD_NAMESPACE := yes
+  CPPFLAGS += -DG4USE_STD_NAMESPACE
 
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \

config/sys/WIN32-VC.gmk

@@ -15,20 +15,10 @@ ifeq ($(G4SYSTEM),WIN32-VC)
   CXXFLAGS += -D_WIN32 -DOS
   CPPFLAGS += -DWIN32
   #
-  # Should set $INCLUDE environment, if not set as below
+  # Use ISO standard version.
   #
-  ifdef G4USE_OSPACE
-    CXXFLAGS += $(OSPACEINC)
-    CPPFLAGS += -DG4USE_OSPACE
-  else 
-    ifdef G4USE_STLPORT
-      CXXFLAGS += $(OSPACEINC)
-    else
-  #  If native STL is selected, use ISO standard version.
-      G4USE_STD_NAMESPACE := yes 
-      CPPFLAGS += -DG4USE_STD_NAMESPACE
-    endif
-  endif   #ospace
+  G4USE_STD_NAMESPACE := yes 
+  CPPFLAGS += -DG4USE_STD_NAMESPACE
 
   LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll
 

config/sys/WIN32-g++.gmk

@@ -1,14 +1,14 @@
 #
 # ------ GNU/WIN32 CYGNUS ------   !!! not supported !!!
-#                                  cygnus b20 with cygwin1.dll 1.1.5 patch
-#                                  Windows 95 4.00.1111
+#                                  Cygnus CygWin - gcc-2.95.3
+#                                  Windows 2000
 #
-# Stefano Agostinelli - IST Group, Genova
+# Stefano Agostinelli (agos001@pn.itnet.it) - IST Group, Genova
 #
 ifeq ($(G4SYSTEM),WIN32-g++)
   CXX       := g++
   GNU_GCC = 1
-  CXXFLAGS  := -pipe -fno-for-scope -DGNU_GCC
+  CXXFLAGS  := -Wall -ansi -pedantic -pipe -fno-for-scope -DGNU_GCC
   ifdef G4OPTIMISE
     CXXFLAGS  += -O
     FCFLAGS   := -O
@@ -40,14 +40,8 @@ ifeq ($(G4SYSTEM),WIN32-g++)
     OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
   endif
   OIVFLAGS  += -I$(OIHOME)/include 
-  ifdef G4USE_OSPACE
-    CPPFLAGS += -DOS_LINUX_2 -DOS_NEW_CHECK -DOS_STL_ASSERT
-    CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
-    CPPFLAGS += -I$(OSPACE_BASE_DIR)/ospace/std -I$(OSPACE_BASE_DIR)
-  endif
-  ifdef G4ODBMS
-    G4DDLX_FLAGS += -D__STL_CLASS_PARTIAL_SPECIALIZATION -Dstd="" -DG4std=""
-  endif
+  G4USE_STD_NAMESPACE := yes
+  CPPFLAGS += -DG4USE_STD_NAMESPACE
 
   define build-granular-shared-lib
     @echo "Shared Libraries not supported on $(G4SYSTEM)