Permalink
Browse files

Fix merge.

  • Loading branch information...
2 parents d4c14c6 + d6a66b3 commit 63a127a0bac3d7dd9f93c1cbfe1a02a96743b527 @brettviren committed May 12, 2012
Showing with 83 additions and 10 deletions.
  1. +2 −2 grinst_install.sh
  2. +33 −0 grinst_install_hepmc.sh
  3. +0 −6 grinst_install_root.sh
  4. +3 −1 grinst_setup_gccxml.sh
  5. +14 −0 grinst_setup_hepmc.sh
  6. +30 −0 wbls-racf.grinst
  7. +1 −1 wbls.grinst
View
@@ -3,13 +3,13 @@
set_target () {
what=$1 ; shift
var=$(resolve grinst_${what}_target)
- if [ -n "${var}" ] ; then
+ if [ -n "${var}" ] ; then # explicitly defined
return
fi
if [ -z "$grinst_target" ] ; then
error "Can not set $var"
fi
- eval grinst_${what}_target=${grinst_target}_$what
+ eval grinst_${what}_target=${grinst_target}/$what
}
grinst_install () {
View
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# http://lcgapp.cern.ch/project/simu/HepMC/
+
+grinst_install_hepmc () {
+ local version=$1; shift
+ local prefix=$1 ; shift
+
+ eval $(grinst_setup cmake)
+
+ local unpacked="HepMC-$version"
+ local tarball="$unpacked.tar.gz"
+ local url="http://lcgapp.cern.ch/project/simu/HepMC/download/$tarball"
+
+ download "$url"
+ untar "$tarball" "$unpacked"
+
+ local srcdir=$(readlink -f $unpacked)
+
+ local blddir="$unpacked-cmake-build"
+ assuredir $blddir
+ pushd $blddir
+
+ echo 'Configuring with CLHEP/Geant4 units'
+ cmake $srcdir \
+ -DCMAKE_INSTALL_PREFIX=$prefix \
+ -Dmomentum:STRING=MEV \
+ -Dlength:STRING=MM
+
+ make $grinst_parallel
+ make install
+}
+
View
@@ -26,12 +26,6 @@ grinst_install_root () {
assuredir $blddir
pushd $blddir
- ## Debian + gcc 4.6.3 lacks some obsolete headers. Some but not
- ## all can be installed in a non-standard location. Reported to
- ## roottalk. Since it is not a full fix, don't bother here, but
- ## this is how non-standard locations can be injected:
- # -DCMAKE_CXX_FLAGS:STRING='-I/usr/include/lsb3/c++/backward'
-
cmake $srcdir \
-DCMAKE_INSTALL_PREFIX=$prefix
make $grinst_parallel
View
@@ -3,8 +3,10 @@
grinst_setup_gccxml () {
local prefix=$1; shift
+ PATH=$(pathadd $prefix/bin $PATH)
+
cat <<EOF
-export PATH=$(pathadd $prefix/bin $PATH)
+export PATH=$PATH
EOF
}
View
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+grinst_setup_hepmc () {
+ local prefix=$1; shift
+
+ PATH=$(pathadd $prefix/bin $PATH)
+ LD_LIBRARY_PATH=$(pathadd $prefix/lib $LD_LIBRARY_PATH)
+
+ cat <<EOF
+export PATH=$PATH
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+
+EOF
+}
View
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Where things are or to be installed
+#grinst_install_target=$HOME/work/wbls/install
+#grinst_build_target=$HOME/work/wbls/tmp
+grinst_target=/data3/lbne/bv/wbls
+
+# list of packages
+grinst_packages="cmake python ipython geant4 gccxml root vgm"
+
+# each package needs a _version variable
+cmake_version=2.8.7
+python_version=2.7.2
+ipython_version=0.12
+geant4_version=4.9.5.p01
+gccxml_version=0.9.0_20120309
+root_version=5.32.02
+vgm_version=3-05 # from sf svn
+hepmc_version=2.06.08
+
+## REQUIRED KLUDGE
+
+# Geant4 puts data in directories only partially named after version strings
+geant4_datadir=share/Geant4-9.5.1/data
+
+
+## OPTIONAL
+
+# parallel make
+grinst_parallel=-j4
View
@@ -15,7 +15,7 @@ ipython_version=0.12
geant4_version=4.9.5.p01
gccxml_version=0.9.0_20120309
root_version=5.32.02
-vgm_version=3.05 # from sf svn
+vgm_version=3-05 # from sf svn
#vgmcmake_version=trunk
#rootsvnpatches_version=5-32-00 # patches branch in svn
#rootsvnpatches_version=5-34-00 # patches branch in svn

0 comments on commit 63a127a

Please sign in to comment.