[Rivet-svn] r4240 - in trunk: . doc pyext src/Core src/Tools test

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Thu Apr 4 20:33:29 BST 2013
Previous message: [Rivet-svn] r4239 - trunk/doc
Next message: [Rivet-svn] r4241 - trunk/src/Tools
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: buckley
Date: Thu Apr  4 20:33:29 2013
New Revision: 4240

Log:
Removing bundling of yaml-cpp: it needs to be installed by the user / bootstrap script from now on.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/doc/Makefile.am
   trunk/pyext/setup.py.in
   trunk/src/Core/Makefile.am
   trunk/src/Tools/   (props changed)
   trunk/src/Tools/Makefile.am
   trunk/test/Makefile.am

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Thu Apr  4 17:40:17 2013	(r4239)
+++ trunk/ChangeLog	Thu Apr  4 20:33:29 2013	(r4240)
@@ -1,3 +1,8 @@
+2013-04-04  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Removing bundling of yaml-cpp: it needs to be installed by the
+	user / bootstrap script from now on.
+
 2013-04-03  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Removing svn:external m4 directory, and converting Boost

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Thu Apr  4 17:40:17 2013	(r4239)
+++ trunk/configure.ac	Thu Apr  4 20:33:29 2013	(r4240)
@@ -45,6 +45,7 @@
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
+
 ## GNU Scientific Library
 AC_SEARCH_GSL
 AC_CEDAR_HEADERS([gsl], , , [AC_MSG_ERROR([GSL (GNU Scientific Library) is required])])
@@ -53,7 +54,7 @@
 AC_CHECK_HEADER([gsl/gsl_vector.h], [], [AC_MSG_ERROR([GSL vectors not found.])])
 CPPFLAGS=$oldCPPFLAGS
 
-## Boost C++ header library
+
 ## Boost utility library
 BOOST_REQUIRE([1.40.0])
 BOOST_FOREACH
@@ -63,12 +64,12 @@
 BOOST_FIND_HEADER([boost/assign.hpp])
 
 
-## YODA library
+## YODA histogramming library
 AC_CEDAR_LIBRARYANDHEADERS([YODA], , , [AC_MSG_ERROR([YODA is required])])
 ## TODO NEEDS TESTS HERE
 
 
-## HepMC library
+## HepMC event record library
 AC_CEDAR_LIBRARYANDHEADERS([HepMC], , , [AC_MSG_ERROR([HepMC is required])])
 oldCPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS -I$HEPMCINCPATH"
@@ -100,7 +101,7 @@
 CPPFLAGS=$oldCPPFLAGS
 
 
-## FastJet library
+## FastJet clustering library
 AC_CEDAR_LIBRARYANDHEADERS([fastjet], , , [AC_MSG_ERROR([FastJet is required])])
 AC_PATH_PROG(FJCONFIG, fastjet-config, [], $FASTJETPATH/bin:$PATH)
 if test -f "$FJCONFIG"; then
@@ -136,14 +137,8 @@
 CPPFLAGS=$oldCPPFLAGS
 
 
-## Build Doxygen if possible
-AC_ARG_ENABLE([doxygen],
-  [AC_HELP_STRING(--disable-doxygen, [don't try to make Doxygen documentation])],
-  [], [enable_doxygen=yes])
-if test x$enable_doxygen = xyes; then
-   AC_PATH_PROG(DOXYGEN, doxygen)
-fi
-AM_CONDITIONAL(WITH_DOXYGEN, [test x$DOXYGEN != x])
+## yaml-cpp metadata file parsing library
+AC_CEDAR_LIBRARYANDHEADERS([yaml-cpp], , , [AC_MSG_ERROR([yaml-cpp is required])])
 
 
 ## Disable build/install of standard analyses
@@ -204,16 +199,20 @@
 fi
 AM_CONDITIONAL(ENABLE_PDFMANUAL, [test x$enable_pdfmanual = xyes])
 
+## Build Doxygen documentation if possible
+AC_ARG_ENABLE([doxygen],
+  [AC_HELP_STRING(--disable-doxygen, [don't try to make Doxygen documentation])],
+  [], [enable_doxygen=yes])
+if test x$enable_doxygen = xyes; then
+   AC_PATH_PROG(DOXYGEN, doxygen)
+fi
+AM_CONDITIONAL(WITH_DOXYGEN, [test x$DOXYGEN != x])
 
 ## Build asciidoc docs if possible
 AC_PATH_PROG(ASCIIDOC, asciidoc)
 AM_CONDITIONAL(WITH_ASCIIDOC, [test x$ASCIIDOC != x])
 
 
-## Test to see if we have to install libyaml-cpp
-AC_CEDAR_LIBRARYANDHEADERS([yaml-cpp], , , [AC_MSG_NOTICE([Rivet will install the yaml-cpp library])])
-
-
 ## Python extension
 AC_ARG_ENABLE(pyext, [AC_HELP_STRING(--disable-pyext,
   [don't build Python module (default=build)])],
@@ -295,7 +294,7 @@
 
 ## Set default build flags
 AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include"
-#AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/include/eigen2"
+#AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/include/eigen3"
 AM_CPPFLAGS="$AM_CPPFLAGS \$(GSL_CPPFLAGS)"
 AM_CPPFLAGS="$AM_CPPFLAGS \$(BOOST_CPPFLAGS)"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(YODAINCPATH)"
@@ -331,7 +330,7 @@
 AC_CONFIG_FILES(include/Makefile include/Rivet/Makefile)
 AC_CONFIG_FILES(src/Makefile)
 AC_CONFIG_FILES(src/Core/Makefile)
-AC_CONFIG_FILES(src/Tools/Makefile src/Tools/yaml-cpp/Makefile)
+AC_CONFIG_FILES(src/Tools/Makefile)
 AC_CONFIG_FILES(src/Projections/Makefile)
 AC_CONFIG_FILES(src/Analyses/Makefile)
 AC_CONFIG_FILES(test/Makefile)

Modified: trunk/doc/Makefile.am
==============================================================================
--- trunk/doc/Makefile.am	Thu Apr  4 17:40:17 2013	(r4239)
+++ trunk/doc/Makefile.am	Thu Apr  4 20:33:29 2013	(r4240)
@@ -9,23 +9,17 @@
   rivet-manual.pdf hepunits.sty underscore.sty microtype.sty
 
 EXTRA_DIST = $(DOCSOURCES)
-
-if WITH_ASCIIDOC
-EXTRA_DIST += compare-histos.html make-plots.html
-endif
-
 DOCS =
 
-if ENABLE_PYEXT
 
+if ENABLE_PYEXT
 DOCS += analyses.html
 analyses.html: $(top_srcdir)/src/Analyses mk-analysis-html
-	LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(top_srcdir)/src/Tools/yaml-cpp/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(LD_LIBRARY_PATH):$(prefix)/lib \
-DYLD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(top_srcdir)/src/Tools/yaml-cpp/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(DYLD_LIBRARY_PATH):$(prefix)/lib \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(LD_LIBRARY_PATH):$(prefix)/lib \
+DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(DYLD_LIBRARY_PATH):$(prefix)/lib \
 RIVET_INFO_PATH=$(top_srcdir)/data/anainfo \
-PYTHONPATH=$(top_srcdir)/pyext:$(PYTHONPATH) \
+PYTHONPATH=$(top_builddir)/pyext:$(PYTHONPATH) \
 $(PYTHON) mk-analysis-html analyses.html
-
 endif
 
 
@@ -35,25 +29,18 @@
 DOCS += rivet-manual.pdf
 EXTRA_DIST += analyses.tex analyses.bib refs.bib
 
-
 if ENABLE_PYEXT
-
 analyses.bib analyses.tex: $(top_srcdir)/src/Analyses $(top_srcdir)/data/plotinfo $(top_srcdir)/data/anainfo mk-analysis-latex
 	LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(LD_LIBRARY_PATH) \
 DYLD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(DYLD_LIBRARY_PATH) \
 RIVET_INFO_PATH=$(top_srcdir)/data/anainfo \
 $(PYTHON) mk-analysis-latex
-
 else
-
 analyses.bib analyses.tex:
 	> analyses.tex
 	> analyses.bib
-
 endif
 
-
-#LATEX	= pdflatex
 LATEX	= pdflatex --interaction=nonstopmode
 BIBTEX	= bibtex
 MAKEINDEX = makeindex
@@ -78,6 +65,7 @@
 if WITH_ASCIIDOC
 
 DOCS += compare-histos.html make-plots.html
+EXTRA_DIST += compare-histos.html make-plots.html
 
 compare-histos.html: compare-histos.txt
 	asciidoc -a toc compare-histos.txt
@@ -93,13 +81,10 @@
 
 .PHONY = all doc upload arxivtar
 
-#all:
-#	@echo "Default make rule does nothing: use 'make doc'"
-
 doc: $(DOCS)
 	@true
 
-## TODO: Put Rivet version string in PDF filename for upload?
+# TODO: Put Rivet version string in PDF filename for upload?
 RSH=rsync
 DEST=login.hepforge.org:rivet/public_html/
 upload: $(DOCS)

Modified: trunk/pyext/setup.py.in
==============================================================================
--- trunk/pyext/setup.py.in	Thu Apr  4 17:40:17 2013	(r4239)
+++ trunk/pyext/setup.py.in	Thu Apr  4 20:33:29 2013	(r4240)
@@ -1,9 +1,10 @@
 #! /usr/bin/env python
 
-"""This is a simple SWIG wrapper on the main steering interface of
-the Rivet event simulation analysis library. It is used to create, query and
-use the Rivet C++ analysis classes from a Python program, of which the prime
-customer is Rivet's own command line interface.
+"""\
+A simple wrapper on the main steering interface of the Rivet event simulation
+analysis library. It is used to create, query and use the Rivet C++ analysis
+classes from a Python program: the prime customer is Rivet's own command line
+interface and associated scripts.
 """
 
 from distutils.core import setup, Extension
@@ -16,18 +17,12 @@
 libdir = os.path.abspath('@top_builddir@/src/.libs')
 libdir_yaml = '@YAML_CPPLIBPATH@'
 
-# TODO: remove along with the yaml-cpp bundling
-if not libdir_yaml:
-    libdir_yaml = '@top_builddir@/src/Tools/yaml-cpp/.libs'
-
-ext = Extension('_rivetwrap',
-                [wrapsrc],
-                define_macros = [('SWIG_TYPE_TABLE', 'hepmccompat')],
+ext = Extension('_rivetwrap', [wrapsrc],
                 include_dirs=[incdir_src, incdir_build, '@HEPMCINCPATH@', '@GSLINCPATH@'],
                 extra_compile_args= "-I at prefix@/include @BOOST_CPPFLAGS@ @CXXFLAGS@".split(),
                 library_dirs=[libdir, libdir_yaml, '@HEPMCLIBPATH@'],
                 extra_link_args = "-L at prefix@/lib @LDFLAGS@".split(),
-                libraries=['HepMC', 'Rivet'])
+                libraries=['Rivet']) # 'HepMC', 'fastjet', 'yaml-cpp', 'GSL', 'HepPID'
 
 ## Setup definition
 setup(name = 'Rivet',
@@ -35,10 +30,10 @@
       ext_package = 'rivet',
       ext_modules = [ext],
       py_modules = ['rivet.rivetwrap', 'rivet.__init__', 'rivet.plotinfo', 'rivet.util', 'rivet.spiresbib'],
-      author = ['Andy Buckley'],
-      author_email = 'andy.buckley at cern.ch',
-      url = 'http://projects.hepforge.org/rivet/',
-      description = 'Rivet: a Python interface to the Rivet high-energy physics analysis library.',
+      author = ['Rivet collaboration'],
+      author_email = 'rivet at projects.hepforge.org',
+      url = 'http://rivet.hepforge.org',
+      description = 'A Python interface to the Rivet high-energy physics analysis library.',
       long_description = __doc__,
       keywords = 'generator montecarlo simulation data hep physics particle validation analysis tuning',
       license = 'GPL'

Modified: trunk/src/Core/Makefile.am
==============================================================================
--- trunk/src/Core/Makefile.am	Thu Apr  4 17:40:17 2013	(r4239)
+++ trunk/src/Core/Makefile.am	Thu Apr  4 20:33:29 2013	(r4240)
@@ -6,10 +6,4 @@
   Analysis.cc AnalysisLoader.cc AnalysisInfo.cc \
   AnalysisHandler.cc Run.cc ProjectionHandler.cc HistoHandler.cc
 
-libRivetCore_la_CPPFLAGS = $(AM_CPPFLAGS)
-if WITHOUT_YAML_CPP
-libRivetCore_la_CPPFLAGS += -I$(top_srcdir)/src/Tools
-else
-libRivetCore_la_CPPFLAGS += -I$(YAML_CPPINCPATH)
-endif
-libRivetCore_la_CPPFLAGS += $(CPPFLAGS)
+libRivetCore_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(YAML_CPPINCPATH)

Modified: trunk/src/Tools/Makefile.am
==============================================================================
--- trunk/src/Tools/Makefile.am	Thu Apr  4 17:40:17 2013	(r4239)
+++ trunk/src/Tools/Makefile.am	Thu Apr  4 20:33:29 2013	(r4240)
@@ -1,7 +1,3 @@
-if WITHOUT_YAML_CPP
-SUBDIRS = yaml-cpp
-endif
-
 noinst_LTLIBRARIES = libRivetTools.la
 
 libRivetTools_la_SOURCES = \
@@ -23,10 +19,5 @@
   -DDEFAULTDATADIR=\"$(datadir)\" \
   -DDEFAULTLIBDIR=\"$(libdir)\"
 
-## NB. Using $(top_builddir)/src/Tools rather than $(builddir) because of SL4 automake bug
-if WITH_YAML_CPP
 libRivetTools_la_LDFLAGS = $(AM_LDFLAGS) -L$(YAML_CPPLIBPATH)
 libRivetTools_la_LIBADD = -lyaml-cpp
-else
-libRivetTools_la_LIBADD = $(top_builddir)/src/Tools/yaml-cpp/libyaml-cpp.la
-endif

Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am	Thu Apr  4 17:40:17 2013	(r4239)
+++ trunk/test/Makefile.am	Thu Apr  4 20:33:29 2013	(r4240)
@@ -25,7 +25,7 @@
   RIVET_REF_PATH=$(top_builddir)/data/refdata \
   RIVET_INFO_PATH=$(top_builddir)/data/anainfo \
   RIVET_ANALYSIS_PATH=$(top_builddir)/src/Analyses/.libs \
-  LD_LIBRARY_PATH=$(top_builddir)/src:$(top_builddir)/src/.libs:$(top_builddir)/src/Tools/yaml-cpp:$(top_builddir)/src/Tools/yaml-cpp/.libs:$(HEPMCLIBPATH):$(FASTJETLIBPATH):$$LD_LIBRARY_PATH \
+  LD_LIBRARY_PATH=$(top_builddir)/src:$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(FASTJETLIBPATH):$(YAML_CPPLIBPATH):$LD_LIBRARY_PATH \
   PYTHON_BUILD_DIR=$(top_builddir)/pyext/build \
   PATH=$(top_builddir)/bin:$(PATH)
Previous message: [Rivet-svn] r4239 - trunk/doc
Next message: [Rivet-svn] r4241 - trunk/src/Tools
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Rivet-svn mailing list