[Rivet-svn] r2739 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Oct 29 18:06:25 2010
New Revision: 2739

Log:
Making rivet-buildplugin use the same compiler as was used to build Rivet

Added:
   trunk/bin/rivet-buildplugin.in   (contents, props changed)
      - copied, changed from r2738, trunk/bin/rivet-buildplugin
Deleted:
   trunk/bin/rivet-buildplugin
Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Fri Oct 29 17:10:18 2010	(r2738)
+++ trunk/ChangeLog	Fri Oct 29 18:06:25 2010	(r2739)
@@ -1,5 +1,11 @@
 2010-10-29  Andy Buckley  <andy at insectnation.org>
 
+	* Making rivet-buildplugin use the same C++ compiler and CXXFLAGS
+	variable as used for the Rivet system build.
+
+	* Fixing NeutralFinalState projection to, erm, actually select
+	neutral particles (by Hendrik).
+
 	* Allow passing a general FinalState reference to the JetShape
 	projection, rather than requiring a VetoedFS.
 

Copied and modified: trunk/bin/rivet-buildplugin.in (from r2738, trunk/bin/rivet-buildplugin)
==============================================================================
--- trunk/bin/rivet-buildplugin	Fri Oct 29 17:10:18 2010	(r2738, copy source)
+++ trunk/bin/rivet-buildplugin.in	Fri Oct 29 18:06:25 2010	(r2739)
@@ -1,4 +1,6 @@
 #! /usr/bin/env bash
+## -*- sh -*-
+## @configure_input@
 
 ## Print help
 PROG=$(basename $0)
@@ -33,9 +35,14 @@
   shared_flags="-shared -fPIC"
 fi
 
-## Get a C++ compiler
-if [[ -z "$CXX" ]]; then
-    CXX=g++
+## Get Rivet system C++ compiler (fall back to $CXX and then g++ if needed)
+MYCXX=g++
+RIVETCXX=$(which "@CXX@" 2> /dev/null)
+ABSCXX=$(which "$CXX" 2> /dev/null)
+if [[ -x "$RIVETCXX" ]]; then
+    MYCXX="@CXX@"
+elif [[ -x "$ABSCXX" ]]; then
+    MYCXX=$CXX
 fi
 
 ## Link against ROOT if requested
@@ -67,6 +74,6 @@
 cppflags=$($RIVETCONFIG --cppflags)
 
 ## Build
-cmd="$CXX -o \"$libname\" $shared_flags $cppflags $sources_and_flags"
+cmd="$MYCXX -o \"$libname\" $shared_flags $cppflags $sources_and_flags"
 echo $cmd
 eval $cmd

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Fri Oct 29 17:10:18 2010	(r2738)
+++ trunk/configure.ac	Fri Oct 29 18:06:25 2010	(r2739)
@@ -308,7 +308,7 @@
 AC_CONFIG_FILES(doc/rivetversion.sty)
 AC_CONFIG_FILES(autopackage/default.apspec)
 AC_CONFIG_FILES(autopackage/data.apspec)
-AC_CONFIG_FILES(bin/Makefile bin/rivet-config)
+AC_CONFIG_FILES(bin/Makefile bin/rivet-config bin/rivet-buildplugin)
 AC_CONFIG_FILES(Makefile Doxyfile)
 AC_CONFIG_FILES(rivetenv.sh rivetenv.csh)
 
@@ -330,6 +330,9 @@
 For a more pleasant command line experience, you can include
 the data/rivet-completion file into your .bashrc file,
 or your bash_completion.d directory if you have one.
+
+The rivetenv.*sh files will not be installed, but can help you
+to set up a Rivet runtime environment in future.
 ************************************************************
 EOF
 fi