From 008cb9e0869cb8a4b2e84d9b31f79fda1aaaa088 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Tue, 16 Oct 2018 19:35:28 +0200 Subject: [PATCH] implements git cherry-pick for STABLE_BUILD --- candi.cfg | 8 ++++++++ candi.sh | 9 +++++++++ deal.II-toolchain/packages/dealii.package | 8 ++++++++ 3 files changed, 25 insertions(+) diff --git a/candi.cfg b/candi.cfg index 6b631b6..7d813be 100644 --- a/candi.cfg +++ b/candi.cfg @@ -91,8 +91,16 @@ MKL=OFF ######################################################################### +# If you have commits from the deal.II master to cherry-pick in STABLE_BUILD + +# bugfix for TrilinosWrapper::SparseMatrix ::add(factor, SparseMatrix) +DEAL_CHERRYPICKCOMMITS="8bcaf55df6754238b2e4e41bf6a5dd276a97bdd2" + +######################################################################### + # If you want to change the source code of one or multiple packages # switch on the developer mode to avoid a package fetch and unpack. # Note: a previous run of candi with the same settings must be done without # this mode! DEVELOPER_MODE=OFF + diff --git a/candi.sh b/candi.sh index fc33438..a2adfeb 100755 --- a/candi.sh +++ b/candi.sh @@ -350,6 +350,14 @@ package_fetch () { git checkout ${VERSION} --force quit_if_fail "candi: git checkout ${VERSION} --force failed" fi + + # git cherry-pick on commits given by ${CHERRYPICKCOMMITS} + if [ ${STABLE_BUILD} = true ] && [ ! -z "${CHERRYPICKCOMMITS}" ]; then + cecho ${INFO} "candi: git cherry-pick -X theirs ${CHERRYPICKCOMMITS}" + cd ${EXTRACTSTO} + git cherry-pick -X theirs ${CHERRYPICKCOMMITS} + quit_if_fail "candi: git cherry-pick -X theirs ${CHERRYPICKCOMMITS} failed" + fi elif [ ${PACKING} = "hg" ]; then cd ${UNPACK_PATH} @@ -1049,6 +1057,7 @@ for PACKAGE in ${PACKAGES[@]}; do unset CONFOPTS unset MAKEOPTS unset CONFIG_FILE + unset CHERRYPICKCOMMITS TARGETS=('' install) PROCS=${ORIG_PROCS} INSTALL_PATH=${ORIG_INSTALL_PATH} diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package index 1996c73..fe42bb7 100644 --- a/deal.II-toolchain/packages/dealii.package +++ b/deal.II-toolchain/packages/dealii.package @@ -46,6 +46,14 @@ if [ ${DEAL_II_VERSION} == "v8.5.1" ]; then fi fi +################################################################################ +# Check if we have commits to be cherry-picked by git + +if [ ! -z "${DEAL_CHERRYPICKCOMMITS}" ]; then + CHERRYPICKCOMMITS=" \ + ${DEAL_CHERRYPICKCOMMITS}" + cecho ${INFO} "deal.II: git cherry-pick -X theirs ${CHERRYPICKCOMMITS}" +fi ################################################################################ # Add additional packages, if present -- 2.39.5