[Rivet-svn] r1810 - in trunk: . include/Rivet

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Sep  2 14:32:11 2009
New Revision: 1810

Log:
Re-enabling doc build

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/include/Rivet/Analysis.hh

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Wed Sep  2 14:29:32 2009	(r1809)
+++ trunk/ChangeLog	Wed Sep  2 14:32:11 2009	(r1810)
@@ -1,5 +1,10 @@
 2009-09-02  Andy Buckley  <andy at insectnation.org>
 
+	* Adding analysis info file path search with RIVET_DATA_PATH
+	variable (and using this to fix doc build.)
+
+	* Improvements to AnalysisLoader path search.
+
 	* Moving analysis sources back into single directory, after a
 	proletarian uprising ;)
 

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	Wed Sep  2 14:29:32 2009	(r1809)
+++ trunk/Makefile.am	Wed Sep  2 14:32:11 2009	(r1810)
@@ -1,6 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src pyext data include bin plugindemo
-# doc
+SUBDIRS = src pyext data include bin plugindemo doc
 
 doc:
 	cd doc && $(MAKE) doc

Modified: trunk/include/Rivet/Analysis.hh
==============================================================================
--- trunk/include/Rivet/Analysis.hh	Wed Sep  2 14:29:32 2009	(r1809)
+++ trunk/include/Rivet/Analysis.hh	Wed Sep  2 14:32:11 2009	(r1810)
@@ -368,6 +368,9 @@
 
   protected:
 
+    /// Name passed to constructor (used to find .info analysis data file, and as a fallback)
+    string _defaultname;
+
     /// Pointer to analysis metadata object
     shared_ptr<AnalysisInfo> _info;