Index: contrib/trunk/README =================================================================== --- contrib/trunk/README (revision 1206) +++ contrib/trunk/README (revision 1207) @@ -1,68 +1,68 @@ This is the README file for the fastjet-contrib project https://fastjet.hepforge.org/contrib/ which provides a library of 3rd-party add-ons to FastJet (http://fastjet.fr/) ====================================================================== Instructions for generic users ------------------------------ You should have downloaded a tarball for the contrib. Unpack it, enter the resulting directory and run ./configure [--fastjet-config=FILE] [--prefix=...] [...] make make check # optional make install Once you have installed, a contrib named XYZ will typically be accessible through a line #include "fastjet/contrib/XYZ.hh" with the corresponding library available through -lXYZ . Queries about the fastjet-contrib project as a whole should be sent to Queries about individual contribs should be sent to the people mentioned in the contrib/AUTHORS file ====================================================================== For users who want the latest version (and for developers) ---------------------------------------------------------- To get started, you will need an account on hepforge. If you don't have one yet, go to https://www.hepforge.org/register to create it. You will also need to set up your ssh key on hepforge (go to https://phab.hepforge.org/settings/user/USERNAME/page/ssh/ where USERNAME is replaced by your username). Now you can get an svn checkout of the top-level directory - svn co svn+ssh://vcs@phab.hepforge.org/source/fastjetsvn/contrib/trunk fjcontrib + svn co https://svn.hepforge.org/fastjetsvn/contrib/trunk fjcontrib which contains the scripts and a current list of contribs and their versions. Within the fjcontrib directory, get the contribs themselves by running ./scripts/update-contribs.sh usually, the contribs are tagged (released) versions and there is one svn checkout for each contrib. Then proceed with configure, make, etc. To get updates at a later stage: ./scripts/update-contribs.sh # all contribs ./scripts/update-contribs.sh ContribName # just a specific contrib ./scripts/update-contribs.sh ContribName version # specific version of a contrib The command always updates the top level directory. If "version" is "trunk", then you get the development area for the Contrib -- do this only if you're a developer of that contrib. For further information on development, see the file DEVEL-GUIDELINES. Index: contrib/trunk/ChangeLog =================================================================== --- contrib/trunk/ChangeLog (revision 1206) +++ contrib/trunk/ChangeLog (revision 1207) @@ -1,983 +1,989 @@ 2018-12-04 Gavin Salam + * scripts/internal/common.sh (svn_read): + * README: + updated links for read-only access. + +2018-12-04 Gavin Salam + * 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 * 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 * NEWS: * VERSION: preparing for 1.039 release with LundPlane 1.0.2 2018-10-30 Gavin Salam * contribs.svn: updated LundPlane to 1.0.2 2018-10-25 Gavin Salam * 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 * 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 + Matteo * scripts/internal/get-author-emails.py: added script to extract all author emails 2018-08-23 Gavin Salam * scripts/update-contribs.sh: documented the --force option in the help message 2018-07-20 Gavin Salam * VERSION: * NEWS: * contribs.svn: prepared release of 1.037 with ConstituentSubtractor updated to 1.3.1 2018-06-06 Gavin Salam * 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 * 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 * contribs.svn: updated ConstituentSubtractor to 1.2.7 (extra features, clearer examples) 2018-05-18 Gregory Soyez * 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 * 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 * NEWS: * VERSION: prepared for release of 1.032 * contribs.svn: updated EnergyCorrelator to 1.3.0 2017-12-20 Gavin Salam * VERSION: * NEWS: upped version to 1.031 & prepared NEWS for release * contribs.svn: upped ConstituentSubtractor to 1.2.4 2017-11-13 Gavin Salam * configure: included patch from attila.krasznahorkay@cern.ch for issue with macOS sed. 2017-10-13 Gregory Soyez * VERSION: * NEWS: preapred to release v1.030 * contribs.svn: switched to v2.0.0-beta1 of RecursiveTools 2017-09-10 Gavin Salam * 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 * 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 * 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 * 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 * 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 * 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 * contribs.svn: switched VariableR over to v1.2.1 2016-04-28 Gregory Soyez * 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 * VERSION: set version number to 1.022 prior to the release 2016-03-30 Gavin Salam * utils/check.sh (DIFF): provided more output in cases where the check fails. * NEWS: minor tweak to NEWS 2016-03-30 Gregory Soyez * NEWS: drafted for the release of fjcontrib-1.022 * contribs.svn: switched GenericSubtractor over to version 1.3.1 2016-03-29 Gregory Soyez * contribs.svn: switched VariableR over to 1.2.0 and Nsubjettiness to 2.2.2 2016-03-10 Gregory Soyez * 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 * contribs.svn: switched ConstituentSubtractor over to version 1.1.1 2015-10-12 Gregory Soyez * 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 * scripts/internal/release-fjcontrib.sh fixed harmless typo 2015-10-05 Matteo Cacciari * 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 * NEWS: * VERSION: prepared for release 1.020 with Nsubjettiness 2.2.1 2015-10-04 Gavin Salam * 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 * contribs.svn: switched to version 2.2.1 of Nsubjettiness [minor bug in Makefile] 2015-09-24 Matteo Cacciari * 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 * 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 * NEWS: * VERSION: prepared for release 1.018 with Nsubjettiness 2.2.0 2015-07-23 Gregory Soyez * data/single-ee-event.dat: *** ADDED *** added a simple e+e- event for tests in e+e- coordinates 2015-05-05 Gavin Salam * NEWS: * VERSION: prepared NEWS and VERSION files for release 1.017 with ClusteringVetoPlugin 1.0.0 2015-05-04 Gavin Salam * contribs.svn: added ClusteringVetoPlugin 1.0.0 2015-04-07 Gavin Salam * 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 + 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 * NEWS: * VERSION: updated version 1.015 and prepared NEWS * contribs.svn: updated EnergyCorrelator to version 1.1.0 2014-08-17 Gavin Salam * NEWS: * VERSION: updated version to 1.014 and prepared NEWS * contribs.svn: added SoftKiller 1.0.0 2014-08-16 Gavin Salam * contribs.svn: updated JetCleanser version to tags/1.0.1 2014-07-09 Gregory Soyez * 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 * configure (sorted_built_contribs): slightly enlarged the space for printing contribs summary 2014-06-03 Gavin Salam * 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 * 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 * DEVEL-GUIDELINES: added details of how to set svn:keywords on source files. 2014-03-14 Gavin Salam * Makefile.in (distclean): distclean depended on CMS-shared-distclean when it should have been fragile-shared-distclean. 2014-03-01 Matteo Cacciari * 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 * 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 * NEWS: * VERSION: upped version to 1.009 for release and added release date to NEWS. 2014-01-31 Gavin SALAM + 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 * 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 * 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 * DEVEL-GUIDELINES: added some first thoughts on guidelines for reviewing 2013-09-24 Matteo Cacciari * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * DEVEL-GUIDELINES: mentioned that authors can ask for input from fjcontrib maintainers before making a release 2013-06-04 Gavin Salam * configure: improved error message when fastjet-config not found 2013-06-04 Gavin Salam * NEWS: * VERSION: released version 1.005, which adds ScJet 1.1.0 2013-06-03 Gavin Salam * contribs.svn: added ScJet 1.1.0 from Jeff Tseng 2013-05-28 Gavin Salam * NEWS: * VERSION: release of version 1.004 * contribs.svn: switched GenericSubtractor to version 1.2.0 2013-05-22 Gavin Salam * 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 * 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 * 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 * contribs.svn: put in EnergyCorrelator 1.0.0 2013-04-29 Gregory Soyez + 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 + 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 * utils/check.sh Fixed a few typos in comments 2013-04-12 Gregory Soyez * 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 * 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 * utils/check.sh: now prints out the directory that it's running in 2013-02-21 Matteo Cacciari * 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 * scripts/internal/Template/Makefile: added missing ; in make install 2013-02-21 Gavin Salam * 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 * README: fixed type for http checkout 2013-02-07 Matteo Cacciari * 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 + 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 + 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 * 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 * scripts/internal/package.sh: (well... mostly Matteo) added a simple script to package a tarball 2013-01-31 Gregory Soyez * 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 + Gregory * DEVEL-GUIDELINES: *** ADDED *** * README tried to make these a little more compact. 2013-01-31 Gregory Soyez * 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 * scripts/update-contribs.sh: added -h option to update-contribs.sh 2013-01-31 Gregory Soyez * 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 + 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 * 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 * 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/scripts/internal/common.sh =================================================================== --- contrib/trunk/scripts/internal/common.sh (revision 1206) +++ contrib/trunk/scripts/internal/common.sh (revision 1207) @@ -1,118 +1,119 @@ # a list of definitions and tools that we'd like to ave an easy access # to # svn repositories for read and write access #svn_read=http://fastjet.hepforge.org/svn/contrib #svn_write=https://fastjet.hepforge.org/svn/contrib #svn_write=svn+ssh://svn.hepforge.org/hepforge/svn/fastjet/contrib #fastjet_web_dir=~fastjet/public_html -svn_read=svn+ssh://vcs@phab.hepforge.org/source/fastjetsvn/contrib +#svn_read=svn+ssh://vcs@phab.hepforge.org/source/fastjetsvn/contrib +svn_read=https://svn.hepforge.org/fastjetsvn/contrib svn_write=svn+ssh://vcs@phab.hepforge.org/source/fastjetsvn/contrib fastjet_web_dir=/hepforge/projects/fastjet/public_html export svn_read svn_write fastjet_web_dir # get the svn URL and fill # - mode : ro if http:// access; rw otherwise # - version : the version info # [None] is returned if the directory does not exist # [NoSVN] is returned if the directory is not under svn # # get_svn_info contrib mode version function get_svn_info(){ local __modevar=$2 local __versionvar=$3 # check if the directory exists if [[ ! -d $1 ]]; then eval $__modevar="[None]" eval $__versionvar="[None]" return 0 fi cd $1 # check if this is in svn svn info > /dev/null 2>&1 || { eval $__modevar="[NoSVN]" eval $__versionvar="[NoSVN]" cd .. return 0 } # get the full URL svn_url=$(svn info | grep "^URL:" | sed 's/^URL: //') eval $__versionvar="${svn_url#*/$1/}" if [[ "$svn_url" == "http:"* ]]; then eval $__modevar="ro" else eval $__modevar="rw" fi cd .. return 0 } # get an entry from a contrib file, filling the "version" variable # vwith the version number # # get_contrib_version contrib_name file version function get_contrib_version(){ local __resultvar=$3 # nasty hack: if the name of the "file" is "local_svn", # get the version number from the local svn checkout of the contribution if [[ "$2" == "local_svn" ]]; then get_svn_info $1 mode version eval $__resultvar="$version" return 0 fi # now deal with the version number as if it was an entry in "file" $2 if [[ -e $2 ]]; then # check if the file actually exists # entry=$(grep "^[ \t]*$1[ \t]" $2) # does not seem to work with tabs entry=$(grep "^[[:space:]]*$1[[:space:]]" $2) if [ -z "$entry" ]; then eval $__resultvar="[None]" else eval $__resultvar="`echo $entry | awk '{print $2}'`" fi else # file does not exist eval $__resultvar="[None]" fi } # get a yes/no answer # returns 0 for n/N/no # 1 for y/Y/yes function get_yesno_answer(){ while true; do echo -ne "$1 [y/n] " if [[ -z "$2" ]]; then read answer else answer="$2" # TODO: add a test that the answer is a valid one echo "$2" fi case $answer in y|Y|yes) return 1; break ;; n|N|no) return 0; break ;; esac done } # check if the local svn has pending modifications # check_pending_modifications contrib function check_pending_modifications(){ cd $1 result=$(svn status | grep -v "^?") if [[ ! -z "$result" ]]; then svn status | grep -v "^?" cd .. return 1 fi cd .. return 0 }