Skip to content

Commit

Permalink
Add a per package _install_dir.
Browse files Browse the repository at this point in the history
  • Loading branch information
brettviren committed May 12, 2012
1 parent 9349bf7 commit d4c14c6
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
4 changes: 4 additions & 0 deletions grinst_install_root.sh
Expand Up @@ -16,6 +16,10 @@ grinst_install_root () {
untar "$tarball" "$unpacked"
mv root $unpacked

# pushd $unpacked
# patch -p1 < $grinst_dir/root-v5.32.02-cmake.patch
# popd

local srcdir=$(readlink -f $unpacked)

local blddir="$root_v${version}-cmake-build"
Expand Down
7 changes: 6 additions & 1 deletion grinst_install_vgm.sh
Expand Up @@ -7,7 +7,12 @@ grinst_install_vgm () {
eval $(grinst_setup geant4)
eval $(grinst_setup root)

url="https://vgm.svn.sourceforge.net/svnroot/vgm/tags/v${version}/vgm"
local url
if [ "$version" = "trunk" ] ; then
url="https://vgm.svn.sourceforge.net/svnroot/vgm/tags/trunk/vgm"
else
url="https://vgm.svn.sourceforge.net/svnroot/vgm/tags/v${version}/vgm"
fi
unpacked="vgm.${version}"
svnco $url $unpacked
pushd $unpacked
Expand Down
2 changes: 2 additions & 0 deletions grinst_setup.sh
Expand Up @@ -14,6 +14,8 @@ grinst_setup () {
local version=$(resolve ${package}_version)
install_dir=$grinst_target/install/$package/$version

echo "export $grinst_${package}_install_dir=$install_dir"

source $grinst_dir/grinst_setup_$package.sh
grinst_setup_$package $install_dir
}
4 changes: 4 additions & 0 deletions wbls.grinst
Expand Up @@ -5,6 +5,7 @@ grinst_install_target=$HOME/work/wbls/install
grinst_build_target=$HOME/work/wbls/tmp

# list of packages
#grinst_packages="cmake python ipython geant4 gccxml root vgmcmake"
grinst_packages="cmake python ipython geant4 gccxml root vgm"

# each package needs a _version variable
Expand All @@ -15,6 +16,9 @@ geant4_version=4.9.5.p01
gccxml_version=0.9.0_20120309
root_version=5.32.02
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

## REQUIRED KLUDGE

Expand Down

0 comments on commit d4c14c6

Please sign in to comment.