merging changes from 1.9 and 2.0 into the HEAD

a9ee331d · Lynn Garren · 8ab133f0 · a9ee331d · a9ee331d · a9ee331d
Commit a9ee331d authored Apr 29, 2004 by Lynn Garren
--- a/Cast/INSTALL
+++ b/Cast/INSTALL
@@ -19,6 +19,34 @@ make install
   (Copy libraries, headers, executables, etc. to relevant 
    subdirectories under <install_dir>.)

+#-------------------------------------------------------------
+#  configure options
+#-------------------------------------------------------------
+
+A variety of options can be given to configure.  Below is a list 
+of the options that you are likely to find most useful.
+
+  --help                  provides a partial list of options
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [default is /usr/local]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [default is the same as PREFIX]
+  --disable-shared        build only static libraries
+  --disable-static        build only shared libraries   
+  --enable-exceptions     use the CLHEP/Exceptions package
+  --disable-exceptions    DO NOT use the CLHEP/Exceptions package
+                          [--disable-exceptions is the default] 
+ 
+#-------------------------------------------------------------
+# building documents
+#-------------------------------------------------------------
+
+Documents are neither built nor installed automatically.  
+Use the following commands to build and install documents:
+
+   make docs
+   make install-docs
+
 #-------------------------------------------------------------
 # building from cvs
 #-------------------------------------------------------------
@@ -29,7 +57,7 @@ See building autotools below.
 cvs co CLHEP/package OR cvs co package

 cd [CLHEP/]package
-bootstrap
+./bootstrap

 Now continue with directions as if you unpacked a source code tarball.


--- a/Cast/configure.in
+++ b/Cast/configure.in
@@ -9,7 +9,7 @@
 # ----------------------------------------------------------------------

 AC_PREREQ(2.57)
-AC_INIT(CLHEP Cast, 2.0.0.0, CLHEP@cern.ch, Cast)
+AC_INIT(CLHEP Cast, 2.0.0.1, CLHEP@cern.ch, Cast)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/itos.cc])
@@ -176,7 +176,6 @@ powerpc-apple-darwin*)
  esac;; 
 esac

-
 # ----------------------------------------------------------------------
 # Set system-dependent options:
 # ----------------------------------------------------------------------

--- a/ChangeLog
+++ b/ChangeLog
+Wed Apr 28          2004 Lynn Garren <garren@fnal.gov>
+
+	*  make CLHEP work with Visual C++
+
+Wed Apr 21          2004 Lynn Garren <garren@fnal.gov>
+
+	* change version to CLHEP 2.0.0.1
+	
+	* fix Herwig and Isajet translation routines in HepPDT
+	  add translation checking tests
+
 Thu Nov 06          2003 Lynn Garren <garren@fnal.gov>

 	*  adding ZOOM Exceptions package for FNAL

--- a/Evaluator/INSTALL
+++ b/Evaluator/INSTALL
@@ -19,6 +19,34 @@ make install
   (Copy libraries, headers, executables, etc. to relevant 
    subdirectories under <install_dir>.)

+#-------------------------------------------------------------
+#  configure options
+#-------------------------------------------------------------
+
+A variety of options can be given to configure.  Below is a list 
+of the options that you are likely to find most useful.
+
+  --help                  provides a partial list of options
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [default is /usr/local]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [default is the same as PREFIX]
+  --disable-shared        build only static libraries
+  --disable-static        build only shared libraries   
+  --enable-exceptions     use the CLHEP/Exceptions package
+  --disable-exceptions    DO NOT use the CLHEP/Exceptions package
+                          [--disable-exceptions is the default] 
+ 
+#-------------------------------------------------------------
+# building documents
+#-------------------------------------------------------------
+
+Documents are neither built nor installed automatically.  
+Use the following commands to build and install documents:
+
+   make docs
+   make install-docs
+
 #-------------------------------------------------------------
 # building from cvs
 #-------------------------------------------------------------
@@ -29,7 +57,7 @@ See building autotools below.
 cvs co CLHEP/package OR cvs co package

 cd [CLHEP/]package
-bootstrap
+./bootstrap

 Now continue with directions as if you unpacked a source code tarball.


--- a/Evaluator/configure.in
+++ b/Evaluator/configure.in
@@ -9,7 +9,7 @@
 # ----------------------------------------------------------------------

 AC_PREREQ(2.57)
-AC_INIT(CLHEP Evaluator, 2.0.0.0, CLHEP@cern.ch, Evaluator)
+AC_INIT(CLHEP Evaluator, 2.0.0.1, CLHEP@cern.ch, Evaluator)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/Evaluator.cc])

--- a/Exceptions/Exceptions/link_Exceptions.mk
+++ b/Exceptions/Exceptions/link_Exceptions.mk
-# $Id: link_Exceptions.mk,v 1.2 2004/04/27 17:08:42 garren Exp $
+# $Id: link_Exceptions.mk,v 1.3 2004/04/29 02:47:30 garren Exp $
 #
 # Makefile fragment for PackageList linking system
 #

--- a/Exceptions/INSTALL
+++ b/Exceptions/INSTALL
@@ -19,6 +19,34 @@ make install
   (Copy libraries, headers, executables, etc. to relevant 
    subdirectories under <install_dir>.)

+#-------------------------------------------------------------
+#  configure options
+#-------------------------------------------------------------
+
+A variety of options can be given to configure.  Below is a list 
+of the options that you are likely to find most useful.
+
+  --help                  provides a partial list of options
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [default is /usr/local]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [default is the same as PREFIX]
+  --disable-shared        build only static libraries
+  --disable-static        build only shared libraries   
+  --enable-exceptions     use the CLHEP/Exceptions package
+  --disable-exceptions    DO NOT use the CLHEP/Exceptions package
+                          [--disable-exceptions is the default] 
+ 
+#-------------------------------------------------------------
+# building documents
+#-------------------------------------------------------------
+
+Documents are neither built nor installed automatically.  
+Use the following commands to build and install documents:
+
+   make docs
+   make install-docs
+
 #-------------------------------------------------------------
 # building from cvs
 #-------------------------------------------------------------
@@ -29,7 +57,7 @@ See building autotools below.
 cvs co CLHEP/package OR cvs co package

 cd [CLHEP/]package
-bootstrap
+./bootstrap

 Now continue with directions as if you unpacked a source code tarball.


--- a/Exceptions/configure.in
+++ b/Exceptions/configure.in
@@ -9,7 +9,7 @@
 # ----------------------------------------------------------------------

 AC_PREREQ(2.57)
-AC_INIT(CLHEP Exceptions, 2.0.0.0, CLHEP@cern.ch, Exceptions)
+AC_INIT(CLHEP Exceptions, 2.0.0.1, CLHEP@cern.ch, Exceptions)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/ZMerrno.cc])

--- a/Exceptions/doc/.cvsignore
+++ b/Exceptions/doc/.cvsignore
+Makefile.in
--- a/Exceptions/test/Makefile.am
+++ b/Exceptions/test/Makefile.am
 # Applicable to each test program:
 INCLUDES = -I../
 # libraries to link, and whence
-LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.la    \
-	${top_builddir}/../Cast/src/libCLHEP-Cast-@VERSION@.la \
+LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.la     \
+	${top_builddir}/../Cast/src/libCLHEP-Cast-@VERSION@.la	\
 	${top_builddir}/../RefCount/src/libCLHEP-RefCount-@VERSION@.la

 # Identify executables needed during testing:

--- a/GenericFunctions/GenericFunctions/PuncturedSmearedExp.hh
+++ b/GenericFunctions/GenericFunctions/PuncturedSmearedExp.hh
 // -*- C++ -*-
-// $Id: PuncturedSmearedExp.hh,v 1.1 2004/02/05 15:35:25 boudreau Exp $
+// $Id: PuncturedSmearedExp.hh,v 1.2 2004/04/29 02:47:30 garren Exp $
 // ------------------------------------------------------------------------------//
 // This function-object makes an exponential with acceptance holes ("punctures") //
 // smeared by a resolution function.                                             //

--- a/GenericFunctions/INSTALL
+++ b/GenericFunctions/INSTALL
@@ -19,6 +19,34 @@ make install
   (Copy libraries, headers, executables, etc. to relevant 
    subdirectories under <install_dir>.)

+#-------------------------------------------------------------
+#  configure options
+#-------------------------------------------------------------
+
+A variety of options can be given to configure.  Below is a list 
+of the options that you are likely to find most useful.
+
+  --help                  provides a partial list of options
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [default is /usr/local]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [default is the same as PREFIX]
+  --disable-shared        build only static libraries
+  --disable-static        build only shared libraries   
+  --enable-exceptions     use the CLHEP/Exceptions package
+  --disable-exceptions    DO NOT use the CLHEP/Exceptions package
+                          [--disable-exceptions is the default] 
+ 
+#-------------------------------------------------------------
+# building documents
+#-------------------------------------------------------------
+
+Documents are neither built nor installed automatically.  
+Use the following commands to build and install documents:
+
+   make docs
+   make install-docs
+
 #-------------------------------------------------------------
 # building from cvs
 #-------------------------------------------------------------
@@ -29,7 +57,7 @@ See building autotools below.
 cvs co CLHEP/package OR cvs co package

 cd [CLHEP/]package
-bootstrap
+./bootstrap

 Now continue with directions as if you unpacked a source code tarball.


--- a/GenericFunctions/configure.in
+++ b/GenericFunctions/configure.in
@@ -9,7 +9,7 @@
 # ----------------------------------------------------------------------

 AC_PREREQ(2.57)
-AC_INIT(CLHEP GenericFunctions, 2.0.0.0, CLHEP@cern.ch, GenericFunctions)
+AC_INIT(CLHEP GenericFunctions, 2.0.0.1, CLHEP@cern.ch, GenericFunctions)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/Abs.cc])
@@ -190,12 +190,12 @@ esac
 # Check for needed header files:
 # ----------------------------------------------------------------------

+AC_CHECK_HEADERS([sstream])

 # ----------------------------------------------------------------------
 # Check for needed typedefs, structures, and compiler characteristics:
 # ----------------------------------------------------------------------

-
 # ----------------------------------------------------------------------
 # Check for needed library functions:
 # ----------------------------------------------------------------------

--- a/GenericFunctions/src/PuncturedSmearedExp.cc
+++ b/GenericFunctions/src/PuncturedSmearedExp.cc
 // -*- C++ -*-
-// $Id: PuncturedSmearedExp.cc,v 1.2 2004/04/20 15:03:52 pfeiffer Exp $
+// $Id: PuncturedSmearedExp.cc,v 1.3 2004/04/29 02:47:30 garren Exp $
 #include "CLHEP/GenericFunctions/PuncturedSmearedExp.hh"
 #include <sstream>
 #include <cmath>

--- a/GenericFunctions/src/Sqrt.cc
+++ b/GenericFunctions/src/Sqrt.cc
 // -*- C++ -*-
-// $Id: Sqrt.cc,v 1.5 2004/04/20 15:03:52 pfeiffer Exp $
+// $Id: Sqrt.cc,v 1.6 2004/04/29 02:47:30 garren Exp $
 #include "CLHEP/GenericFunctions/Sqrt.hh"
 #include <assert.h>
-#include <cmath>
+#include <cmath>	// for sqrt
 namespace Genfun {
 FUNCTION_OBJECT_IMP(Sqrt)


--- a/Geometry/INSTALL
+++ b/Geometry/INSTALL
@@ -19,6 +19,34 @@ make install
   (Copy libraries, headers, executables, etc. to relevant 
    subdirectories under <install_dir>.)

+#-------------------------------------------------------------
+#  configure options
+#-------------------------------------------------------------
+
+A variety of options can be given to configure.  Below is a list 
+of the options that you are likely to find most useful.
+
+  --help                  provides a partial list of options
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [default is /usr/local]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [default is the same as PREFIX]
+  --disable-shared        build only static libraries
+  --disable-static        build only shared libraries   
+  --enable-exceptions     use the CLHEP/Exceptions package
+  --disable-exceptions    DO NOT use the CLHEP/Exceptions package
+                          [--disable-exceptions is the default] 
+ 
+#-------------------------------------------------------------
+# building documents
+#-------------------------------------------------------------
+
+Documents are neither built nor installed automatically.  
+Use the following commands to build and install documents:
+
+   make docs
+   make install-docs
+
 #-------------------------------------------------------------
 # building from cvs
 #-------------------------------------------------------------
@@ -29,7 +57,7 @@ See building autotools below.
 cvs co CLHEP/package OR cvs co package

 cd [CLHEP/]package
-bootstrap
+./bootstrap

 Now continue with directions as if you unpacked a source code tarball.


--- a/Geometry/configure.in
+++ b/Geometry/configure.in
@@ -9,7 +9,7 @@
 # ----------------------------------------------------------------------

 AC_PREREQ(2.57)
-AC_INIT(CLHEP Geometry, 2.0.0.0, CLHEP@cern.ch, Geometry)
+AC_INIT(CLHEP Geometry, 2.0.0.1, CLHEP@cern.ch, Geometry)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/Plane3D.cc])

--- a/HepMC/INSTALL
+++ b/HepMC/INSTALL
@@ -19,6 +19,34 @@ make install
   (Copy libraries, headers, executables, etc. to relevant 
    subdirectories under <install_dir>.)

+#-------------------------------------------------------------
+#  configure options
+#-------------------------------------------------------------
+
+A variety of options can be given to configure.  Below is a list 
+of the options that you are likely to find most useful.
+
+  --help                  provides a partial list of options
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [default is /usr/local]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [default is the same as PREFIX]
+  --disable-shared        build only static libraries
+  --disable-static        build only shared libraries   
+  --enable-exceptions     use the CLHEP/Exceptions package
+  --disable-exceptions    DO NOT use the CLHEP/Exceptions package
+                          [--disable-exceptions is the default] 
+ 
+#-------------------------------------------------------------
+# building documents
+#-------------------------------------------------------------
+
+Documents are neither built nor installed automatically.  
+Use the following commands to build and install documents:
+
+   make docs
+   make install-docs
+
 #-------------------------------------------------------------
 # building from cvs
 #-------------------------------------------------------------
@@ -29,7 +57,7 @@ See building autotools below.
 cvs co CLHEP/package OR cvs co package

 cd [CLHEP/]package
-bootstrap
+./bootstrap

 Now continue with directions as if you unpacked a source code tarball.


--- a/HepMC/configure.in
+++ b/HepMC/configure.in
@@ -9,7 +9,7 @@
 # ----------------------------------------------------------------------

 AC_PREREQ(2.57)
-AC_INIT(CLHEP HepMC, 2.0.0.0, CLHEP@cern.ch, HepMC)
+AC_INIT(CLHEP HepMC, 2.0.0.1, CLHEP@cern.ch, HepMC)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/DummyDecayModel.cc])

--- a/HepMC/examples/GNUmakefile
+++ b/HepMC/examples/GNUmakefile
@@ -32,7 +32,7 @@ endif
  HepMCinc  = $(INCDIR)/CLHEP/HepMC
  PythiaLIB = $(LULIB)/pydata.o $(LULIB)/liblund.a $(LULIB)/libpydum.a
  HerwigLIB = $(HERWIG_DIR)/lib/timel.o $(HERWIG_DIR)/lib/libherwig.a $(HERWIG_DIR)/lib/libherdum.a
-  LIBNAME = $(CLHEP_DIR)/lib/libCLHEP-2.0.0.0.a
+  LIBNAME = $(CLHEP_DIR)/lib/libCLHEP-2.0.0.1.a


 ################################################################################