Remove STABLE_BUILD option

diff --git a/candi.cfg b/candi.cfg
index ee969b001859f93ddd9fe495d37cd25df06544b5..67b6eb3847116acb06dd23bc1292ec63533bb3bd 100644 (file)
--- a/candi.cfg
+++ b/candi.cfg
@@ -82,15 +82,6 @@ PACKAGES="${PACKAGES} dealii"
 # Install the following deal.II version:
 DEAL_II_VERSION=v9.2.0
 
-# Option {ON|OFF}: Would you like to build stable version of deal.II?
-# If STABLE_BUILD=OFF, then the development version of deal.II will be
-# installed.
-STABLE_BUILD=ON
-
-if [ ${STABLE_BUILD} = OFF ]; then
-    DEAL_II_VERSION=master
-fi
-
 #########################################################################
 
 # If you want to use Trilinos, decide if you want v12.x.x (AUTO) or v11.x.x
@@ -108,7 +99,7 @@ MKL=OFF
 
 #########################################################################
 
-# If you have commits from the deal.II master to cherry-pick in STABLE_BUILD
+# If you have commits from the deal.II master to cherry-pick in stable version
 
 # bugfix for TrilinosWrapper::SparseMatrix ::add(factor, SparseMatrix)
 #DEAL_CHERRYPICKCOMMITS="8bcaf55df6754238b2e4e41bf6a5dd276a97bdd2 ${DEAL_CHERRYPICKCOMMITS}"

diff --git a/candi.sh b/candi.sh
index 192c9a9ea3c489aaf0ed112506749c5b3fcf5227..0f49fa64b454dd592fb5a988ccf347aa109243de 100755 (executable)
--- a/candi.sh
+++ b/candi.sh
@@ -342,21 +342,13 @@ package_fetch () {
             quit_if_fail "candi: git clone ${SOURCE}${NAME} ${EXTRACTSTO} failed"
         else
             cd ${EXTRACTSTO}
-            git checkout master --force
-            quit_if_fail "candi: git checkout master --force failed"
+            git checkout ${VERSION} --force
+            quit_if_fail "candi: git checkout ${VERSION} --force failed"
 
             git pull
             quit_if_fail "candi: git pull failed"
             cd ..
         fi
-
-        if [ ${STABLE_BUILD} = ON ]; then
-            cd ${EXTRACTSTO}
-            git checkout ${VERSION} --force
-            quit_if_fail "candi: git checkout ${VERSION} --force failed"
-            cd ..
-        fi
-
     elif [ ${PACKING} = "hg" ]; then
         cd ${UNPACK_PATH}
         # Suitably clone or update hg repositories
@@ -672,7 +664,6 @@ default INSTALL_PATH=${PREFIX_PATH}
 default CONFIGURATION_PATH=${INSTALL_PATH}/configuration
 
 default CLEAN_BUILD=OFF
-default STABLE_BUILD=ON
 default DEVELOPER_MODE=OFF
 
 default PACKAGES_OFF=""
@@ -867,15 +858,6 @@ for PACKAGE in ${PACKAGES[@]}; do
 done
 echo
 
-
-echo "-------------------------------------------------------------------------------"
-if [ ${STABLE_BUILD} = ON ]; then
-    cecho ${INFO} "Building stable releases of ${PROJECT} packages."
-else
-    cecho ${WARN} "Building development versions of ${PROJECT} packages."
-fi
-echo
-
 # if the program 'module' is available, output the currently loaded modulefiles
 if builtin command -v module > /dev/null; then
     echo "-------------------------------------------------------------------------------"
@@ -1094,12 +1076,6 @@ for PACKAGE in ${PACKAGES[@]}; do
     # Fetch information pertinent to the package
     source ${PROJECT}/packages/${PACKAGE}.package
 
-    # Turn to a stable version of the package if that's what the user
-    # wants and it exists
-    if [ ${STABLE_BUILD} = ON ] && [ -e ${PROJECT}/packages/${PACKAGE}-stable.package ]; then
-        source ${PROJECT}/packages/${PACKAGE}-stable.package
-    fi
-
     # Ensure that the package file is sanely constructed
     if [ ! "${BUILDCHAIN}" ]; then
         cecho ${BAD} "${PACKAGE}.package is not properly formed. Please check that all necessary variables are defined."

diff --git a/deal.II-toolchain/packages/dealii-stable.package b/deal.II-toolchain/packages/dealii-stable.package
deleted file mode 100644 (file)
index 6a01e73..0000000
--- a/deal.II-toolchain/packages/dealii-stable.package
+++ /dev/null
@@ -1,10 +0,0 @@
-VERSION=${DEAL_II_VERSION}
-NAME=dealii.git
-EXTRACTSTO=deal.II-${VERSION}
-SOURCE=https://github.com/dealii/
-PACKING=git
-BUILDCHAIN=cmake
-
-#########################################################################
-BUILDDIR=${BUILD_PATH}/deal.II-${VERSION}
-INSTALL_PATH=${ORIG_INSTALL_PATH}/deal.II-${VERSION}

diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 0ea6e4d64080392856fe56501293f7cb40b45cf4..5b06381f7397b7e918ad3bc21a5eca70ca98d4b4 100644 (file)
--- a/deal.II-toolchain/packages/dealii.package
+++ b/deal.II-toolchain/packages/dealii.package
@@ -1,4 +1,4 @@
-VERSION=master
+VERSION=${DEAL_II_VERSION}
 NAME=dealii.git
 EXTRACTSTO=deal.II-${VERSION}
 SOURCE=https://github.com/dealii/

diff --git a/deal.II-toolchain/platforms/deprecated/ubuntu14.platform b/deal.II-toolchain/platforms/deprecated/ubuntu14.platform
index 1fc6f06375636e6ef764ab2cf06cad4574710dc4..7ee026d367b5f3c94f2a3f7d305fd8702bdc9e08 100644 (file)
--- a/deal.II-toolchain/platforms/deprecated/ubuntu14.platform
+++ b/deal.II-toolchain/platforms/deprecated/ubuntu14.platform
@@ -20,7 +20,7 @@
 # version number is not set to AUTO.
 # The last point is due to own compilers (e.g. intel) which support
 # Trilinos 12.
-if [ ${STABLE_BUILD} = ON ] && [ ${DEAL_II_VERSION} == "v8.3.0" ] && [ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]; then
+if [ ${DEAL_II_VERSION} ~= "master" ] && [ ${DEAL_II_VERSION} == "v8.3.0" ] && [ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]; then
   TRILINOS_MAJOR_VERSION=11
 fi