Import Geant4 8.2.0 source tree

config/sys/Darwin-g++.gmk

@@ -31,7 +31,6 @@ ifeq ($(G4SYSTEM),Darwin-g++)
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   LDFLAGS += -bind_at_load
   FCLIBS := -lg2c -lnsl
-  ECHO    := /bin/echo -n
   SHEXT   := dylib
   ifndef X11FLAGS
     X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11

config/sys/Linux-icc.gmk

@@ -1,13 +1,13 @@
 #
-# ------ GNU/LINUX ------     !!! not supported !!!
-#                                 Intel icc 8.0
+# ------ GNU/LINUX ------         Intel icc 9.1
+#
 ifeq ($(G4SYSTEM),Linux-icc)
   CXX       := icc
   CXXFLAGS  := -ansi -mp -no-gcc -w1
   ifdef G4OPTIMISE
-    CXXFLAGS  += -O
-    FCFLAGS   := -O
-    CCFLAGS   := -O
+    CXXFLAGS  += -O2
+    FCFLAGS   := -O2
+    CCFLAGS   := -O2
   else
     ifdef G4DEBUG
       CXXFLAGS  += -g
@@ -25,12 +25,12 @@ ifeq ($(G4SYSTEM),Linux-icc)
     FCFLAGS   += -fPIC
     CCFLAGS   += -fPIC
   endif
-  G4RUNPATHOPTION := -Xlinker -rpath 
+  G4RUNPATHOPTION := -Wl,-rpath -Wl,
   CC := gcc
   FC := g77
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   FCLIBS := -lg2c -lnsl
-  AR := xiar r
+  AR := ar r
   ECHO    := /bin/echo -e
   SHEXT   := so
   ifndef X11FLAGS
@@ -52,6 +52,7 @@ ifeq ($(G4SYSTEM),Linux-icc)
     XAWLIBS    := -lXaw
   endif
   DLDLIBS   := -ldl
+  LOADLIBS  += -lcxa -lunwind
   ifndef OGLFLAGS
     OGLFLAGS  := -I$(OGLHOME)/include 
   endif

config/sys/WIN32-VC.gmk

@@ -1,5 +1,5 @@
 #
-# ------ WIN32/VC ------    Visual-C++ 7 .NET
+# ------ WIN32/VC ------    Visual-C++ 7 .NET and higher
 #
 ifeq ($(G4SYSTEM),WIN32-VC)
   CXX       := CL
@@ -17,7 +17,12 @@ ifeq ($(G4SYSTEM),WIN32-VC)
 
   SHEXT := dll
   AR := LIB
-  ECHO := echo -e
+  ECHO := /usr/bin/echo -e
+  GREP := /usr/bin/grep
+  SED  := /usr/bin/sed
+  CAT  := /usr/bin/cat
+  CUT  := /usr/bin/cut
+
   FC := g77
 #  FCLIBS := -lf2c
   ifndef OGLFLAGS
@@ -57,20 +62,20 @@ ifeq ($(G4SYSTEM),WIN32-VC)
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`;\
     cd $(G4TMP)/$(G4SYSTEM);\
-    echo "Building $(name).dumpbin file ...";\
+    $(ECHO) "Building $(name).dumpbin file ...";\
     $(RM) $(name).dumpbin;\
     dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
-    echo "Building $(name).def file ...";\
+    $(ECHO) "Building $(name).def file ...";\
     $(RM) $(name).def;\
     $(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
     $(RM) $(name).dumpbin;\
-    echo "Building lib$(name).exp and lib$(name).lib file ...";\
+    $(ECHO) "Building lib$(name).exp and lib$(name).lib file ...";\
     $(RM) $(G4LIBDIR)/lib$(name).exp;\
     $(RM) $(G4LIBDIR)/lib$(name).lib;\
     lib.exe /nologo /machine:ix86 /def:$(name).def \
             /out:$(G4LIBDIR)/lib$(name).lib;\
     $(RM) $(G4LIBDIR)/$(name).dll;\
-    echo "Building $(name).dll file ...";\
+    $(ECHO) "Building $(name).dll file ...";\
     link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
              $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
              /libpath:$(G4LIBDIR) $(GLOBLIBS) \
@@ -80,20 +85,20 @@ ifeq ($(G4SYSTEM),WIN32-VC)
   define build-global-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`;\
     cd $(G4TMP)/$(G4SYSTEM);\
-    echo "Building $(name).dumpbin file ...";\
+    $(ECHO) "Building $(name).dumpbin file ...";\
     $(RM) $(name).dumpbin;\
     dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
-    echo "Building $(name).def file ...";\
+    $(ECHO) "Building $(name).def file ...";\
     $(RM) $(name).def;\
     $(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
     $(RM) $(name).dumpbin;\
-    echo "Building lib$(name).exp and lib$(name).lib ...";\
+    $(ECHO) "Building lib$(name).exp and lib$(name).lib ...";\
     $(RM) $(G4LIBDIR)/lib$(name).exp;\
     $(RM) $(G4LIBDIR)/lib$(name).lib;\
     lib.exe /nologo /machine:ix86 /def:$(name).def \
             /out:$(G4LIBDIR)/lib$(name).lib;\
     $(RM) $(G4LIBDIR)/$(name).dll;\
-    echo "Building $(name).dll ...";\
+    $(ECHO) "Building $(name).dll ...";\
     link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
              $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
              /libpath:$(G4LIBDIR) $(GLOBLIBS) \

config/sys/WIN32-g++.gmk

@@ -1,7 +1,7 @@
 #
-# ------ GNU/WIN32 CYGNUS ------   !!! not supported !!!
+# ------ GNU/WIN32 CYGWIN ------   !!! not supported !!!
 #                             Cygnus CygWin - gcc-3.2 and higher
-#                                     Windows 2000/XP
+#                                       Windows XP
 #
 # Stefano Agostinelli (agos001@pn.itnet.it) - IST Group, Genova
 #
@@ -25,12 +25,18 @@ ifeq ($(G4SYSTEM),WIN32-g++)
     FCFLAGS   += -fPIC
     CCFLAGS   += -fPIC
   endif
+
   G4RUNPATHOPTION := -Wl,-rpath 
+  SHEXT   := so
+  ECHO    := echo -e
+  GREP := /usr/bin/grep
+  SED  := /usr/bin/sed
+  CAT  := /usr/bin/cat
+  CUT  := /usr/bin/cut
+
   FC := g77
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   FCLIBS := -lg2c -lnsl
-  ECHO    := echo -e
-  SHEXT   := so
   ifndef X11FLAGS
     X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
   endif