[yoda-svn] r546 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Nov 16 22:44:29 2012
New Revision: 546

Log:
Adding yoda-config script and bumping the version

Added:
   trunk/bin/yoda-config.in
Modified:
   trunk/ChangeLog
   trunk/bin/   (props changed)
   trunk/bin/Makefile.am
   trunk/configure.ac

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Fri Nov 16 22:33:41 2012	(r545)
+++ trunk/ChangeLog	Fri Nov 16 22:44:29 2012	(r546)
@@ -1,3 +1,7 @@
+2012-11-16  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Adding yoda-config
+
 2012-11-16  Hendrik Hoeth  <hendrik.hoeth at cern.ch>
 
 	* Adding WriterFLAT and yoda2flat

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	Fri Nov 16 22:33:41 2012	(r545)
+++ trunk/bin/Makefile.am	Fri Nov 16 22:44:29 2012	(r546)
@@ -1 +1 @@
-dist_bin_SCRIPTS = yoda2aida yoda2flat yoda-plot
+dist_bin_SCRIPTS = yoda-config yoda2aida yoda2flat yoda-plot

Added: trunk/bin/yoda-config.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/bin/yoda-config.in	Fri Nov 16 22:44:29 2012	(r546)
@@ -0,0 +1,62 @@
+#! /usr/bin/env bash
+## @configure_input@
+
+## These variables need to exist
+## Note no use of $DESTDIR... we ignore it so that destdir can be used
+## for temp installs later copied to /
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
+
+tmp=$(echo $* | egrep -- '--\<help\>|-\<h\>')
+if test $# -eq 0 || test -n "$tmp"; then
+    echo "yoda-config: configuration tool for the YODA data analysis library"
+    echo
+    echo "Usage: $( basename $0 ) [--help|-h] | "
+    echo "           [--{prefix,datadir,libdir,includedir}] | "
+    echo "           [--{cxxflags,ldflags,libs}] | "
+    echo "           [--version]"
+    echo "Options:"
+    echo "  --help | -h   : show this help message"
+    echo
+    echo "  --prefix      : show the installation prefix (cf. autoconf)"
+    echo "  --includedir  : show the path to the directory containing the YODA headers"
+    echo "  --libdir      : show the path to the directory containing the YODA libraries"
+    echo
+    echo "  --cxxflags    : returns a '-I' string for insertion into CPPFLAGS"
+    echo "  --libs        : returns a '-L/-l' string for insertion into LIBS or LIBADD"
+    echo
+    echo "  --version     : returns the YODA release version number"
+    exit 0
+fi
+
+OUT=""
+
+## "Atomic" build info
+tmp=$( echo "$*" | egrep -- '--\<prefix\>')
+test -n "$tmp" && OUT="$OUT @prefix@"
+
+tmp=$( echo "$*" | egrep -- '--\<includedir\>')
+test -n "$tmp" && OUT="$OUT @includedir@"
+
+tmp=$( echo "$*" | egrep -- '--\<libdir\>')
+test -n "$tmp" && OUT="$OUT @libdir@"
+
+## "Pre-rolled" build info
+tmp=$( echo "$*" | egrep -- '--\<cxxflags\>')
+if test -n "$tmp"; then
+    iyoda="@includedir@"
+    test -n "$iyoda" && OUT="$OUT -I${iyoda}"
+fi
+
+tmp=$( echo "$*" | egrep -- '--\<libs\>')
+if test -n "$tmp"; then
+    lyoda="@libdir@"
+    test -n "$lyoda" && OUT="$OUT -L${lyoda} -lYODA"
+fi
+
+## Version
+tmp=$( echo "$*" | egrep -- '--\<version\>')
+test -n "$tmp" && echo @PACKAGE_VERSION@ && exit 0
+
+echo $OUT

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Fri Nov 16 22:33:41 2012	(r545)
+++ trunk/configure.ac	Fri Nov 16 22:44:29 2012	(r546)
@@ -1,7 +1,7 @@
 ## Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([YODA],[0.4.0beta0],[yoda at projects.hepforge.org],[YODA])
+AC_INIT([YODA],[0.5.0beta0],[yoda at projects.hepforge.org],[YODA])
 AM_INIT_AUTOMAKE
 #AC_CONFIG_SRCDIR([src/Bin1D.cc])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -120,7 +120,7 @@
 
 AC_CEDAR_CHECKCXXFLAG([-pedantic], [AM_CXXFLAGS="$AM_CXXFLAGS -pedantic "])
 dnl ansi is implied by std=c++, listing it confuses clang
-dnl AC_CEDAR_CHECKCXXFLAG([-ansi], [AM_CXXFLAGS="$AM_CXXFLAGS -ansi "]) 
+dnl AC_CEDAR_CHECKCXXFLAG([-ansi], [AM_CXXFLAGS="$AM_CXXFLAGS -ansi "])
 AC_CEDAR_CHECKCXXFLAG([-Wall], [AM_CXXFLAGS="$AM_CXXFLAGS -Wall -Wno-format"])
 dnl AC_CEDAR_CHECKCXXFLAG([-Wno-long-long], [AM_CXXFLAGS="$AM_CXXFLAGS -Wno-long-long "])
 dnl Need to be C++98!
@@ -141,9 +141,8 @@
 AC_CONFIG_FILES([include/Makefile include/YODA/Makefile])
 AC_CONFIG_FILES([src/Makefile src/tinyxml/Makefile])
 AC_CONFIG_FILES([tests/Makefile])
-AC_CONFIG_FILES([bin/Makefile])
 AC_CONFIG_FILES([pyext/Makefile pyext/setup.py])
-#AC_CONFIG_FILES([bin/Makefile bin/yoda-config])
+AC_CONFIG_FILES([bin/Makefile bin/yoda-config])
 
 AC_OUTPUT