From 403520cee5cd1595eaba6a4eb47def6844b02a8e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 20 Feb 2017 10:57:30 +0100
Subject: [PATCH] ENH: add tags marking user configuration sections
- as per bashrc,cshrc delimit with
"# USER EDITABLE PART"
"# END OF (NORMAL) USER EDITABLE PART"
this can help simplify any patching for system-building scripts etc.
---
etc/config.csh/ADIOS | 2 ++
etc/config.csh/CGAL | 2 ++
etc/config.csh/FFTW | 3 ++-
etc/config.csh/paraview | 3 ++-
etc/config.csh/vtk | 2 ++
etc/config.sh/ADIOS | 2 ++
etc/config.sh/CGAL | 2 ++
etc/config.sh/FFTW | 3 ++-
etc/config.sh/ccmio | 2 ++
etc/config.sh/gperftools | 3 ++-
etc/config.sh/metis | 3 ++-
etc/config.sh/paraview | 3 ++-
etc/config.sh/scotch | 3 ++-
etc/config.sh/vtk | 2 ++
14 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/etc/config.csh/ADIOS b/etc/config.csh/ADIOS
index efec3f760fb..64dce79c5ad 100644
--- a/etc/config.csh/ADIOS
+++ b/etc/config.csh/ADIOS
@@ -47,10 +47,12 @@
# be used during the build process. See further notes there.
#
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
set adios_version=ADIOS-1.11.1
setenv ADIOS_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using adios ($adios_version) -> $ADIOS_ARCH_PATH"
diff --git a/etc/config.csh/CGAL b/etc/config.csh/CGAL
index 0caa0c51d70..aab320bcab3 100644
--- a/etc/config.csh/CGAL
+++ b/etc/config.csh/CGAL
@@ -49,6 +49,7 @@
# be used during the build process.
#
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
set boost_version=boost_1_62_0
set cgal_version=CGAL-4.9
@@ -56,6 +57,7 @@ set cgal_version=CGAL-4.9
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using boost ($boost_version) -> $BOOST_ARCH_PATH"
diff --git a/etc/config.csh/FFTW b/etc/config.csh/FFTW
index 515c429e66c..d2e2c825295 100644
--- a/etc/config.csh/FFTW
+++ b/etc/config.csh/FFTW
@@ -47,11 +47,12 @@
# be used during the build process.
#
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
set fftw_version=fftw-3.3.5
-
setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using fftw ($fftw_version) -> $FFTW_ARCH_PATH"
diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index b2158117988..d1e306c5226 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -50,12 +50,13 @@
# unsetenv ParaView_VERSION # avoid using ThirdParty settings
#
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
setenv ParaView_VERSION 5.0.1
setenv ParaView_MAJOR detect # Automatically determine major version
-
set cmake_version=cmake-system
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if ( ! $?ParaView_DIR ) setenv ParaView_DIR
diff --git a/etc/config.csh/vtk b/etc/config.csh/vtk
index e09a0455704..27421c40906 100644
--- a/etc/config.csh/vtk
+++ b/etc/config.csh/vtk
@@ -41,6 +41,7 @@
# See the BuildIssues.txt about problems that can be encountered when using
# the 'plain' VTK sources.
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
set vtk_version=VTK-7.1.0
set mesa_version=mesa-13.0.1
@@ -48,6 +49,7 @@ set mesa_version=mesa-13.0.1
setenv VTK_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$vtk_version
setenv MESA_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa_version
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using vtk ($vtk_version) -> $VTK_DIR"
diff --git a/etc/config.sh/ADIOS b/etc/config.sh/ADIOS
index db7b3534a61..15fd0169f25 100644
--- a/etc/config.sh/ADIOS
+++ b/etc/config.sh/ADIOS
@@ -46,10 +46,12 @@
# for the appropriate MPI. Eg, libadios_openmpi-system
#
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
adios_version=ADIOS-1.11.1
export ADIOS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index 5f9c64b1b9f..837d0e438d3 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -48,6 +48,7 @@
# - boost_version / cgal_version variables are retained.
# - the LD_LIBRARY_PATH is not adjusted.
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
boost_version=boost_1_62_0
cgal_version=CGAL-4.9
@@ -55,6 +56,7 @@ cgal_version=CGAL-4.9
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
diff --git a/etc/config.sh/FFTW b/etc/config.sh/FFTW
index e3a6fee2fd6..73b99534a3c 100644
--- a/etc/config.sh/FFTW
+++ b/etc/config.sh/FFTW
@@ -46,11 +46,12 @@
# - fftw_version variable is retained.
# - the LD_LIBRARY_PATH is not adjusted.
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
fftw_version=fftw-3.3.5
-
export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
diff --git a/etc/config.sh/ccmio b/etc/config.sh/ccmio
index 6bd6aa42aca..28e7334e8e2 100644
--- a/etc/config.sh/ccmio
+++ b/etc/config.sh/ccmio
@@ -35,8 +35,10 @@
# A csh version is not needed, since the values here are only sourced
# during the wmake process
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
ccmio_version=libccmio-2.6.1
export CCMIO_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$ccmio_version
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
diff --git a/etc/config.sh/gperftools b/etc/config.sh/gperftools
index d42b46df215..da49c761670 100644
--- a/etc/config.sh/gperftools
+++ b/etc/config.sh/gperftools
@@ -46,11 +46,12 @@
# - gperftools_version variable are retained.
# - the LD_LIBRARY_PATH and PATH are not adjusted.
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
gperftools_version=gperftools-2.5
-
GPERFTOOLS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$gperftools_version
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
diff --git a/etc/config.sh/metis b/etc/config.sh/metis
index 54ecba0466f..403730b1bf9 100644
--- a/etc/config.sh/metis
+++ b/etc/config.sh/metis
@@ -52,9 +52,10 @@
# by creating an empty one with the same name at a user or site location.
#
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
METIS_VERSION=metis-5.1.0
-
export METIS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$METIS_VERSION
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 3db9b49cf7b..b1a4f245a81 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -53,12 +53,13 @@
# When _foamAddLib is unset (eg, called from makeParaView or from foamPV):
# - the ParaView_VERSION variable is retained.
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
ParaView_VERSION=5.0.1
ParaView_MAJOR=detect # Automatically determine major version
-
cmake_version=cmake-system
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
# Clean PATH and LD_LIBRARY_PATH
diff --git a/etc/config.sh/scotch b/etc/config.sh/scotch
index bb5e12bced0..7c8cb13587b 100644
--- a/etc/config.sh/scotch
+++ b/etc/config.sh/scotch
@@ -52,9 +52,10 @@
# by creating an empty one with the same name at a user or site location.
#
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
SCOTCH_VERSION=scotch_6.0.3
-
export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$SCOTCH_VERSION
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
diff --git a/etc/config.sh/vtk b/etc/config.sh/vtk
index e4295df927c..e4dc84c90f8 100644
--- a/etc/config.sh/vtk
+++ b/etc/config.sh/vtk
@@ -41,6 +41,7 @@
# See the BuildIssues.txt about problems that can be encountered when using
# the 'plain' VTK sources.
#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
vtk_version=VTK-7.1.0
mesa_version=mesa-13.0.1
@@ -48,6 +49,7 @@ mesa_version=mesa-13.0.1
export VTK_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$vtk_version
export MESA_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa_version
+# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
--
GitLab