pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-07-05 13:20:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.psi.ch:Pmodules/src

Browse Source
This commit is contained in:
gsell
2017-05-17 12:57:35 +02:00
parent e48198af59 1daace6713
commit 8e18b46ed2
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/modbuild
+7 -9
View File
@@ -267,16 +267,8 @@ fi
[[ -n ${BUILD_BLOCK} ]] || std::die 1 "No build-block specified!"
[[ -r ${BUILD_BLOCK} ]] || std::die 1 "${BUILD_BLOCK}: no such file!"
# :FIXME: move to library?
# :FIXME: implement this with OS/system dependend plugins
declare -r OS
case ${OS} in
Darwin )
declare -x MACOSX_DEPLOYMENT_TARGET='10.9'
#declare -rx SDKROOT='macosx10.9'
;;
esac
# source Pmodule environment configuration
if [[ "${bootstrap}" == "yes" ]]; then
@@ -285,10 +277,16 @@ if [[ "${bootstrap}" == "yes" ]]; then
source "${BUILD_BLOCK_DIR}/../config/${pmodule_environment}"
declare -r BUILD_BASEDIR=$(std::get_abspath "${BUILD_BLOCK_DIR}/..")
if [[ -r "${BUILD_BLOCK_DIR}/../config/modbuild.conf" ]]; then
source "${BUILD_BLOCK_DIR}/../config/modbuild.conf"
fi
elif [[ -n ${PMODULES_ROOT} ]] && [[ -n ${PMODULES_CONFIG_DIR} ]] && \
[[ -r ${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}/${pmodule_environment} ]]; then
source ${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}/${pmodule_environment}
declare -r BUILD_BASEDIR=$(std::get_abspath "${BUILD_BLOCK_DIR}/../..")
if [[ -r "${PMODULES_ROOT}/config/modbuild.conf" ]]; then
source "${PMODULES_ROOT}/config/modbuild.conf"
fi
else
std::die 3 "Build environment not setup properbly!"