Commit fcc2b128 authored by Matthieu Boileau's avatar Matthieu Boileau
Browse files

Rename base directories

parent e248fc11
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ LIB_NAME="AMD-APP-SDK"
LIB_VERSION=3.0.130.136

SUB_DIR=${LIB_NAME}/${LIB_VERSION}
WORK_DIR=${PREWORK_DIR}/${SUB_DIR}
WORK_DIR=${BASE_WORK_DIR}/${SUB_DIR}
SRC_DIR=${WORK_DIR}/${LIB_NAME}
TARBALL="${LIB_NAME}Installer-v${LIB_VERSION}-GA-linux64.tar.bz2"
INSTALL_SCRIPT="${LIB_NAME}-v${LIB_VERSION}-GA-linux64.sh"
+3 −3
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ pip install envtpl
Set your custom paths in `common.sh` for the 3 directories:

```bash
PREWORK_DIR=${SOFT_DIR}/sources  # sources download and compilation top directory
PREINSTALL_DIR=${SOFT_DIR}/install  # libraries installation top directory
PREMODULE_DIR=${SOFT_DIR}/modules  # modulefiles top directory
BASE_WORK_DIR=${SOFT_DIR}/sources  # sources download and compilation top directory
BASE_INSTALL_DIR=${SOFT_DIR}/install  # libraries installation top directory
BASE_MODULE_DIR=${SOFT_DIR}/modules  # modulefiles top directory
```

These directories will be created if they don't exist.
+3 −3
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@ LIB_VERSION=8.200.2
LIB_FULLNAME=${LIB_NAME}-${LIB_VERSION}
LIB_VERSION_SHORT="${LIB_VERSION%.*}"
SUB_DIR=${LIB_NAME}/${LIB_VERSION}
WORK_DIR=${PREWORK_DIR}/${SUB_DIR}
WORK_DIR=${BASE_WORK_DIR}/${SUB_DIR}
SRC_DIR=${WORK_DIR}/${LIB_FULLNAME}
ARCHIVE=${SRC_DIR}.tar.xz
URL="https://downloads.sourceforge.net/project/arma/armadillo-${LIB_VERSION}.tar.xz?r=http%3A%2F%2Farma.sourceforge.net%2Fdownload.html&ts=1510843687&use_mirror=freefr"
BUILD_DIR=${WORK_DIR}/${LIB_FULLNAME}-build
INSTALL_DIR=${PREINSTALL_DIR}/${SUB_DIR}
INSTALL_DIR=${BASE_INSTALL_DIR}/${SUB_DIR}
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
MODULE_DIR=${PREMODULE_DIR}/libs/${LIB_NAME}
MODULE_DIR=${BASE_MODULE_DIR}/libs/${LIB_NAME}
MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}


+3 −3
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ GCC_SHORT="gcc${GCC_VERSION//.}"
MPI_FULL=${MPI_LIB}-${MPI_VERSION}
MPI_SHORT="${MPI_LIB}${MPI_VERSION//.}"
SUB_DIR=${LIB_NAME}/${LIB_VERSION}/${GCC_FULL}/${MPI_FULL}
WORK_DIR=${PREWORK_DIR}/${SUB_DIR}
WORK_DIR=${BASE_WORK_DIR}/${SUB_DIR}
SRC_DIR=${WORK_DIR}/${LIB_FULLNAME}
ARCHIVE=${SRC_DIR}.tar.gz
URL="https://sourceforge.net/projects/boost/files/boost/${LIB_VERSION}/boost_${LIB_VERSION_DOWNLOAD}.tar.gz"
BUILD_DIR=${WORK_DIR}/${LIB_FULLNAME}-build
INSTALL_DIR=${PREINSTALL_DIR}/${SUB_DIR}
INSTALL_DIR=${BASE_INSTALL_DIR}/${SUB_DIR}
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
MODULE_DIR=${PREMODULE_DIR}/libs/${LIB_NAME}
MODULE_DIR=${BASE_MODULE_DIR}/libs/${LIB_NAME}
MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${GCC_SHORT}_${MPI_SHORT}

install_lib()
+3 −3
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ GCC_VERSION_PATCH=`echo "${GCC_VERSION}" | sed 's/[0-9][.][0-9][.]\([0-9]\)/\1/g
DEPEND_GCC=gcc-${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
DEPEND_MODULE_GCC=gcc${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}

SOURCE_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
SOURCE_DIR=${BASE_WORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
BUILD_DIR=${PREBUILD_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}/build
INSTALL_DIR=${PREINSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
MODULE_DIR=${PREMODULE_DIR}/compilers/${LIB_NAME}
INSTALL_DIR=${BASE_INSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
MODULE_DIR=${BASE_MODULE_DIR}/compilers/${LIB_NAME}
MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_GCC}


Loading