[Rivet-svn] rivet: 11 new changesets

Rivet Mercurial rivet at projects.hepforge.org
Fri Jun 23 17:30:02 BST 2017


details:   https://rivet.hepforge.org/hg/rivet/rev/e636801631b2
branches:  
changeset: 5884:e636801631b2
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 23 09:06:35 2017 +0100
description:
Tweak analysis build, install, uninstall

details:   https://rivet.hepforge.org/hg/rivet/rev/2dc189f24143
branches:  
changeset: 5885:2dc189f24143
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 23 09:39:17 2017 +0100
description:
OMP header compatibility

details:   https://rivet.hepforge.org/hg/rivet/rev/f65f4c94c191
branches:  
changeset: 5886:f65f4c94c191
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 23 10:21:25 2017 +0100
description:
Add + to buildplugin rule as suggested by make

details:   https://rivet.hepforge.org/hg/rivet/rev/e892d9c49171
branches:  
changeset: 5887:e892d9c49171
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 23 10:22:08 2017 +0100
description:
Add portable OpenMP enabling flags to AM_CXXFLAGS

details:   https://rivet.hepforge.org/hg/rivet/rev/ae3f00a2a9ec
branches:  
changeset: 5888:ae3f00a2a9ec
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 23 10:29:23 2017 +0100
description:
Split rand01 implementation into Tools/Random.hh/cc ... hopefully makes the OMP static map of RNGs safe!

details:   https://rivet.hepforge.org/hg/rivet/rev/b98adf88eafb
branches:  
changeset: 5889:b98adf88eafb
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 23 10:29:56 2017 +0100
description:
Oops, need the m4 OpenMP flag detector

details:   https://rivet.hepforge.org/hg/rivet/rev/908d149326f4
branches:  
changeset: 5890:908d149326f4
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 23 10:54:08 2017 +0100
description:
Remove GSL path from rivet-config output

details:   https://rivet.hepforge.org/hg/rivet/rev/5e1199c43964
branches:  
changeset: 5891:5e1199c43964
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 23 10:54:46 2017 +0100
description:
Remove GSL lib path from rivet-config output

details:   https://rivet.hepforge.org/hg/rivet/rev/a4dce590832a
branches:  
changeset: 5892:a4dce590832a
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 23 14:37:56 2017 +0100
description:
Add YODA and HepMC -l flags to the rivet-config output

details:   https://rivet.hepforge.org/hg/rivet/rev/4b9e8b4ce4f7
branches:  
changeset: 5893:4b9e8b4ce4f7
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 23 17:24:03 2017 +0100
description:
Include the std random header in Random.hh

details:   https://rivet.hepforge.org/hg/rivet/rev/d1c5ce48a71f
branches:  
changeset: 5894:d1c5ce48a71f
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jun 23 17:28:46 2017 +0100
description:
Oops, remove accidental inline

diffs (truncated from 363 to 50 lines):

--- a/Analyses/Makefile.am	Fri Jun 23 08:53:16 2017 +0100
+++ b/Analyses/Makefile.am	Fri Jun 23 17:28:46 2017 +0100
@@ -7,11 +7,11 @@
 PLUGIN_LIBS = $(patsubst plugin%,Rivet%Analyses.so,$(PLUGIN_DIRS))
 PLUGIN_DATAFILES = $(wildcard plugin*/*.info plugin*/*.plot plugin*/*.yoda)
 
-CLEANFILES = $(PLUGIN_LIBS) data
+CLEANFILES = $(PLUGIN_LIBS)
 EXTRA_DIST = $(PLUGIN_DIRS)
 
 %.so:
-	RIVET_BUILDPLUGIN_BEFORE_INSTALL=1 bash $(top_srcdir)/bin/rivet-buildplugin -j2 $@ $^
+	@+echo && RIVET_BUILDPLUGIN_BEFORE_INSTALL=1 bash $(top_srcdir)/bin/rivet-buildplugin -j2 $@ $^
 
 RivetALICEAnalyses.so: $(wildcard pluginALICE/*.cc)
 RivetATLASAnalyses.so: $(wildcard pluginATLAS/*.cc)
@@ -30,17 +30,22 @@
 RivetTOTEMAnalyses.so: $(wildcard pluginTOTEM/*.cc)
 
 all-local: $(PLUGIN_LIBS) $(PLUGIN_DATAFILES)
-	@mkdir -p $(builddir)/data
+	mkdir -p $(builddir)/data
 	@for i in $(PLUGIN_DATAFILES); do $(LN_S) -f ../$$i $(builddir)/data; done
 
+clean-local:
+	rm -rf data
+
 install-exec-local: $(PLUGIN_LIBS)
 	$(INSTALL) $^ $(DESTDIR)$(libdir)
 
 install-data-local: $(PLUGIN_DATAFILES)
-	$(install_sh_DATA) $^ $(DESTDIR)$(pkgdatadir)
+	@echo "Installing analysis data files..."
+	@$(install_sh_DATA) $^ $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
-	@cd $(DESTDIR)$(libdir) && rm -f $(PLUGIN_LIBS)
+	cd $(DESTDIR)$(libdir) && rm -f $(PLUGIN_LIBS)
+	@echo "Uninstalling analysis data files..."
 	@cd $(DESTDIR)$(pkgdatadir) && for i in $(PLUGIN_DATAFILES); do ds="$$ds `basename $$i`"; done && rm -f $$dd
 
 endif
--- a/ChangeLog	Fri Jun 23 08:53:16 2017 +0100
+++ b/ChangeLog	Fri Jun 23 17:28:46 2017 +0100
@@ -1,3 +1,7 @@
+2017-06-23  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add portable OpenMP enabling flags to AM_CXXFLAGS.
+
 2017-06-22  Andy Buckley  <andy.buckley at cern.ch>


More information about the Rivet-svn mailing list