Skip to content

Commit

Permalink
Fixed local build script
Browse files Browse the repository at this point in the history
Proper commit checkout for terra.

Check for gcc version (we need 4.9).
  • Loading branch information
thesz committed Apr 6, 2016
1 parent 1450d4a commit 7764311
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions MS7/libs/scripts/setup-local-udp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

# Setting up the environment to build everything - download packages, build them, etc.

# Check for gcc version.
(gcc -v |& egrep "^gcc version 4.9") || (echo "needs gcc 4.9"; exit 1)

# Bolierplate reduction.
function clonepull {
git clone $1 $2 || (cd $2 ; git pull) || exit 1
Expand Down Expand Up @@ -54,10 +57,14 @@ export GASNET_BIN="$GASNET_ROOT/bin"
# -- Terra ---------------------------------------------------------------------
# Terra also unavailable on cluster.

clonepull https://github.com/zdevito/terra.git terra
git clone https://github.com/zdevito/terra.git terra # won't pull for a while.

cd terra

# Known good commit.
git checkout c501af43915


make all || exit 1
cd ..

Expand All @@ -66,13 +73,15 @@ export TERRA_DIR=$BUILDDIR/terra/release
# -- Legion --------------------------------------------------------------------
# We will build Legion by compiling one of the applications.

clonepull [email protected]:SKA-ScienceDataProcessor/legion.git Legion
git clone [email protected]:SKA-ScienceDataProcessor/legion.git Legion
cd Legion
git pull origin master

This comment has been minimized.

Copy link
@jorpic

jorpic Apr 18, 2016

git pull origin master merges origin/master into current branch (which is stable for this repo).
Seems this is not what you actually want to do.
To switch branch use git checkout master (without -b).
Or you can git clone --branch master <url> <dir> to clone and checkout master.

This comment has been minimized.

Copy link
@thesz

thesz Apr 18, 2016

Author Contributor

Thank you for spotting this!

git checkout -b master
cd ..

# Go to Regent place.
cd Legion/language

sh

# Running the installation, enabling the GASnet.
# TODO: optionally enable CUDA.
CONDUIT=udp ./install.py --with-terra=$TERRA_DIR --gasnet || exit 1
Expand Down

0 comments on commit 7764311

Please sign in to comment.