[Rivet-svn] rivet: 3 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/78c11262cd25
branches:  release-2-6-x
changeset: 6204:78c11262cd25
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Dec 22 16:41:23 2017 +0000
description:
Update

details:   https://rivet.hepforge.org/hg/rivet/rev/667b0aae97ef
branches:  release-2-6-x
changeset: 6205:667b0aae97ef
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Dec 22 16:42:19 2017 +0000
description:
Update diffanas script to be portable between versions before and after 2.6.0

details:   https://rivet.hepforge.org/hg/rivet/rev/394fa0b53b3c
branches:  release-2-6-x
changeset: 6206:394fa0b53b3c
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Dec 22 17:47:10 2017 +0000
description:
Add a simple JSON-building script, and fix PDF manual bugs

diffs (truncated from 194 to 50 lines):

--- a/.hgignore	Fri Dec 22 14:52:37 2017 +0000
+++ b/.hgignore	Fri Dec 22 17:47:10 2017 +0000
@@ -49,7 +49,7 @@
 ^include/Rivet/Config/DummyConfig\.hh$
 ^include/Rivet/Config/RivetConfig\.hh$
 ^doc/.*\.(log|aux|out)$
-^doc/diffanas$
+^doc/ana
 ^test/log$
 ^test/.*\.log$
 ^test/out\.yoda$
--- a/configure.ac	Fri Dec 22 14:52:37 2017 +0000
+++ b/configure.ac	Fri Dec 22 17:47:10 2017 +0000
@@ -1,7 +1,7 @@
 ## Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([Rivet],[2.6.1-pre],[rivet at projects.hepforge.org],[Rivet])
+AC_INIT([Rivet],[2.6.0],[rivet at projects.hepforge.org],[Rivet])
 
 ## Check and block installation into the src/build dir
 if test "$prefix" = "$PWD"; then
@@ -300,7 +300,7 @@
 AC_CONFIG_FILES(pyext/Makefile pyext/rivet/Makefile pyext/setup.py)
 AC_CONFIG_FILES(data/Makefile data/texmf/Makefile)
 AC_CONFIG_FILES(doc/Makefile)
-AC_CONFIG_FILES(doc/rivetversion.sty doc/diffanas)
+AC_CONFIG_FILES(doc/rivetversion.sty)
 AC_CONFIG_FILES(bin/Makefile bin/rivet-config bin/rivet-buildplugin)
 AC_CONFIG_FILES(rivetenv.sh rivetenv.csh rivet.pc)
 
--- a/doc/Makefile.am	Fri Dec 22 14:52:37 2017 +0000
+++ b/doc/Makefile.am	Fri Dec 22 17:47:10 2017 +0000
@@ -21,12 +21,23 @@
 endif
 
 
+if ENABLE_PYEXT
+DOCS += analyses.json
+analyses.json: $(top_srcdir)/analyses mk-analysis-json
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(LD_LIBRARY_PATH) \
+    DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(DYLD_LIBRARY_PATH) \
+    PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \
+    $(PYTHON) mk-analysis-json
+endif
+
+
+
 if WITH_PDFLATEX