Improved OMPSs build script.
* build master branch version * add build date to prefix path
This commit is contained in:
parent
0b648f89d4
commit
a7960c93d3
1 changed files with 10 additions and 3 deletions
|
@ -23,6 +23,7 @@ COMPILER_VERSION=${COMPILER_VERSION:=}
|
||||||
CATEGORY="compiler"
|
CATEGORY="compiler"
|
||||||
PACKAGE="mcxx-nanox"
|
PACKAGE="mcxx-nanox"
|
||||||
VERSION="master"
|
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.
|
# add a descriptor at the end of the installation path e.g. for special config options etc.
|
||||||
PACKAGE_DESCRIPTOR=${PACKAGE_DESCRIPTOR:+-$PACKAGE_DESCRIPTOR}
|
PACKAGE_DESCRIPTOR=${PACKAGE_DESCRIPTOR:+-$PACKAGE_DESCRIPTOR}
|
||||||
|
@ -65,6 +66,8 @@ esac
|
||||||
|
|
||||||
|
|
||||||
PREFIX="${PREFIX_BASE}/${CATEGORY}/${PACKAGE}/${VERSION}-${COMPILER}-${COMPILER_VERSION}${PACKAGE_DESCRIPTOR}"
|
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
|
fi
|
||||||
|
|
||||||
|
|
||||||
echo -n "Installing Nanos++ runtime library... "
|
|
||||||
cd $nanox_src_dir
|
cd $nanox_src_dir
|
||||||
# tar jxf $NANOS_TAR
|
# tar jxf $NANOS_TAR
|
||||||
rm -rf autom4te.cache
|
rm -rf autom4te.cache
|
||||||
#git pull
|
#git pull
|
||||||
|
git checkout master
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
nanox_version=$(git rev-list -n 1 master)
|
nanox_version=$(git rev-list -n 1 master)
|
||||||
echo $nanox_version
|
echo $nanox_version
|
||||||
|
@ -123,18 +126,22 @@ if [ "$instrumentation" = "yes" ]; then
|
||||||
export CFLAGS="-DNANOS_INSTRUMENTATION_ENABLED"
|
export CFLAGS="-DNANOS_INSTRUMENTATION_ENABLED"
|
||||||
withextrae="--with-extrae=$PREFIX"
|
withextrae="--with-extrae=$PREFIX"
|
||||||
fi
|
fi
|
||||||
make_package $nanox_src_dir $withextrae $cudadir
|
|
||||||
|
|
||||||
|
|
||||||
echo -n "Installing Mercurium compiler... "
|
|
||||||
#tar jxf $MERCURIUM_TAR
|
#tar jxf $MERCURIUM_TAR
|
||||||
cd $mcxx_src_dir
|
cd $mcxx_src_dir
|
||||||
rm -rf autom4te.cache
|
rm -rf autom4te.cache
|
||||||
#git pull
|
#git pull
|
||||||
|
git checkout master
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
mcxx_version=$(git rev-list -n 1 master)
|
mcxx_version=$(git rev-list -n 1 master)
|
||||||
echo $mcxx_version
|
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
|
make_package $mcxx_src_dir --enable-openmpt
|
||||||
|
|
||||||
echo "mcxx: $mcxx_version" > $PREFIX/VERSION.txt
|
echo "mcxx: $mcxx_version" > $PREFIX/VERSION.txt
|
||||||
|
|
Loading…
Reference in a new issue