[Rivet-svn] rivet: 7 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/69a630e034fc
branches:  
changeset: 5852:69a630e034fc
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jun 20 09:44:41 2017 +0200
description:
Remove unused dirs in data/

details:   https://rivet.hepforge.org/hg/rivet/rev/e9b3cab2adb9
branches:  
changeset: 5853:e9b3cab2adb9
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jun 20 09:51:46 2017 +0200
description:
Move analyses to top-level dir.

details:   https://rivet.hepforge.org/hg/rivet/rev/d0c6a6e9def9
branches:  
changeset: 5854:d0c6a6e9def9
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jun 20 10:44:00 2017 +0200
description:
Fix sub-build numbers from double application of -j

details:   https://rivet.hepforge.org/hg/rivet/rev/12428a277f83
branches:  
changeset: 5855:12428a277f83
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jun 20 11:23:28 2017 +0200
description:
Fix some globals in analysis cc files

details:   https://rivet.hepforge.org/hg/rivet/rev/cef859aa6ef1
branches:  
changeset: 5856:cef859aa6ef1
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jun 20 13:41:42 2017 +0200
description:
Fix test that broke after GSL removal

details:   https://rivet.hepforge.org/hg/rivet/rev/55710609874e
branches:  
changeset: 5857:55710609874e
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jun 20 13:58:57 2017 +0200
description:
Fix installation path for dat files

details:   https://rivet.hepforge.org/hg/rivet/rev/13f36bdcdc38
branches:  
changeset: 5858:13f36bdcdc38
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jun 20 15:23:30 2017 +0200
description:
Fix discrepancy with paper

diffs (truncated from 675888 to 50 lines):

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Analyses/Makefile.am	Tue Jun 20 15:23:30 2017 +0200
@@ -0,0 +1,47 @@
+AUTOMAKE_OPTIONS = -Wno-portability
+
+if ENABLE_ANALYSES
+
+PLUGIN_DIRS = $(wildcard plugin*)
+PLUGIN_NAMES = $(subst plugin,,$(PLUGIN_DIRS))
+PLUGIN_LIBS = $(patsubst plugin%,Rivet%Analyses.so,$(PLUGIN_DIRS))
+PLUGIN_DATAFILES = $(wildcard plugin*/*.info plugin*/*.plot plugin*/*.yoda)
+
+CLEANFILES = $(PLUGIN_LIBS)
+EXTRA_DIST = $(PLUGIN_DIRS)
+
+%.so:
+	RIVET_BUILDPLUGIN_BEFORE_INSTALL=1 bash $(top_srcdir)/bin/rivet-buildplugin -j2 $@ $^
+
+RivetALICEAnalyses.so: $(wildcard pluginALICE/*.cc)
+RivetATLASAnalyses.so: $(wildcard pluginATLAS/*.cc)
+RivetCDFAnalyses.so: $(wildcard pluginCDF/*.cc)
+RivetCMSAnalyses.so: $(wildcard pluginCMS/*.cc)
+RivetD0Analyses.so: $(wildcard pluginD0/*.cc)
+RivetHERAAnalyses.so: $(wildcard pluginHERA/*.cc)
+RivetLEPAnalyses.so: $(wildcard pluginLEP/*.cc)
+RivetLHCbAnalyses.so: $(wildcard pluginLHCb/*.cc)
+RivetLHCfAnalyses.so: $(wildcard pluginLHCf/*.cc)
+RivetMCAnalyses.so: $(wildcard pluginMC/*.cc)
+RivetMiscAnalyses.so: $(wildcard pluginMisc/*.cc)
+RivetPetraAnalyses.so: $(wildcard pluginPetra/*.cc)
+RivetRHICAnalyses.so: $(wildcard pluginRHIC/*.cc)
+RivetSPSAnalyses.so: $(wildcard pluginSPS/*.cc)
+RivetTOTEMAnalyses.so: $(wildcard pluginTOTEM/*.cc)
+
+all-local: $(PLUGIN_LIBS)
+
+# TODO: need dist and install hooks to strip out .hg dirs
+
+install-exec-local: $(PLUGIN_LIBS)
+	$(INSTALL) $^ $(DESTDIR)$(libdir)
+
+install-data-local: $(PLUGIN_DATAFILES)
+	@echo $^
+	$(install_sh_DATA) $^ $(DESTDIR)$(pkgdatadir)
+
+uninstall-local:
+	@cd $(DESTDIR)$(libdir) && rm -f $(PLUGIN_LIBS)
+	@cd $(DESTDIR)$(pkgdatadir) && rm -f $(PLUGIN_DATAFILES)
+
+endif