From a7960c93d3e066dae1d60ff764fcdbf8376e8c53 Mon Sep 17 00:00:00 2001
From: Christoph Niethammer <niethammer@hlrs.de>
Date: Fri, 4 Mar 2011 13:51:37 +0000
Subject: [PATCH] Improved OMPSs build script.

* build master branch version
* add build date to prefix path
---
 mcxx-nanox_install.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/mcxx-nanox_install.sh b/mcxx-nanox_install.sh
index 985cc1d..450269e 100755
--- a/mcxx-nanox_install.sh
+++ b/mcxx-nanox_install.sh
@@ -23,6 +23,7 @@ COMPILER_VERSION=${COMPILER_VERSION:=}
 CATEGORY="compiler"
 PACKAGE="mcxx-nanox"
 VERSION="master"
+PACKAGE_DESCRIPTOR=${PACKAGE_DESCRIPTOR:="$(date +%Y-%m-%d)"}
 
 # add a descriptor at the end of the installation path e.g. for special config options etc.
 PACKAGE_DESCRIPTOR=${PACKAGE_DESCRIPTOR:+-$PACKAGE_DESCRIPTOR}
@@ -65,6 +66,8 @@ esac
 
 
 PREFIX="${PREFIX_BASE}/${CATEGORY}/${PACKAGE}/${VERSION}-${COMPILER}-${COMPILER_VERSION}${PACKAGE_DESCRIPTOR}"
+echo "PREFIX: $PREFIX"
+sleep 2
 
 
 
@@ -109,11 +112,11 @@ if [ "$instrumentation" = "yes" ]; then
 fi
 
 
-echo -n "Installing Nanos++ runtime library... "
 cd $nanox_src_dir
 # tar jxf $NANOS_TAR
 rm -rf autom4te.cache
 #git pull
+git checkout master
 ./autogen.sh
 nanox_version=$(git rev-list -n 1  master)
 echo $nanox_version
@@ -123,18 +126,22 @@ if [ "$instrumentation" = "yes" ]; then
     export CFLAGS="-DNANOS_INSTRUMENTATION_ENABLED"
     withextrae="--with-extrae=$PREFIX"
 fi
-make_package  $nanox_src_dir $withextrae $cudadir
 
 
-echo -n "Installing Mercurium compiler... "
 #tar jxf $MERCURIUM_TAR
 cd $mcxx_src_dir
 rm -rf autom4te.cache
 #git pull
+git checkout master
 ./autogen.sh
 mcxx_version=$(git rev-list -n 1  master)
 echo $mcxx_version
 
+PREFIX="${PREFIX_BASE}/${CATEGORY}/${PACKAGE}/${VERSION}-${COMPILER}-${COMPILER_VERSION}${PACKAGE_DESCRIPTOR}"
+
+echo -n "Installing Nanos++ runtime library... "
+make_package  $nanox_src_dir $withextrae $cudadir
+echo -n "Installing Mercurium compiler... "
 make_package  $mcxx_src_dir --enable-openmpt
 
 echo "mcxx:   $mcxx_version"  >  $PREFIX/VERSION.txt