chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make rc versions use release setup

Browse Source
This commit is contained in:
Phil Olynyk 2020-04-11 21:29:50 -04:00
parent de494907c7
commit 9d511fc91d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Building/Linux/mkDebian9.sh
View File

@ -14,6 +14,9 @@ if [[ ${VERSION} == *-* ]]; then
# Use ~ for prerelease information so that it sorts correctly compared to release # 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 # versions. See https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
IFS="-" read -r VERSION PRERELEASE <<< ${VERSION} IFS="-" read -r VERSION PRERELEASE <<< ${VERSION}
if [[ ${PRERELEASE} == *rc* ]]; then
RC=1
fi
VERSION="${VERSION}~${PRERELEASE}" VERSION="${VERSION}~${PRERELEASE}"
fi fi
GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h` 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" post_rem="clean_rm.sh"
# build folder (absolute path is better) # build folder (absolute path is better)
build_folder="/home/$USER/OSCAR/build" build_folder="/home/$USER/OSCAR/build"
if [ -n ${PRERELEASE} ]; then if [ -n ${PRERELEASE} ] && [ ${RC} ] ; then
appli_name=${appli_name}-test appli_name=${appli_name}-test
post_inst="ln_usrbin-test.sh" post_inst="ln_usrbin-test.sh"
pre_rem="rm_usrbin-test.sh" pre_rem="rm_usrbin-test.sh"

5
Building/Linux/mkUbuntu.sh
View File

@ -14,6 +14,9 @@ if [[ ${VERSION} == *-* ]]; then
# Use ~ for prerelease information so that it sorts correctly compared to release # 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 # versions. See https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
IFS="-" read -r VERSION PRERELEASE <<< ${VERSION} IFS="-" read -r VERSION PRERELEASE <<< ${VERSION}
if [[ ${PRERELEASE} == *rc* ]]; then
RC=1
fi
VERSION="${VERSION}~${PRERELEASE}" VERSION="${VERSION}~${PRERELEASE}"
fi fi
GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h` 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" post_rem="clean_rm.sh"
# build folder (absolute path is better) # build folder (absolute path is better)
build_folder="/home/$USER/OSCAR/build" build_folder="/home/$USER/OSCAR/build"
if [ -n ${PRERELEASE} ]; then if [ -n ${PRERELEASE} ] && [ -z ${RC} ] ; then
appli_name=${appli_name}-test appli_name=${appli_name}-test
post_inst="ln_usrbin-test.sh" post_inst="ln_usrbin-test.sh"
pre_rem="rm_usrbin-test.sh" pre_rem="rm_usrbin-test.sh"