Commit d7c29cac authored by Lynn Garren's avatar Lynn Garren

merging changes from 2.0.5.0.b01

parent b88ae92d
This diff is collapsed.
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.
"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".
The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license
document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
==============================
11.06.10 Release CLHEP-2.0.5.0.b01
==============================
2010-06-11 Lynn Garren <garren@fnal.gov>
* CLHEP now uses the LGPL license.
* Matrix: inline virtual functions are now only virtual and not inline
2010-04-29 Lynn Garren <garren@fnal.gov>
* Random now depends on Utility
2010-03-19 W. E. Brown <wb@fnal.gov>
- New package Utility, inspired by useful bits of C++0X and Boost
2009-08-25 Lynn Garren <garren@fnal.gov>
* Vector/ThreeVector: Each constructor possibility is now a separate
instance to avoid confusion if Hep3Vector is in the constructor of
another function.
==============================
09.03.10 Release CLHEP-2.0.4.6
==============================
2010-03-09 Lynn Garren <garren@fnal.gov>
* GenericFunctions/src/RKIntegrator.cc:
Add parentheses to fix a VC++ warning
2010-03-08 Mark Fischler <mf@fnal.gov> and Lynn Garren <garren@fnal.gov>
* Random/src/RandEngine.cc: Cast RAND_MAX to unsigned long to avoid
gcc 4.4 warnings.
* Random/src/RanecuEngine.cc: Fix a bug introduced in 2.0.4.5/1.9.4.5
which resulted in the inability to rollback the random state.
* Random/test/testBug58950: test rolling back the random state
==============================
08.12.09 Release CLHEP-2.0.4.5
==============================
2009-12-07 Lynn Garren <garren@fnal.gov>
* Random/test/testBug58950.cc: test for the 64bit bug
2009-12-01 Mark Fischler <mf@fnal.gov> and Lynn Garren <garren@fnal.gov>
* Random/src/RanecuEngine.cc: Negative seeds are not allowed. In the past,
negative seeds were ignored, resulting in a reproducable sequence.
Instead, we now use the absolute value of any negative seeds.
2009-12-01 Mark Fischler <mf@fnal.gov> and Lynn Garren <garren@fnal.gov>
* Random/Random/RanecuEngine.h, Random/src/RanecuEngine.cc: define
maxSeq as a static const int since it contains the size of an array
* Random/src/RanecuEngine.cc: ensure that all seeds are in the expected 32bit range.
==============================
12.11.09 Release CLHEP-2.0.4.4
==============================
2009-11-10 Lynn Garren <garren@fnal.gov>
* GenericFunctions/src/Gaussian.cc, BivariateGaussian.cc, PtRelFcn.cc,
TrivariateGaussian.cc: protect against M_PI in cmath
* Matrix/test/testBug7328.cc: allow for heap collection before testing
* Matrix/configure.in, Matrix/test/Makefile.am: finer control over testBug7328
* Exceptions/test/exctest2.cc, exctest3.cc: improve ansi compliance
2009-11-04 Lynn Garren <garren@fnal.gov>
* GenericFunctions/GenericFunctions/Bessel.icc, EllipticIntegral.icc:
replace math.h with cmath
==============================
03.11.09 Release CLHEP-2.0.4.4.b01
==============================
2009-11-03 Lynn Garren <garren@fnal.gov>
* */src/Makefile.am: use -L<path> -l<library> for dependencies
2009-08-25 Lynn Garren <garren@fnal.gov>
* configure.in, */configure.in: remove old -lcxa -lunwind icc flags
==============================
04.07.09 Release CLHEP-2.0.4.3
==============================
2009-06-30 Lynn Garren <garren@fnal.gov>
* configure.in, */configure.in, */src/Makefile.am: Make sure that
the shared library build picks up package dependencies.
==============================
18.11.08 Release CLHEP-2.0.4.2
==============================
2008-11-18 Lynn Garren <garren@fnal.gov>
* Random/test/testVectorSave.cc: Add a test for bug #44156
* clhep-config.in, */*-config.in: get rid of undefined symbols
2008-11-13 Mark Fischler <mf@fnal.gov>
* Random/src/engineIDulong.cc: Fix problem that caused check for proper
engine type to fail where an unsigned long is 64bits. (bug #44156)
* Random/src/*Engine.cc: make sure that existing stored engine states
don't break due to the change in engineIDulong.cc
==============================
04.11.08 Release CLHEP-2.0.4.1
==============================
2008-11-04 Lynn Garren <garren@fnal.gov>
* Units/PhysicalConstants.h: update Avogadro, h_Planck, electron_mass_c2,
proton_mass_c2, amu_c2, and k_Boltzmann to PDG 2008 values
* Units/SystemOfUnits.h: update e_SI to PDG 2008 value
* Units.tex: update for modern LaTeX
==============================
07.08.08 Release CLHEP-2.0.4.0
==============================
2008-08-06 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am, build-header.in: automatically
create ClhepVersion.h during the build proceedure
Version information is available as integers and the full string.
2008-07-17 Lynn Garren <garren@fnal.gov>
* various changes in Random to keep gcc 4.3 happy
2008-07-16 Lynn Garren <garren@fnal.gov>
* Matrix/src/SymMatrix.cc, Matrix.cc, DiagMatrix.cc, MatrixLinear.cc:
Iterators were set to a nonexistent memory location in many places.
Even though the iterators were not used, this operation is not allowed
and causes problems with the newer VC++ compilers.
In some cases, a more efficient rewrite was possible.
==============================
01.05.08 Release CLHEP-2.0.3.3
==============================
2008-05-01 Lynn Garren <garren@fnal.gov>
* */test/Makefile.am: use "/Fo$@" instead of "-o $@" for Visual C++
2008-04-30 Lynn Garren <garren@fnal.gov>
* configure.in: VC++ compiler flag -GX is replaced by -EHsc
icc compiler flag -mp is replaced by -fp-model precise
remove KCC from list of C++ compilers
2008-04-29 Lynn Garren <garren@fnal.gov>
* Units/PhysicalConstants.h: update h_Planck, electron_mass_c2,
proton_mass_c2, neutron_mass_c2, and amu_c2 to PDG 2006 values
* Units/SystemOfUnits.h: update e_SI to PDG 2006 value
==============================
18.10.07 Release CLHEP-2.0.3.2
==============================
2007-10-18 Mark Fischler <mf@fnal.gov>
* RandPoissonQ.cc: Change fire(mena) to call
shoot(theLocalEngine(),mean) instead of
shoot(mean), which had caused "cross-talk" between
modules that should not have affected eah other.
==============================
15.11.06 Release CLHEP-2.0.3.1
==============================
2006-11-15 Lynn Garren <garren@fnal.gov>
* configure.in: change ordering of possible C++ compilers so that
g++ remains the default compiler if icc is in the path
==============================
18.10.06 Release CLHEP-2.0.3.0
==============================
2006-10-13 Lynn Garren <garren@fnal.gov>
* configure.in: build only static libraries when using gcc with cygwin
2006-10-05 Lynn Garren <garren@fnal.gov>
* configure.in: add flags for the Intel compiler (icc)
2006-09-29 Lynn Garren <garren@fnal.gov>
* configure.in. Makefile.am: stop building HepMC, HepPDT, and StdHep
==============================
20.06.06 Release CLHEP-2.0.2.3
==============================
2006-05-17 Lynn Garren <garren@fnal.gov>
* configure.in: add support for g++4
2006-05-14 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* configure.in: add changes from Gabriele Cosmo for MacOSX
==============================
21.11.05 Release CLHEP-2.0.2.2
==============================
2005-11-21 Lynn Garren <garren@fnal.gov>
* Makefile.am: Library for Windows Visual C++ is named CLHEP.lib.
2005-11-17 Lynn Garren <garren@fnal.gov>
* configure.in: Remove check for sstream so Windows will not generate
spurious complaint.
Remove HepPDT/StringStream.h. Remove Cast/StringStream.h.
2005-11-14 Lynn Garren <garren@fnal.gov>
* Vector/RotationInterfaces.h: Instantiate private destructors so that
dictionary builders will not complain.
2005-11-04 Lynn Garren <garren@fnal.gov>
* HepPDT/addEvtGenParticles.cc: Bug fix
2005-11-03 Lynn Garren <garren@fnal.gov>
* Vector/configure.in, LorentzVector.icc
Provide a flag to enable code differences when compiling with
Visual C++.
2005-10-20 Lynn Garren <garren@fnal.gov>
* HepPDT/CommonParticleData.icc: Bug fix - low and high cutoffs
for the width were not being saved.
* Also write out cutoffs.
2005-07-27 Lynn Garren <garren@fnal.gov>
* HepPDT/convertTemporaryMap.icc: Fill DecayData properly.
Also get proper particle names when parsing PDG table.
==============================
22.06.05 Release CLHEP-2.0.2.1
==============================
Wed Jun 22 2005 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* configure.in: changed soname to install_name for darwin targets,
dylibs still don't build properly on 10.3/10.4, static libs ok.
2005-06-19 Lynn Garren <garren@fnal.gov>
* configure.in, Makefile.am:
Use lib when building Visual C++ libraries.
Disable shared library build for Solaris CC.
==============================
22.04.05 Release CLHEP-2.0.2.0
==============================
Fri Apr 22 2005 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* configure.in: changed flags for building dynamic libs on Mac OS X
still problems building them for OS X 10.3, to be checked on 10.4
prepared for tagging release 1.9.2.0
Thu Apr 7 2005 Lynn Garren <garren@fnal.gov>
* configure.in: set AR and ARFLAGS
......@@ -227,18 +500,10 @@ Wed May 19 2004 Lynn Garren <garren@fnal.gov>
11.05.04 Release CLHEP-2.0.0.2
==============================
==============================
11.05.04 Release CLHEP-1.9.0.2
==============================
Tue May 11 2004 Lynn Garren <garren@fnal.gov>
* tagged for CLHEP 1.9.0.2 (CLHEP_1_9_0_2)
* tagged for CLHEP 2.0.0.2 (CLHEP_2_0_0_2)
* library version changed to 2.1.0.0
* build Fields
* library version changed to 2.0.0.2
Tue May 11 2004 Lynn Garren <garren@fnal.gov>
......@@ -276,10 +541,6 @@ Wed Apr 28 2004 Lynn Garren <garren@fnal.gov>
* make CLHEP work with Visual C++
==============================
21.04.04 Release CLHEP-2.0.0.1
==============================
Wed Apr 21 2004 Lynn Garren <garren@fnal.gov>
* change version to CLHEP 2.0.0.1
......@@ -292,20 +553,12 @@ Thu Nov 06 2003 Lynn Garren <garren@fnal.gov>
* adding ZOOM Exceptions package for FNAL
* adding supporting RefCount and Cast packages
==============================
24.10.03 Release CLHEP-2.0.0.0
==============================
Fri Oct 24 2003 Lynn Garren <garren@fnal.gov>
* tagged for CLHEP 2.0.0.0
* backwards compatibility code disabled
==============================
23.10.03 Release CLHEP-1.9.0.0
==============================
Thu Oct 23 2003 Lynn Garren <garren@fnal.gov>
* tagged for CLHEP 1.9.0.0
......
......@@ -18,6 +18,10 @@ If you build CLHEP with gcc 2.95.2, you must configure --disable-shared.
To build for Solaris CC, configure with CXX=CC CC=cc and use gmake.
On MacOSX, you need to define MACOSX_DEPLOYMENT_TARGET appropriately.
For instance, set MACOSX_DEPLOYMENT_TARGET to "10.4" if you
have MacOS 10.4 installed on your system.
#-------------------------------------------------------------
# about linking
#-------------------------------------------------------------
......
## Process this file with automake to produce Makefile.in
## Special note: Run buildDoxy.sh here to generate the html reference documentation.
## Then copy or move the html directory to the appropriate place.
if USE_GMAKE
MAKE = gmake
endif
includedir = $(prefix)/include/CLHEP
SUBDIRS = Units Vector Evaluator GenericFunctions Geometry \
Random Matrix RandomObjects Fields HepPDT HepMC StdHep \
RefCount Cast Exceptions
SUBDIRS = Units Utility Vector Evaluator GenericFunctions Geometry \
Random Matrix RandomObjects Fields Cast RefCount Exceptions
bin_SCRIPTS = clheplib clhep-config
......@@ -21,7 +23,11 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
# these if/else blocks will be parsed by automake and translated
if BUILD_SHARED
shareddir = shared
if BUILD_VISUAL
lib_shared = CLHEP-@VERSION@.$(SHEXT)
else
lib_shared = libCLHEP-@VERSION@.$(SHEXT)
endif
SHFLAGS = @MY_SHFLAGS@
SHLINK = @MY_SHLINK@
SHNAME = @MY_SHNAME@
......@@ -29,20 +35,34 @@ endif
if BUILD_STATIC
CLHEPLIB = libCLHEP-@VERSION@.a
endif
if BUILD_VISUAL
MAKE_STATIC_CLHEP = $(COPY_P) libCLHEP-@VERSION@.a libCLHEP.a
MAKE_SHARED_CLHEP = $(COPY_P) CLHEP-@VERSION@.$(SHEXT) CLHEP.$(SHEXT)
else
MAKE_STATIC_CLHEP = $(LN_S) libCLHEP-@VERSION@.a libCLHEP.a
MAKE_SHARED_CLHEP = $(LN_S) libCLHEP-@VERSION@.$(SHEXT) libCLHEP.$(SHEXT)
endif
CLEANFILES = clheplib library-list $(CLHEPLIB) $(lib_shared)
CLEANFILES = clheplib library-list $(CLHEPLIB) $(lib_shared) ClhepVersion.h
all-local: $(CLHEPLIB) $(lib_shared)
all-local: $(CLHEPLIB) $(lib_shared) versionheader
$(CLHEPLIB):
-rm -f $@
liblist=`$(top_builddir)/getObjectList -static $(SUBDIRS)`; \
$(AR) $(ARFLAGS) $@ $$liblist; $(RANLIB) $@
if BUILD_VISUAL
$(lib_shared):
-rm -f $@
liblist=`$(top_builddir)/getObjectList -shared $(SUBDIRS)`; \
$(SHLINK) $(SHNAME)$@ $$liblist
else
$(lib_shared):
-rm -f $@
liblist=`$(top_builddir)/getObjectList -shared $(SUBDIRS)`; \
$(CXXLINK) $(SHLINK) $(SHNAME)$@ $$liblist -o $@
endif
docs:
list='$(SUBDIRS)'; for subdir in $$list; do \
......@@ -57,7 +77,10 @@ install-docs:
clheplib: build-clheplib
./build-clheplib $(SUBDIRS)
install-exec-local: install-CLHEPLIB
versionheader: build-header
./build-header
install-exec-local: install-CLHEPLIB install-versionheader
install-CLHEPLIB: $(CLHEPLIB) $(lib_shared)
@$(NORMAL_INSTALL)
......@@ -75,7 +98,7 @@ install-CLHEPLIB: $(CLHEPLIB) $(lib_shared)
$(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
if test -f $(DESTDIR)$(libdir)/libCLHEP.a; then \
(rm -f $(DESTDIR)$(libdir)/libCLHEP.a); fi; \
(cd $(DESTDIR)$(libdir) && $(LN_S) libCLHEP-@VERSION@.a libCLHEP.a ); \
(cd $(DESTDIR)$(libdir) && $(MAKE_STATIC_CLHEP) ); \
else :; fi; \
done
@$(NORMAL_INSTALL)
......@@ -90,10 +113,19 @@ install-CLHEPLIB: $(CLHEPLIB) $(lib_shared)
if test -f $$p; then \
if test -f $(DESTDIR)$(libdir)/libCLHEP.a; then \
(rm -f $(DESTDIR)$(libdir)/libCLHEP.$(SHEXT)); fi; \
(cd $(DESTDIR)$(libdir) && $(LN_S) libCLHEP-@VERSION@.$(SHEXT) libCLHEP.$(SHEXT) ); \
(cd $(DESTDIR)$(libdir) && $(MAKE_SHARED_CLHEP) ); \
else :; fi; \
done
install-versionheader: versionheader
@$(NORMAL_INSTALL)
test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
if test -f ClhepVersion.h; then \
echo " $(INSTALL_DATA) 'ClhepVersion.h' '$(DESTDIR)$(includedir)/ClhepVersion.h'"; \
$(INSTALL_DATA) "ClhepVersion.h" "$(DESTDIR)$(includedir)/ClhepVersion.h"; \
else :; fi
@$(POST_INSTALL)
clean-local:
rm -f *-dep-list
rm -f *-library-list
#-------------------------------------------------------------
# running configure
#-------------------------------------------------------------
To build for Windows Visual C++, configure with CXX=cl CC=cl:
/full/path/to/configure --prefix=<install directory> CXX=cl CC=cl
#-------------------------------------------------------------
# setup the compiler
#-------------------------------------------------------------
For the compilation under cygwin using VC++, you have to make sure that
the PATH contains the path to the installation of Visual Studio.
The safest way to do this, is to add VC to your Cygwin.bat file.
Since it is possible to have several different versions of VC on the same
machine, we recommend keeping a generic Cygwin.bat and creating special
CygwinXXX.bat file for each compiler you want to use.
Here is an example for VC9:
@echo off
@call "C:\Program Files\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"
@set PATH=%PATH%;C:\cygwin\bin
C:
chdir C:\cygwin\bin
bash --login -i
Two lines, "@call..." and "@set...", have been added to the default Cygwin.bat.
#-------------------------------------------------------------
# setting the path explicitly for VC 7.1
#-------------------------------------------------------------
For the compilation under cygwin using VC 7.1 (Version 13.10.3077)
you have to make sure that the PATH contains the path to the
......@@ -15,17 +50,6 @@ export PATH="${VSPATH}/Common7/Tools/":${PATH}
export PATH="${VSPATH}/Vc7/bin":${PATH}
export PATH="${VSPATH}/Common7/IDE":${PATH}
Before starting the build, you need to set up a
couple of environment variables as g++ (from
cygwin will otherwise be found and used):