implements git cherry-pick for STABLE_BUILD

diff --git a/candi.cfg b/candi.cfg
index 6b631b6e56a4ab020cdc46504b5a3c7ae6b7f0c1..7d813be2ce109a31a70c4e62f22217bd537eefc1 100644 (file)
--- 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 fc33438afe53f805af2e2ce4682864d3d3458478..a2adfeb270d8c7fd8650ef37e2641bcdec94bea7 100755 (executable)
--- 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 1996c73d73167b722a14978bb8eada3ec253e5e0..fe42bb7adc519b9afb3dffcbfacddee5057680e4 100644 (file)
--- 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