From 9d511fc91dbbb1130ae413a0e44b30af7166ee51 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Sat, 11 Apr 2020 21:29:50 -0400 Subject: [PATCH] Make rc versions use release setup --- Building/Linux/mkDebian9.sh | 5 ++++- Building/Linux/mkUbuntu.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Building/Linux/mkDebian9.sh b/Building/Linux/mkDebian9.sh index 83859194..c4571dc2 100755 --- a/Building/Linux/mkDebian9.sh +++ b/Building/Linux/mkDebian9.sh @@ -14,6 +14,9 @@ if [[ ${VERSION} == *-* ]]; then # Use ~ for prerelease information so that it sorts correctly compared to release # versions. See https://www.debian.org/doc/debian-policy/ch-controlfields.html#version IFS="-" read -r VERSION PRERELEASE <<< ${VERSION} + if [[ ${PRERELEASE} == *rc* ]]; then + RC=1 + fi VERSION="${VERSION}~${PRERELEASE}" fi GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h` @@ -26,7 +29,7 @@ pre_rem="rm_usrbin.sh" post_rem="clean_rm.sh" # build folder (absolute path is better) build_folder="/home/$USER/OSCAR/build" -if [ -n ${PRERELEASE} ]; then +if [ -n ${PRERELEASE} ] && [ ${RC} ] ; then appli_name=${appli_name}-test post_inst="ln_usrbin-test.sh" pre_rem="rm_usrbin-test.sh" diff --git a/Building/Linux/mkUbuntu.sh b/Building/Linux/mkUbuntu.sh index e96e5276..eb9c76a9 100755 --- a/Building/Linux/mkUbuntu.sh +++ b/Building/Linux/mkUbuntu.sh @@ -14,6 +14,9 @@ if [[ ${VERSION} == *-* ]]; then # Use ~ for prerelease information so that it sorts correctly compared to release # versions. See https://www.debian.org/doc/debian-policy/ch-controlfields.html#version IFS="-" read -r VERSION PRERELEASE <<< ${VERSION} + if [[ ${PRERELEASE} == *rc* ]]; then + RC=1 + fi VERSION="${VERSION}~${PRERELEASE}" fi GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h` @@ -26,7 +29,7 @@ pre_rem="rm_usrbin.sh" post_rem="clean_rm.sh" # build folder (absolute path is better) build_folder="/home/$USER/OSCAR/build" -if [ -n ${PRERELEASE} ]; then +if [ -n ${PRERELEASE} ] && [ -z ${RC} ] ; then appli_name=${appli_name}-test post_inst="ln_usrbin-test.sh" pre_rem="rm_usrbin-test.sh"