Page MenuHomeHEPForge
Files F8309133

No OneTemporary
Actions

View Options

Index: contrib/trunk/ChangeLog
===================================================================
--- contrib/trunk/ChangeLog (revision 1488)
+++ contrib/trunk/ChangeLog (revision 1489)
@@ -1,1325 +1,1330 @@
+2024-12-13 Matteo, Gregory, Gavin
+
+ * configure:
+ added check that contribs don't have both VERSION and FJCONTRIB.cfg files.
+
2024-12-13 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* scripts/internal/generate-html-contents.pl
added javascript function to sort table in contrib name
alphabetical order and release date
2024-12-12 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* scripts/internal/generate-html-contents.pl
updated to also output information about dependencies and minimal
FastJet version
2024-12-12 Thu <gavin.salam@physics.ox.ac.uk> + Matteo + Gregory
* NEWS:
* contribs.svn:
updated IFNPlugin to 1.0.3 and added CMPPlugin 1.0.0
-
+
* scripts/internal/Template/FJCONTRIB.cfg:
added commented "minimal_fastjet_version:..." line
* DEVEL-GUIDELINES:
replaced a ref to VERSION -> FJCONTRIB.cfg
* configure:
fixed location of output of `fastjet-config --version` info
2024-12-12 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* configure:
* scripts/internal/common.sh:
* DEVEL-GUIDELINES:
added handling of minimal_fastjet_version in contribs
configuration files
2024-12-11 Gavin Salam <gavin.salam@physics.ox.ac.uk>
* VERSION:
upped this to 1.100-devel, to reflect significance of new
dependencies functionality.
2024-12-11 Gregory Soyez <soyez@fastjet.fr> + Gavin+Matteo
* contribs.svn:
switched LundPlane over to version 2.1.2
2024-12-11 Gavin Salam <gavin.salam@physics.ox.ac.uk>
* NEWS:
* contribs.svn:
updated RecursiveTools to 2.0.4 + mentioned this in NEWS
2024-12-10 Tue <gavin.salam@physics.ox.ac.uk>
* NEWS:
starting work on NEWS for 1.057
* contribs.svn:
updated RecursiveTools to 2.0.4-rc1 and added IFNPlugin 1.0.0-alpha2, to facilitate
experimentation with dependencies by other groups.
2024-12-09 Gavin Salam + Matteo Cacciari + Gregory Soyez
* VERSION:
upped to 1.057-devel
* Makefile.in:
* configure:
modification to scheme for support of dependencies between contribs.
It now requires contribs to be in a new form where there is a
ContribName/FJCONTRIB.cfg file that contains the version number and
any dependencies.
* scripts/internal/common.sh:
* scripts/release-contrib.sh:
various changes to support the new scheme with
ContribName/FJCONTRIB.cfg files and the option to have either that
or the old ContribName/VERSION file.
* scripts/internal/Template:
* scripts/new-contrib-from-template.sh:
* DEVEL-GUIDELINES:
adapted things to be in the new scheme with an FJCONTRIB.cfg file
that contains both the version number and the dependencies and has
the include files in a include/fastjet/contrib/ subdirectory.
The new include placement help reduce the risk of conflicts with
system include files and also has the benefit that example programs
don't need to have their #include statements modified in order to
still work with a full installation of fjcontrib.
Also added a note in the DEVEL-GUIDELINES that fjcontrib maintainers
may modify and release new versions of contribs if needed, e.g.
to fix bugs, after attempting to contact authors.
2024-11-25 Mon <gavin.salam@physics.ox.ac.uk>
* Makefile.in:
* configure:
started work on support for dependencies between contribs;
if a file ContribName/DEPENDS is present, then the contribs
listed will be dependencies.
Technically, configure now generates targets ContribName.all,
ContribName.check and ContribName.ex, ContribName.install with the
latter three depending on the first one. The dependency is then made
explicit for ContribName.all.
2024-10-20 Gavin Salam <salam@hydra>
* configure:
updated fragileshared dynlibopt on Linux, as per request at
https://github.com/fjcontrib/fjcontrib/issues/4
2024-10-07 Gavin Salam
* contribs.svn:
* NEWS:
* VERSION:
updated RecursiveTools to 2.0.3 and prepared for 1.056 release
2024-06-26 Wed Gavin Salam
* contribs.svn:
* NEWS:
* VERSION:
updated SignalFreeBackgroundEstimator to 1.0.1 and prepared for 1.055 release
2024-03-19 Gavin Salam <gavin.salam@physics.ox.ac.uk>
* data/pythia8_Zq_vshort.dat: *** ADDED ***
added this file, as needed for validation of the new
JetFlav contrib.
* utils/check.sh:
updated this to version needed for JetFlav/IFN checks,
which allows for extra arguments to be passed.
2024-02-29 Gregory Soyez <soyez@fastjet.fr>
* contribs.svn:
* NEWS:
updated Nsubjettiness to 2.3.2 to fix unsigned int warning
in example_advanced_usage
2024-02-28 Wed <gavin.salam@physics.ox.ac.uk>
* contribs.svn:
* NEWS:
updated Nsubjettiness to 2.3.1 to fix unsigned int warning
in AxesDefinition.hh
2024-02-26 Mon <gavin.salam@physics.ox.ac.uk>
* VERSION:
* NEWS:
preparing for release of 1.054
2024-02-26 Mon <gavin.salam@physics.ox.ac.uk>
* Makefile.in:
* utils/check.sh:
fixed an issue where a failure in one of the checks
did not result in a non-zero exit code for make check.
Also aligned output in summary.
* contribs.svn:
updated RecursiveTools to 2.0.2, EnergyCorrelator to 1.3.2,
Nsubjettiness to 2.3.0
* scripts/internal/common.sh:
* scripts/internal/release-fjcontrib.sh:
this now searches explicitly for gnu tar rather than just tar
(which could be a BSD tar on macs, and which gives tarballs
that are not very Linux friendly, reported by Ezra Lesser).
2024-02-21 Wed <gavin.salam@physics.ox.ac.uk>
* contribs.svn:
* configure:
added SignalFreeBackgroundEstimator v1.0.0 and updated configure script
so that it allows for longer contrib names in its summary output.
* NEWS:
started preparation of release notes for 1.054
2024-02-01 Gavin Salam <gavin.salam@physics.ox.ac.uk>
* contribs.svn:
updated LundPlane to 2.1.0
2024-01-06 Gavin Salam <gavin.salam@physics.ox.ac.uk>
* configure:
added sorting of contribs, to ensure build order is reproducible,
as requested in https://github.com/alisw/fastjet/pull/6
and communicated to us by Stefan Bruns.
* Makefile.in:
sorted output from tests to ensure reproducibility
2023-09-29 Fri <gavin.salam@physics.ox.ac.uk>
* VERSION:
* NEWS:
prepared release of 1.053
* contribs.svn:
updated LundPlane to 2.0.4
2023-05-18 Gavin Salam <gavin.salam@physics.ox.ac.uk>
* VERSION:
* NEWS:
prepared for release of 1.052
* contribs.svn:
updated ConstituentSubtractor to 1.4.6
2023-03-01 Gavin Salam <gavin.salam@physics.ox.ac.uk>
* NEWS:
* VERSION
Preparing for release of fjcontrib-1.051
* contribs.svn:
added KTClusCXX 1.0.1
updated LundPlane to 2.0.3
2022-08-20 S<gavin.salam@physics.ox.ac.uk>
* NEWS:
* VERSION
Preparing for release of fjcontrib-1.050
* contribs.svn:
updated LundPlane to 2.0.2
2022-06-15 Gavin Salam <gavin.salam@physics.ox.ac.uk>
* NEWS:
* VERSION
Preparing for release of fjcontrib-1.049
* contribs.svn:
updated Nsubjettiness to 2.26
2021-12-08 Gregory Soyez <soyez@fastjet.fr>
* NEWS:
* VERSION:
Preparing for the release of fjcontrib-1.048
* scripts/internal/release-fjcontrib.sh:
included the script directory in the tarball and the
DEVEL-GUIDELINES.
This fixes issue that scripts/c1checks was absent
from the tarball
2021-12-06 Gavin Salam <gavin.salam@physics.ox.ac.uk>
* VERSION:
* NEWS:
* contribs.svn:
updated LundPlane to 2.0.1 and prepared for release of
fjcontrib-1.047
* configure:
* scripts/c11check/Makefile:
* scripts/c11check/c11check.cc:
added facilities for checking if we have c++11
support and adding it in if need be
2021-08-21 Sat <gavin.salam@physics.ox.ac.uk>
* NEWS:
* VERSION:
* contribs.svn:
updated RecursiveTools to 2.0.1 and prepared for release
of fjcontrib-1.046
2020-08-04 Tue <gavin.salam@physics.ox.ac.uk>
* NEWS:
* VERSION:
Preparing for release of 1.045
* contribs.svn:
added Centauro (DIS jet algorithm plugin) 1.0.0
2020-03-07 Gavin Salam <gavin.salam@cern.ch>
* VERSION:
* NEWS:
Preparing for release of 1.044
* contribs.svn:
updated RecursiveTools to 2.0.0
2020-02-23 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
preparing for release of 1.043
* README:
added note about need for c++11 here if FJ was compiled with
c++11.
* contribs.svn:
updated ConstituentSubtractor to 1.4.5 and LundPlane to 1.0.3 to
fix c++98 compatibility issues
2019-07-18 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
* contribs.svn:
ConstituentSubtractor updated to 1.4.4,
prepared release of fjcontrib-1.042
2018-12-22 Gavin Salam <gavin.salam@cern.ch>
* VERSION:
* NEWS:
* contribs.svn:
updated ValenciaPlugin to 2.0.2 with bug fixes for negative beta.
Prepared for release of fjcontrib-1.041
2018-12-04 Gavin Salam <gavin.salam@cern.ch>
* DEVEL-GUIDELINES:
* scripts/internal/common.sh (svn_read):
* README:
updated links for read-only access.
2018-12-04 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
prepared for release of 1.040 with ValenciaPlugin 2.0.1
* contribs.svn:
updated ValenciaPlugin to 2.0.1
2018-10-31 Gavin Salam <gavin.salam@cern.ch>
* scripts/internal/generate-html-contents.pl:
* scripts/internal/common.sh:
fixed issue with incorrect links generate-html-contents.pl and
made it import svn_read address from environment variables set in
common.sh
2018-10-31 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
preparing for 1.039 release with LundPlane 1.0.2
2018-10-30 Gavin Salam <gavin.salam@cern.ch>
* contribs.svn:
updated LundPlane to 1.0.2
2018-10-25 Gavin Salam <gavin.salam@cern.ch>
* DEVEL-GUIDELINES
* README
* scripts/internal/common.sh
* scripts/internal/check-updates.sh
* scripts/internal/generate-html-contents.pl
* scripts/internal/release-fjcontrib.sh
work in progress to move things over to the new hepforge system.
2018-08-30 Gavin Salam <gavin.salam@cern.ch>
* VERSION:
* NEWS:
prepared release of 1.038 with LundPlane 1.0.1
* contribs.svn:
added LundPlane version 1.0.1
2018-08-23 Gavin Salam <gavin.salam@cern.ch> + Matteo
* scripts/internal/get-author-emails.py:
added script to extract all author emails
2018-08-23 Gavin Salam <gavin.salam@cern.ch>
* scripts/update-contribs.sh:
documented the --force option in the help message
2018-07-20 Gavin Salam <gavin.salam@cern.ch>
* VERSION:
* NEWS:
* contribs.svn:
prepared release of 1.037 with ConstituentSubtractor updated to 1.3.1
2018-06-06 Gavin Salam <gavin.salam@cern.ch>
* VERSION:
* NEWS:
prepared release of 1.036.
* contribs.svn:
updated Nsubjettiness to 2.2.5, with fix for bug involving
undefined pointer for in AxesDefinition
2018-05-29 Gavin Salam <gavin.salam@cern.ch>
* VERSION:
* NEWS:
prepared for the release of 1.035
* contribs.svn:
updated RecursiveTools to 2.0.0-beta2 with bug fix for recent
clang compilers.
2018-05-28 Gavin Salam <gavin.salam@cern.ch>
* contribs.svn:
updated ConstituentSubtractor to 1.2.7 (extra features, clearer examples)
2018-05-18 Gregory Soyez <soyez@fastjet.fr>
* VERSION:
* NEWS:
prepared for the release of 1.034
* contribs.svn:
upped ConstituentSubtractor to 1.2.5 (fixing a bug)
* scripts/internal/Template/Makefile
added CXXFLAGS to the compilation of the examples
2018-02-15 Gregory Soyez <soyez@fastjet.fr>
* VERSION:
* NEWS:
prepared for the release of 1.033
* contribs.svn:
upped EnergyCorrelator to 1.3.1 (fixing a memory leak)
2018-01-17 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
prepared for release of 1.032
* contribs.svn:
updated EnergyCorrelator to 1.3.0
2017-12-20 Gavin Salam <gavin.salam@cern.ch>
* VERSION:
* NEWS:
upped version to 1.031 & prepared NEWS for release
* contribs.svn:
upped ConstituentSubtractor to 1.2.4
2017-11-13 Gavin Salam <gavin.salam@cern.ch>
* configure:
included patch from attila.krasznahorkay@cern.ch for issue with
macOS sed.
2017-10-13 Gregory Soyez <soyez@fastjet.fr>
* VERSION:
* NEWS:
preapred to release v1.030
* contribs.svn:
switched to v2.0.0-beta1 of RecursiveTools
2017-09-10 Gavin Salam <gavin.salam@cern.ch>
* VERSION:
* NEWS:
prepared release 1.029
* contribs.svn:
added FlavorCone tags/1.0.0
updated ConstituentSubtractor to 1.2.3
* scripts/release-contrib.sh:
changed error and usage messages to reflect correct script name.
2017-08-30 Gregory Soyez <soyez@fastjet.fr>
* NEWS:
* VERSION:
switched to version 1.028 in view of release and updated NEWS
accordingly.
* contribs.svn:
switched ConstituentSubtractor to 1.2.2 [added back an
erronously-renamed function]
2017-08-10 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
switched to version 1.027 in view of release and updated NEWS
accordingly.
* contribs.svn:
updated ConstituentSubtractor to v1.2.1, which includes changes to
the treatment of massive particles and speed improvements for
whole-event subtraction.
2017-01-25 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
switched to version 1.026 in view of release and updated NEWS
accordingly.
* contribs.svn:
updated ConstituentSubtractor to v1.1.5, which includes new pileup
subtraction options and rho-rescaling.
2016-10-07 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
Switched version to 1.025 in view of a release; updated NEWS
accordingly.
* contribs.svn:
switched EnergyCorrelator to version 1.2.0
2016-06-21 Gregory Soyez <soyez@fastjet.fr>
* VERSION:
* NEWS:
Switched version number over to 1.024 (in view of a release)
Updated the release notes
* contribs.svn:
switched to Nsubjettiness 2.2.4
2016-06-01 Gregory Soyez <soyez@fastjet.fr>
* contribs.svn:
switched VariableR over to v1.2.1
2016-04-28 Gregory Soyez <soyez@fastjet.fr>
* VERSION:
* NEWS:
Switched version number over to 1.023 (in view of a release)
Updated the release notes
* contribs.svn:
switched to Nsubjettiness 2.2.3
2016-03-31 Gregory Soyez <soyez@fastjet.fr>
* VERSION:
set version number to 1.022 prior to the release
2016-03-30 Gavin Salam <gavin.salam@cern.ch>
* utils/check.sh (DIFF):
provided more output in cases where the check fails.
* NEWS:
minor tweak to NEWS
2016-03-30 Gregory Soyez <soyez@fastjet.fr>
* NEWS:
drafted for the release of fjcontrib-1.022
* contribs.svn:
switched GenericSubtractor over to version 1.3.1
2016-03-29 Gregory Soyez <soyez@fastjet.fr>
* contribs.svn:
switched VariableR over to 1.2.0 and Nsubjettiness to 2.2.2
2016-03-10 Gregory Soyez <soyez@fastjet.fr>
* scripts/internal/check-updates.sh: *** ADDED ***
added an internal script that checks if the list in contribs.svn
is up-to-date
2016-03-09 Gregory Soyez <soyez@fastjet.fr>
* contribs.svn:
switched ConstituentSubtractor over to version 1.1.1
2015-10-12 Gregory Soyez <soyez@fastjet.fr>
* NEWS:
* VERSION:
prepared for release 1.021 including QCDAwarePlugin 1.0.0
* contribs.svn:
added QCDAwarePlugin to the list of included contribs
2015-10-05 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* scripts/internal/release-fjcontrib.sh
fixed harmless typo
2015-10-05 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* Makefile.in
install permissions of libfastjetcontribfragile.so switched
from 0644 to 0755 (reported by Dario Berzano).
This will go into 1.020
* NEWS
mentioned item above
2015-10-04 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* NEWS:
* VERSION:
prepared for release 1.020 with Nsubjettiness 2.2.1
2015-10-04 Gavin Salam <gavin.salam@cern.ch>
* DEVEL-GUIDELINES:
mentioned the need to check that "make fragile-shared" works.
* scripts/internal/release-fjcontrib.sh:
added a check that "make fragile-shared" works.
2015-09-28 Gregory Soyez <soyez@fastjet.fr>
* contribs.svn:
switched to version 2.2.1 of Nsubjettiness [minor bug in Makefile]
2015-09-24 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* scripts/internal/generate-html-contents.pl
set up to extract from svn date of tag of last version and
output it in the table with the list of contribs
2015-09-21 Gregory Soyez <soyez@fastjet.fr>
* NEWS:
* VERSION:
prepared for release 1.019 GenericSubtractor 1.3.0
* contribs.svn:
switched GenericSubtractor to version 1.3.0
2015-09-07 Gregory Soyez <soyez@fastjet.fr>
* NEWS:
* VERSION:
prepared for release 1.018 with Nsubjettiness 2.2.0
2015-07-23 Gregory Soyez <soyez@fastjet.fr>
* data/single-ee-event.dat: *** ADDED ***
added a simple e+e- event for tests in e+e- coordinates
2015-05-05 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
prepared NEWS and VERSION files for release 1.017 with
ClusteringVetoPlugin 1.0.0
2015-05-04 Gavin Salam <gavin.salam@cern.ch>
* contribs.svn:
added ClusteringVetoPlugin 1.0.0
2015-04-07 Gavin Salam <gavin.salam@cern.ch>
* VERSION:
* NEWS:
updated version to 1.016 and mentioned ValenciaPlugin 2.0.0 in NEWS
* contribs.svn:
added ValenciaPlugin (tags/2.0.0)
2015-02-20 Gavin Salam <gavin.salam@cern.ch> + Matteo
* DEVEL-GUIDELINES:
mentioned that people should set svn:keywords to Id on relevant
files.
* scripts/internal/Template/example.cc
modified template example header to include a line showing
how to run the example.
2014-11-25 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
updated version 1.015 and prepared NEWS
* contribs.svn:
updated EnergyCorrelator to version 1.1.0
2014-08-17 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
updated version to 1.014 and prepared NEWS
* contribs.svn:
added SoftKiller 1.0.0
2014-08-16 Gavin Salam <gavin.salam@cern.ch>
* contribs.svn:
updated JetCleanser version to tags/1.0.1
2014-07-09 Gregory Soyez <soyez@fastjet.fr>
* VERSION:
* NEWS:
updated version to 1.013 and prepared NEWS for release.
* contribs.svn:
. updated Nsubjettiness to version 2.1.0
. added release 1.0.0 of the new RecursiveTools contrib by
G. Salam, G. Soyez and J. Thaler
2014-06-12 Gregory Soyez <soyez@fastjet.fr>
* configure (sorted_built_contribs):
slightly enlarged the space for printing contribs summary
2014-06-03 Gavin Salam <gavin.salam@cern.ch>
* VERSION:
* NEWS:
updated version to 1.012 and prepared NEWS for release.
* contribs.svn:
updated VariableR to version 1.1.1
2014-04-06 Gavin Salam <gavin.salam@cern.ch>
* VERSION:
* NEWS:
upped version to 1.011 for new contrib with ConstituentSubtractor
and prepared NEWS for the release.
* contribs.svn:
added release 1.0.0 of the new ConstituentSubtractor by Peter
Berta et al.
2014-04-02 Gavin Salam <gavin.salam@cern.ch>
* DEVEL-GUIDELINES:
added details of how to set svn:keywords on source files.
2014-03-14 Gavin Salam <gavin.salam@cern.ch>
* Makefile.in (distclean):
distclean depended on CMS-shared-distclean when it should have
been fragile-shared-distclean.
2014-03-01 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* scripts/internal/generate-html-contents.pl
added (and set) option to list the contribs alphabetically.
Also added (but not activated) option to include the date using the
time stamp of the svn tag
2014-02-26 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* NEWS:
* VERSION:
upped version to 1.010 for release with new contrib JetsWithoutJets
and added release date to NEWS.
* contribs.svn
added JetsWithoutJets v1.0.0
* configure
- added a blank line in output to config.log
- enabled alphabetically ordered output of enabled contribs
2014-02-03 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
upped version to 1.009 for release and added release date to NEWS.
2014-01-31 Gavin SALAM <salam@lpthe.jussieu.fr> + Gregory + Matteo
* configure:
* Makefile.in:
added targets fragile-shared fragile-shared-install and fragile-shared-distclean;
the fragile-shared(-install) builds (installs) a
libfastjetcontribfragile.so file. This is currently very fragile, in
that it relies on just the SRCS formatting in the individual
contrib makefiles (all sources on a single line, without wildcards).
2014-01-20 Gavin Salam <gavin.salam@cern.ch>
* Makefile.in:
* utils/check.sh:
arranged for make check to exit with error on failure from within
subdirectories, but to exit OK on failure when called from the
main directory (previous behaviour was to always exit OK).
Removed redundant "exit 1" from the check.sh code (exit always
handled by print_status_and_exit(...)).
Also, when called directly from a subdirectory, make check no
longer records its output in the test_summary.tmp file, and it now
prints a colour-coded success/failure message.
2013-10-24 Gregory Soyez <soyez@fastjet.fr>
* scripts/internal/switch-to-version.sh:
updated to add support for branches
* scripts/update-contribs.sh (script_new_version):
fixed an issue with checking out versions containing a '-' [the
regular expression matching pattern was consifering these as
"to-be-skipped"]
2013-10-21 Gavin Salam <gavin.salam@cern.ch>
* DEVEL-GUIDELINES:
added some first thoughts on guidelines for reviewing
2013-09-24 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* VERSION:
* NEWS:
released fjcontrib 1.008 with new contrib JetCleanser 1.0.0
* contribs.svn:
added JetCleanser 1.0.0
2013-09-22 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* data/Pythia-Zp2jets-lhc-pileup-1ev.dat
replaced with new file including also particle ID and charge.
The events remain the same (up to, sometimes, differences in
the last digit), the "make check" still work without changing
the old reference files
2013-09-22 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* utils/check.sh
added a safety check to verify if tput is present on the system
before using it to set colors
2013-09-19 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* utils/check.sh
added colors to Success/Failed output from "make check"
* scripts/internal/generate-html-contents.pl
a flag can now be set to get an alphabetically ordered
output (currently set to false, i.e. same output as before)
2013-09-19 Gregory Soyez <soyez@fastjet.fr>
* Makefile.in:
* utils/check.sh:
instead of having "make check" exit with an error whenever a test
fails, let it keep going and print a summary of what has failed
and succeded at the end of everything
2013-09-03 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* contribs.svn:
switched SubjetCounting to version 1.0.1
* NEWS:
released fjcontrib 1.007 with new contrib SubjetCounting 1.0.1
and bugfix for exclusion and inclusion of more than one contrib
2013-09-03 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* VERSION:
* NEWS:
released fjcontrib 1.007 with new contrib SubjetCounting 1.0.0
and bugfix for exclusion and inclusion of more than one contrib
(not actually released as a tarball, see entry above)
* contribs.svn:
added SubjetCounting 1.0.0
2013-08-28 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* configure
fixed two bugs that were preventing specifying more than
one contrib with the --only and --exclude options. The issues
were a spurious "/" appearing in the replacement of commas with
blanks in the contribs list, and a non-escaped command-line
passed through sed when writing out the Makefile.
2013-08-27 Gregory Soyez <soyez@fastjet.fr>
* VERSION:
* NEWS:
released fjcontrib 1.006 including Nsubjettiness 1.0.3
* contribs.svn:
switched NSubjetiness to version 1.0.3
2013-08-13 Gavin Salam <gavin.salam@cern.ch>
* configure:
identification of svn info fixed to work also with svn 1.8 (that
version prints an absolute and relative URL, and configure was
picking up both; now it picks up just the absolute URL).
* scripts/internal/release-fjcontrib.sh:
hopefully fixed bug where tagging comment didn't have version
number (but '$version')
2013-07-24 Gavin Salam <gavin.salam@cern.ch>
* DEVEL-GUIDELINES:
mentioned that authors can ask for input from fjcontrib
maintainers before making a release
2013-06-04 Gavin Salam <gavin.salam@cern.ch>
* configure:
improved error message when fastjet-config not found
2013-06-04 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
released version 1.005, which adds ScJet 1.1.0
2013-06-03 Gavin Salam <gavin.salam@cern.ch>
* contribs.svn:
added ScJet 1.1.0 from Jeff Tseng
2013-05-28 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
release of version 1.004
* contribs.svn:
switched GenericSubtractor to version 1.2.0
2013-05-22 Gavin Salam <gavin.salam@cern.ch>
* configure:
for contribs obtained through an svn checkout (e.g. for
developers), it now supplements version info from the
ContribName/VERSION file with info about the svn location.
2013-05-07 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* scripts/internal/common.sh:
further replacement [ \t] -> [[:space:]] for the fix
mentioned below, since the first one fails to recognize tabs
(only blanks worked)
2013-05-01 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
release of 1.003
* contribs.svn:
changed version of EnergyCorrelator to 1.0.1
* scripts/internal/common.sh:
implemented suggested fix by J. Thaler for issue of
already-checked out contribs not being recognized on some
systems.
2013-04-30 Gavin Salam <gavin.salam@cern.ch>
* contribs.svn:
put in EnergyCorrelator 1.0.0
2013-04-29 Gregory Soyez <soyez@fastjet.fr> + Matteo
* scripts/update-contribs.sh:
reworded comments at the top of the script to reflect the changes
made with 'contribs.local'
2013-04-28 Matteo Cacciari <cacciari@lpthe.jussieu.fr> + Gregory
* scripts/update-contribs.sh
* scripts/internal/common.sh
* contribs.svn
replaced contribs.local with local_svn to avoid confusion with
the name of the file that will eventually be used to contain
local modifications to contribs.svn.
Fixed a regular expression in grep (allowing for mixture of spaces
and tabs before the contrib name)
Also reworded some comments.
Added support for a contribs.local overriding default entries in
contribs.svn. Added option to skip processing of a specific
contribution by scripts/update-contribs.sh, by replacing version
number with any number of dashes.
2013-04-27 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* utils/check.sh
Fixed a few typos in comments
2013-04-12 Gregory Soyez <soyez@fastjet.fr>
* NEWS:
* VERSION:
prepared for 1.002 release
* contribs.svn:
GenericSubtractor switched to version 1.1.0 (was 1.0.0)
2013-02-23 Gavin Salam <gavin.salam@cern.ch>
* NEWS:
* VERSION:
prepared for 1.001 release
* contribs.svn:
added VariableR 1.0.1 and Nsubjettiness 1.0.2 (from Jesse Thaler)
* configure:
now outputs version of each contrib (+ other small formatting)
* Makefile.in:
distclean now removes Makefile and .Makefile.inc
2013-02-22 Gavin Salam <gavin.salam@cern.ch>
* utils/check.sh:
now prints out the directory that it's running in
2013-02-21 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* DEVEL-GUIDELINES:
Rephrased sentence about registering a new contrib and the note
note about retrieving a registered contrib using
scripts/update-contribs.sh ContribName trunk"
2013-02-21 Gregory Soyez <soyez@fastjet.fr>
* scripts/internal/Template/Makefile:
added missing ; in make install
2013-02-21 Gavin Salam <gavin.salam@cern.ch>
* DEVEL-GUIDELINES:
added info on use of htpasswd to send us a password
* scripts/internal/common.sh (svn_write):
switched write URL from svn+ssh -> https
2013-02-21 Gavin Salam <gavin.salam@cern.ch>
* README:
fixed type for http checkout
2013-02-07 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* VERSION
Pushed version to 1.000 for release
* contribs.svn
set version numbers to 1.0.0 for both GenericSubtractor and
JetFFMoments
2013-02-06 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* scripts/internal/release-fjcontrib.sh:
a few fixes wrt paths for the tarball, info on release date,
parallel make, etc.
2013-02-06 Gavin SALAM <salam@tycho.lpthe.jussieu.fr> + Matteo
* scripts/update-contribs.sh:
now does "exit 1" if it couldn't find a given contrib version on
the svn.
* scripts/internal/release-fjcontrib.sh:
now allows user to carry on even if there are local modifications,
but with a warning.
* scripts/update-contribs.sh:
tried to make sure that failure of switch-to-contrib results in
failure of update-contribs too (important e.g. for release script)
* configure (makefileinc):
the .Makefile.inc file now has variables to override the install
and check scripts (intended to help possible future changes +
standalone functionality).
* scripts/internal/check.sh -> utils/check.sh
* scripts/internal/install-sh -> utils/install-sh
moved these into a separate directory so that in the tarball we
include utils, but can completely discard scripts/
* scripts/internal/Template/Makefile:
this has been updated to use scripts in utils/*
* scripts/internal/generate-html-contents.pl:
now includes a link to the directory for the contrib
* configure:
fixed bug in output of prefix to .Makefile.inc (wasn't being
output when it was derived from fastjet-config).
* contribs.svn:
JetFFMoments -> tags/0.99.1
* scripts/internal/release-fjcontrib.sh :
fixed typo in checking of existing version; before asking about a
release it now lists the contrib versions.
* VERSION
upped to 0.001 for more testing
2013-02-01 Gavin Salam <gavin.salam@cern.ch>
* contribs.svn:
GenericSubtractor -> 0.99.1
JetFFMoments -> 0.99
* configure:
* Makefile.in:
* scripts/internal/Template/Makefile:
variables are now communicated to sub-directory Makefiles via a
.Makefile.inc; trunks of JetFFMoments and GenericSubtractor also
modified.
* scripts/internal/release-fjcontrib.sh:
contents now lives in a separate directory
* scripts/update-contribs.sh:
no longer query if the contrib isn't yet there.
2013-02-01 Gregory Soyez <soyez@fastjet.fr>
* scripts/internal/package.sh: (well... mostly Matteo)
added a simple script to package a tarball
2013-01-31 Gregory Soyez <soyez@fastjet.fr>
* scripts/internal/release-fjcontrib.sh:
. removed unneeded developer and svn-users files from the
tarball
. fixed a few typos and trivial bugs
. check which fastjet-config to use when running tests
. the script now upload the tarball and the relevant info for
the webpage update
* scripts/internal/generate-html-contents.pl:
played with CSS styles so as to get a result that looks rather
close to what is on the FastJet tools page
* scripts/internal/common.sh:
* scripts/update-contribs.sh:
passed the default answer to get_yesno_answer as an argument
rather than a pre-defined variable
* scripts/internal/release-fjcontrib.sh:
added a script to release fj-contrib
it includes all the contrib in contribs.svn
* configure:
* README:
used --fastjet-config=... rather than --fjconfig=... to specify
the 'fastjet-config' file to use
* scripts/update-contribs.sh:
* scripts/internal/common.sh:
allowed to run
update-contribs.sh --force
which will answer yes to all "yesno" questions asked
* VERSION: *** ADDED ***
added a VERSION file
* scripts/internal/switch-to-version.sh:
* scripts/register-new-contrib.sh:
* scripts/new-contrib-from-template.sh:
* scripts/release-contrib.sh:
removed potential trailing /
2013-01-31 Gavin Salam <gavin.salam@cern.ch> + Gregory
* DEVEL-GUIDELINES: *** ADDED ***
* README
tried to make these a little more compact.
2013-01-31 Gregory Soyez <soyez@fastjet.fr>
* scripts/make-release.sh -> scripts/release-contrib.sh:
renamed for more consistency
* scripts/internal/switch-to-version.sh:
if the version starts with a digit, prefix it by "tags/"
* scripts/internal/install-sh:
added a script for installing files
* scripts/make-release.sh:
checked the full list of mandatory files when making a release
2013-01-31 Gavin Salam <gavin.salam@cern.ch>
* scripts/update-contribs.sh:
added -h option to update-contribs.sh
2013-01-31 Gregory Soyez <soyez@fastjet.fr>
* scripts/update-contribs.sh:
if the svn up updated the update-contribs.sh script, re-run with
the new version
* AUTHORS: *** ADDED ***
* COPYING: *** ADDED ***
* scripts.internal/Template/COPYING:
put this under GPLv2 and added the list of people maintaining the
FastJet-contrib
* README:
mentioned new-contrib-from-template.sh instead of
new-contrib-template.sh
* scripts/internal/check.sh:
checked that the expected output contains more than comments and
empty lines
2013-01-31 Gavin SALAM <gavin.salam@cern.ch> + Matteo + Gregory
* scripts/internal/Template/example.ref *** ADDED ***
added a template reference output file for make check with
instruction on what to do with it.
* scripts/new-contrib-template.sh -> scripts/new-contrib-from-template.sh
a more meaningful name.
2013-01-31 Gregory Soyez <soyez@fastjet.fr>
* scripts/internal/check.sh:
default extension for expected output set to "ref"
* scripts/internal/Template/example.cc:
added missing header
* scripts/internal/Template/Makefile
* scripts/internal/check.sh:
fixed some bash typos
* scripts/switch-to-version.sh: *** DELETED ***
* scripts/internal/switch-to-version.sh: *** ADDED ***
* scripts/update-contribs.sh:
moved switch-to version in internal/
* scripts/new-contrib-template.sh: *** ADDED ***
* scripts/internal/Template: *** ADDED ***
added a template to create a new contrib and is associated script
* scripts/TODO:
updated to reflect altest changes
2013-01-30 Gregory Soyez <soyez@fastjet.fr>
* scripts/switch-to-version.sh:
* scripts/update-contribs.sh:
if the versions agree, still run svn up
* scripts/internal/common.sh:
make sure the full contrib name is specified
* scripts/update-contribs.sh:
when updating a specified contrib, ask for confirmation
* scripts/switch-to-version.sh:
- use svn switch --relocate since svn relocate is not available
with old svn version
- give a write access when checking out the trunk
* scripts/make-release.sh:
gave access to check_pending_modifications
* data/ *** ADDED ***
added common event files for make check purpose
* configure: *** ADDED ***
* Makefile.in: *** ADDED ***
added basic building mechanism
* scripts/update-contribs.sh:
allowed to run it with a contrib name and optional version
This is then equivalent to calling switch-to-version.sh
* scripts/update-contribs.sh:
added "Template" to the list of ignored directories
* scripts/* *** ADDED ***
* README *** ADDED ***
added a list of maintenance scripts (see README for details)
* contribs.svn *** ADDED ***
added an (empty) list of supported contribs
Index: contrib/trunk/configure
===================================================================
--- contrib/trunk/configure (revision 1488)
+++ contrib/trunk/configure (revision 1489)
@@ -1,472 +1,479 @@
#!/bin/bash
#
# This script will generate a Makefile according to the options one requests.
# The Makefile will then allow one to build and install the FastJet contrib.
#
# See
# configure --help
# for information about how to use this script
# load common setup
. `dirname $0`/scripts/internal/common.sh
#------------------------------------------------------------------------
# the list of contribs supported by this script
#------------------------------------------------------------------------
all_contribs=$(find . -mindepth 2 -maxdepth 2 -not -print \
| grep -e VERSION -e FJCONTRIB.cfg | sort | sed 's/\.\///g;s/\/.*$//g' | grep -v "Template")
#------------------------------------------------------------------------
# default values prior to the arg parsing
#------------------------------------------------------------------------
only_contribs=""
excluded_contribs=""
fjconfig="fastjet-config"
#------------------------------------------------------------------------
# print a usage message and exit
#------------------------------------------------------------------------
# exit code passed as argument:
# 0 if it is a normal call
# 1 if it is due to a misusage.
usage(){
cat 1>&2 <<EOF
This is a FastJet-contrib tool to configure the behaviour of
the build and installation.
Usage:
configure [--help] [--list] [--fastjet-config=FILE] [--prefix=PREFIX] [CXX=...] [CXXFLAGS=...]
The arguments can be the following [default in square brackets]:
--help prints this message and exits
--list prints the list of existing contribs and exits
--fastjet-config=FILE
sets the 'fastjet-config' file to use [$fjconfig]
--prefix=PREFIX sets the installation directory [prefix returned by fastjet-config]
--only=Contrib1,Contrib2,...
only configures for compilation selected contribs
--exclude=Contrib1,Contrib2,...
excludes selected contribs from configuration
EOF
exit $1
}
#------------------------------------------------------------------------
# write error messages and exit
#------------------------------------------------------------------------
write_error(){
echo "Error: $1"
echo "Use fastjet-config --help for more information"
exit 1
}
#------------------------------------------------------------------------
# tools to parse options
#------------------------------------------------------------------------
# option_name _string
# Returns NAME if _string is of the form: --NAME[=...]
option_name(){
echo "$1" | sed 's/^--//;s/=.*//' | tr '-' '_'
}
# option_value _string
# Returns FOO if _string is of the form: --option=FOO
option_value(){
echo "$1" | sed 's/^[^=]*=//'
}
# is_in_list _arg _arg_list
# return true if the argument _arg is in the list _arg_list
# and false otherwise
is_in_list(){
arg_match="$1"
shift
for arg_match_i do
[ "x$arg_match_i" != "x$arg_match" ] || return 0
done
false
}
#------------------------------------------------------------------------
# parse the command line options
#------------------------------------------------------------------------
# first deal with the case where no argument is passed
#[ $# -gt 0 ] || usage 1
echo "Configuring fjcontrib version" `cat VERSION`
# make sure Makefile.inc is absent
makefileinc=".Makefile.inc"
[ -e $makefileinc ] && rm $makefileinc && touch $makefileinc
echo "# contrib-wide Makefile include file, generated automatically with" >> $makefileinc
echo "# $0 $*" >> $makefileinc
for arg do
case "$arg" in
--help|-h)
usage 0
;;
--list)
echo $all_contribs
exit 0
;;
--*=*)
arg_name=`option_name $arg`
arg_value=`option_value $arg`
case $arg_name in
prefix)
prefix="$arg_value"
;;
fastjet_config)
fjconfig="$arg_value"
;;
only)
only_contribs="${arg_value//,/ }" # replace all commas with a blank
;;
exclude)
excluded_contribs="${arg_value//,/ }" # replace all commas with a blank
;;
*)
write_error "$arg: unrecognised argument"
;;
esac
;;
[A-Z]*=*)
# variables that go into the $makefileinc
echo "$arg" >> $makefileinc
;;
*)
write_error "$arg is not a recognised argument. Aborting"
;;
esac
done
#------------------------------------------------------------------------
# check for fastjet-config and set up prefix
#------------------------------------------------------------------------
# exit if fastjet-config is not found (bad file name or not in path)
if ! [ `command -v $fjconfig` ]; then
echo "Error:" $fjconfig" has not been found."
echo " You may explicitly specify the location of fastjet-config "
echo " with the option --fastjet-config=...."
echo "Exiting"
exit 1
fi
# write out full path to fastjet-config + version
fjconfig=$(command -v $fjconfig)
echo "Using $fjconfig, corresponding to fastjet version" $($fjconfig --version)
echo
# if prefix has not been set explicitly from command line, set it to
# the one returned by 'fastjet-config --prefix'
if [ "x"$prefix == "x" ] ; then
prefix=`$fjconfig --prefix`
fi
# generate the rest of $makefileinc
echo "FASTJETCONFIG=$fjconfig" >> $makefileinc
echo "PREFIX=$prefix" >> $makefileinc
echo 'install_script = $(SHELL) ../utils/install-sh' >> $makefileinc
echo 'check_script = ../utils/check.sh' >> $makefileinc
#------------------------------------------------------------------------
# check for C++11 support (needed as of version 1.047 of fjcontrib)
# and add in options if needed
#------------------------------------------------------------------------
checkc11(){
fjcdir=$(pwd)
tmpdir=$(mktemp -d)
pushd $tmpdir > /dev/null
cp -p $fjcdir/scripts/c11check/Makefile $fjcdir/scripts/c11check/c11check.cc .
makeoutput=$(make FJCDIR=$fjcdir c11check 2>&1)
c11retcode=$?
popd > /dev/null
rm -rf $tmpdir
return $c11retcode
}
echo "Checking for c++11 support"
checkc11
if [ $? -ne 0 ]
then
echo "Adding compile-time flag to support c++11"
echo "Make sure you use c++11 when compiling/linking with fjcontrib"
echo "CXXFLAGS+=-std=c++11" >> $makefileinc
checkc11
if [ $? -ne 0 ]
then
echo "Failed to set up C++11 support. Error was"
echo "$makeoutput"
exit -1
fi
else
echo "c++11 already supported with existing CXXFLAGS"
fi
#------------------------------------------------------------------------
# construct the list of directories to recurse into
#------------------------------------------------------------------------
included_contribs=""
if [ "x${only_contribs}" == "x" ] ; then
included_contribs="$all_contribs"
else
included_contribs="$only_contribs"
fi
built_contribs=""
if [ "x${excluded_contribs}" == "x" ] ; then
built_contribs="$included_contribs"
else
built_contribs=""
for contrib in $included_contribs; do
if ! is_in_list $contrib ${excluded_contribs} ; then
built_contribs="$built_contribs $contrib"
fi
done
fi
#------------------------------------------------------------------------
# create the Makefile
#------------------------------------------------------------------------
TAB="$(printf '\t')"
# cat >Makefile <<EOF
# # This Makefile has been generated by the 'configure' script.
# # Please edit this with great care.
#
# # installation setup
# SUBDIRS=$built_contribs
#
# # Note: we could simply use "export" here to have all variables
# # exported by default, but the explicit mention below has the advantage
# # that it overrides any default in the sub-makefile. Note also
# # that we could play some games with te MAKELEVEL variable.
# SUBMAKE=\$(MAKE) FASTJETCONFIG=${fjconfig} PREFIX=$prefix
#
# RECURSIVE_TARGETS=all-recursive install-recursive clean examples
#
# .PHONY: \$(RECURSIVE_TARGETS) install examples
#
# all: all-recursive
#
# install: all install-recursive
#
# \$(RECURSIVE_TARGETS):
# ${TAB}@+failcom='exit 1' \\
# ${TAB}target=\`echo \$@ | sed s/-recursive//\`; \\
# ${TAB}list='\$(SUBDIRS)'; for subdir in \$(SUBDIRS); do \\
# ${TAB} \$(SUBMAKE) -C \$\$subdir \$\$target || eval \$\$failcom; \\
# ${TAB}done
#
# EOF
# The method below id more along the lines of what is present in the
# GNU make manual but the explicit use of $(MAKECMDGOALS) in the
# recursion causes make install to recurse as "make install" (even
# though it depends on make all... so each the contribs is built and
# installed before going to the next one, In case of a compilation
# error, it is better to build everything and then install everything.
#
# The option to avoid that would be to define an explicit recursion
# for each target e.g. doing
#
# SUBDIRS.clean = $(SUBDIRS:=.clean)
# clean: $(SUBDIRS.clean)
# $(SUBDIRS.clean):
# $(MAKE) -C $@ clean
# .PHONY: clean $(SUBDIRS.clean)
#
# which, in our case would probably only be required for "all" (so
# that it can explicitly be called by install
#
# Note that this method may have a better behaviour when using the -j
# option.
# cat >Makefile <<EOF
# # This Makefile has been generated by the 'configure' script.
# # Please edit this with great care.
#
# # installation setup
# SUBDIRS=$built_contribs
# SUBDIRS.all=\$(SUBDIRS:=.all)
#
# SUBMAKE=\$(MAKE) FASTJETCONFIG=${fjconfig} PREFIX=$prefix
#
# .PHONY: \$(SUBDIRS) \$(SUBDIRS.all) clean distclean check install examples
#
# all: \$(SUBDIRS.all)
#
# install: all \$(SUBDIRS)
#
# examples check clean distclean: \$(SUBDIRS)
#
# \$(SUBDIRS):
# ${TAB}+\$(SUBMAKE) -C \$@ \$(MAKECMDGOALS)
#
# \$(SUBDIRS.all):
# ${TAB}+\$(SUBMAKE) -C \$(basename \$@)
#
# EOF
# alternatively we could build this from the Makefile.in
# prefix variable
commandline="$0 $*"
# the apparently bizarre constructs below ensure that the
# slashes are escaped in the sed replacement, so as not to conflicit
# with those in the s/// syntax
escaped_built_list="$(echo ${built_contribs} | sed -e 's/[\/&]/\\&/g')"
escaped_fjconfig="$(echo ${fjconfig} | sed -e 's/[\/&]/\\&/g')"
escaped_prefix="$(echo ${prefix} | sed -e 's/[\/&]/\\&/g')"
escaped_commandline="$(echo ${commandline} | sed -e 's/[\/&]/\\&/g')"
# this is the list of all sources that go into libraries. It is quite
# fragile and only intended for CMS's dirty shared-library hack.
srclist="";
fragile_include=""
for contrib in $included_contribs
do
srclist="${srclist} "`grep "^SRCS=" ${contrib}/Makefile | sed 's/^SRCS=/ /' | sed 's/ \([^ ]\)/ '${contrib}'\/\1/g'`
if [ -e $contrib/include ] ; then
fragile_include="${fragile_include} -I${contrib}/include"
fi
done
escaped_srclist="$(echo ${srclist} | sed -e 's/[\/&]/\\&/g')"
escaped_fragile_include="$(echo ${fragile_include} | sed -e 's/[\/&]/\\&/g')"
if [ "x"`uname` == "xDarwin" ] ; then
dynlibopt="-dynamiclib"
dynlibext="dylib"
dynlibpostproc="install_name_tool -id \\1 \\1"
else
#dynlibopt="-shared"
# the following more elaborate set of options requested by Alexander Puck Neuwirth
# for compatibility with gentoo, cf. https://github.com/fjcontrib/fjcontrib/issues/4
dynlibopt="-shared -Wl,--as-needed -Wl,-soname,fastjetcontribfragile.so.0"
dynlibext="so"
dynlibpostproc="" # some dummy command needed
fi
# write out the Makefile
sed -e "s/@CONTRIB_BUILD_LIST@/$escaped_built_list/g" \
-e "s/@FJCONFIG@/$escaped_fjconfig/g" \
-e "s/@PREFIX@/${escaped_prefix}/g" \
-e "s/template gets processed/was generated automatically/" \
-e "s/@contrib_commandline@/$escaped_commandline/" \
-e "s/@FRAGILE_SHARED_SRC_LIST@/$escaped_srclist/" \
-e "s/@FRAGILE_SHARED_INCLUDES@/$escaped_fragile_include/" \
-e "s/@DYNLIBOPT@/$dynlibopt/g;s/@DYNLIBEXT@/$dynlibext/g" \
-e "s/@DYNLIBPOSTPROC@ \(.*\)/$dynlibpostproc/g" \
-e "s/any edits fit with the rest of the build system/you only edit Makefile.in/" Makefile.in > Makefile
#------------------------------------------------------------------------
# write output and config.log file
#------------------------------------------------------------------------
# order contribs alphabetically (making sure we use LC_ALL=C")
LC_ALL=C
sorted_built_contribs=`echo $built_contribs | tr " " "\n" | sort | tr "\n" " "`
# build up the dependencies for the sub-directories
fjversion=`$fjconfig --version`
for contrib in $sorted_built_contribs
do
+
+ if [[ -f $contrib/VERSION && -f $contrib/FJCONTRIB.cfg ]]; then
+ echo "ERROR: $contrib has both $contrib/VERSION and $contrib/FJCONTRIB.cfg files."
+ echo "Only one of these should be present. In newer contribs, please use FJCONTRIB.cfg"
+ exit 1
+ fi
+
get_dependencies $contrib dependencies min_versions min_fj_version
echo "Processing dependencies for $contrib"
# first, check if there's a minimal required FastJet version
if [ ! x$min_fj_version = x ]; then
if ! version_is_at_least ${fjversion} ${min_fj_version}; then
echo "$contrib requires Fastjet $min_fj_version or higher. Fastjet $fjversion < $min_fj_version has been found."
echo Bailing out of the configure process
exit 1
fi
fi
# then, check potential dependencies on other contribs
deps=""
for i in "${!dependencies[@]}"; do
echo " ${dependencies[i]} (needs v>=${min_versions[i]})"
if ! item_is_in_list ${dependencies[i]} "${sorted_built_contribs}"; then
echo " not in the list of built contribs"
echo Bailing out of the configure process
exit 1
fi
if [ -d ${dependencies[i]} ]; then
read_tag ${dependencies[i]} version dep_version
echo -n " found ${dep_version}"
if version_is_at_least ${dep_version} ${min_versions[i]}; then
echo " (>= ${min_versions[i]})"
else
echo " (< ${min_versions[i]})"
echo The version of ${dependencies[i]} found is ${dep_version}, but at least ${min_versions[i]} is required
echo Bailing out of the configure process
exit 1
fi
else
echo " not found"
echo Bailing out of the configure process
exit 1
fi
deps="$deps ${dependencies[i]}.all"
done
#deps=$(echo $dependencies | tr " " "\n")
#echo "Dependencies for $contrib: " $deps
#echo "Dependencies for $contrib: " $deps
cat >> Makefile <<EOF
$contrib.all: $deps
${TAB}+\$(SUBMAKE) -C $contrib
$contrib.ex: $contrib.all
${TAB}+\$(SUBMAKE) -C $contrib examples
$contrib.check: $contrib.all
${TAB}+\$(SUBMAKE) -C $contrib check
$contrib.install: $contrib.all
${TAB}+\$(SUBMAKE) -C $contrib install
EOF
done
# output to screen
echo
echo -e "Enabled contribs: "
for contrib in $sorted_built_contribs
do
# check if a contrib has an associated svn directory; if so include info about the svn repo
if [ -e $contrib/.svn ] ; then
svninfo="svn:"`svn info $contrib | grep '^ *URL' | sed -e 's/URL: //' -e 's/.*\/contribs\/'$contrib'\///'`""
else
svninfo=""
fi
read_tag $contrib version contribversion
printf " %-30s v%-15s $svninfo\n" $contrib $contribversion
done
#
# output to config.log
#
echo
echo -e "Installation prefix: "$prefix
echo "--------------------------------------------------"
echo -e "Now run 'make', optionally 'make check', and 'make install'\n"
echo -e "This file was created by the fastjet contrib configure on "`date`"\n" > config.log
echo -e "The command line invocation was\n" >> config.log
echo -e " $0 $@\n" >> config.log
for contrib in $sorted_built_contribs
do
read_tag $contrib version contribversion
printf " %-22s v%s\n" $contrib $contribversion >> config.log
done
echo -e "\nInstallation prefix: "$prefix"\n" >> config.log

File Metadata

Mime Type
text/x-diff
Expires
Sat, Dec 21, 2:25 PM (9 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4014466
Default Alt Text
(52 KB)

Event Timeline