[cig-commits] [commit] master: config scripts changed to clean up messages (e.g., those related to objc). (75b5bd5)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Apr 21 09:22:56 PDT 2014
Repository : ssh://geoshell/snac
On branch : master
Link : https://github.com/geodynamics/snac/compare/197ac8ef4118a7f1707c1d0c5f6efbbea35cced1...75b5bd584b96840a7ff2df6cc8ceb2419f5f6b08
>---------------------------------------------------------------
commit 75b5bd584b96840a7ff2df6cc8ceb2419f5f6b08
Author: Eunseo Choi <eunseo.choi at gmail.com>
Date: Mon Apr 21 10:14:01 2014 -0600
config scripts changed to clean up messages (e.g., those related to objc).
>---------------------------------------------------------------
75b5bd584b96840a7ff2df6cc8ceb2419f5f6b08
Snac/VMake/Config/mpi-config.sh | 2 +-
Snac/VMake/build-functions.sh | 2 +-
Snac/plugins/temperature/Heat.c | 2 +-
StGermain/VMake/Config/mpi-config.sh | 2 +-
StGermain/VMake/build-functions.sh | 2 +-
VMake/Config/mpi-config.sh | 2 ++
VMake/configure.sh | 56 ++++++++++++++++++------------------
7 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/Snac/VMake/Config/mpi-config.sh b/Snac/VMake/Config/mpi-config.sh
index 695781b..3f132d5 100755
--- a/Snac/VMake/Config/mpi-config.sh
+++ b/Snac/VMake/Config/mpi-config.sh
@@ -77,7 +77,7 @@ if test "${MPI_LIBFILES}x" = "x"; then
MPI_LIBFILES='-lmpich'
setValueWithDefault MPI_LIBRARY 'mpich'
elif test "${MPI_IMPLEMENTATION}" = "mpich"; then
- MPI_LIBFILES='-lmpich -lpmpich'
+ MPI_LIBFILES='-lmpich'
setValueWithDefault MPI_LIBRARY 'mpich'
else
MPI_LIBFILES='-lmpi'
diff --git a/Snac/VMake/build-functions.sh b/Snac/VMake/build-functions.sh
index 0ac17b8..faeed0c 100644
--- a/Snac/VMake/build-functions.sh
+++ b/Snac/VMake/build-functions.sh
@@ -390,7 +390,7 @@ EOF
}
markAsBuilding() {
- echo " $1 Marked as a project building built"
+ echo " $1 Marked as a project to be built"
cat <<EOF > ./create-env.tmp
BUILDING_$1=1
EOF
diff --git a/Snac/plugins/temperature/Heat.c b/Snac/plugins/temperature/Heat.c
index 49d623e..2c47792 100644
--- a/Snac/plugins/temperature/Heat.c
+++ b/Snac/plugins/temperature/Heat.c
@@ -49,7 +49,7 @@ void SnacTemperature_LoopNodes( void* _context ) {
Node_LocalIndex node_lI;
Journal_Printf( context->debug, "In %s(): updating temperature of all nodes.\n", __func__ );
- Journal_Printf( context->snacInfo, "In %s(): updating temperature of all nodes.\n", __func__ );
+ //Journal_Printf( context->snacInfo, "In %s(): updating temperature of all nodes.\n", __func__ );
for( node_lI = 0; node_lI < context->mesh->nodeLocalCount; node_lI++ ) {
Snac_Heat( context, node_lI, 0 );
diff --git a/StGermain/VMake/Config/mpi-config.sh b/StGermain/VMake/Config/mpi-config.sh
index 4956e05..27dd970 100755
--- a/StGermain/VMake/Config/mpi-config.sh
+++ b/StGermain/VMake/Config/mpi-config.sh
@@ -73,7 +73,7 @@ if test "${MPI_LIBFILES}x" = "x"; then
MPI_LIBFILES='-lmpich'
setValueWithDefault MPI_LIBRARY 'mpich'
elif test "${MPI_IMPLEMENTATION}" = "mpich"; then
- MPI_LIBFILES='-lmpich -lpmpich'
+ MPI_LIBFILES='-lmpich'
setValueWithDefault MPI_LIBRARY 'mpich'
else
MPI_LIBFILES='-lmpi'
diff --git a/StGermain/VMake/build-functions.sh b/StGermain/VMake/build-functions.sh
index 0ac17b8..faeed0c 100644
--- a/StGermain/VMake/build-functions.sh
+++ b/StGermain/VMake/build-functions.sh
@@ -390,7 +390,7 @@ EOF
}
markAsBuilding() {
- echo " $1 Marked as a project building built"
+ echo " $1 Marked as a project to be built"
cat <<EOF > ./create-env.tmp
BUILDING_$1=1
EOF
diff --git a/VMake/Config/mpi-config.sh b/VMake/Config/mpi-config.sh
index 48a1110..9b0d4bd 100755
--- a/VMake/Config/mpi-config.sh
+++ b/VMake/Config/mpi-config.sh
@@ -70,9 +70,11 @@ if test "${MPI_LIBFILES}x" = "x"; then
case ${SYSTEM} in
Linux|CYGWIN|Darwin|SunOS|ranger)
if test "${MPI_IMPLEMENTATION}" = "mpich2"; then
+ echo ${MPI_IMPLEMENTATION}
MPI_LIBFILES='-lmpich -lpmpich'
setValueWithDefault MPI_LIBRARY 'mpich'
elif test "${MPI_IMPLEMENTATION}" = "mpich"; then
+ echo ${MPI_IMPLEMENTATION}
MPI_LIBFILES='-lmpich -lpmpich'
setValueWithDefault MPI_LIBRARY 'mpich'
else
diff --git a/VMake/configure.sh b/VMake/configure.sh
index 9b99f9b..bbfb59a 100755
--- a/VMake/configure.sh
+++ b/VMake/configure.sh
@@ -657,25 +657,25 @@ if ! DoConftest ./VMake/SystemTests/Endian SYSTEM_BIG_ENDIAN; then
fi
export SYSTEM_BIG_ENDIAN
-if test "${OBJCC}x" = "x"; then
- case ${CC_TYPE} in
- gnu)
- OBJCC="${CC} -x objective-c";;
- *)
- echo "Warning: OBJCC for C compiler \"${CC_TYPE}\" unknown. Please set if needed.";;
- esac
- export OBJCC
-fi
+#if test "${OBJCC}x" = "x"; then
+# case ${CC_TYPE} in
+# gnu)
+# OBJCC="${CC} -x objective-c";;
+# *)
+# echo "Warning: OBJCC for C compiler \"${CC_TYPE}\" unknown. Please set if needed.";;
+# esac
+# export OBJCC
+#fi
-if test "${OBJECTIVEC_LIBS}x" = "x"; then
- case ${CC_TYPE} in
- gnu)
- OBJECTIVEC_LIBS="-lobjc";;
- *)
- echo "Warning: OBJECTIVEC_LIBS for C compiler \"${CC_TYPE}\" unknown. Please set if needed.";;
- esac
- export OBJCECTIVEC_LIBS
-fi
+#if test "${OBJECTIVEC_LIBS}x" = "x"; then
+# case ${CC_TYPE} in
+# gnu)
+# OBJECTIVEC_LIBS="-lobjc";;
+# *)
+# echo "Warning: OBJECTIVEC_LIBS for C compiler \"${CC_TYPE}\" unknown. Please set if needed.";;
+# esac
+# export OBJCECTIVEC_LIBS
+#fi
@@ -1282,16 +1282,16 @@ if test "${DL_INCLUDES}x" = "x"; then
export DL_INCLUDES
fi
-if test "${DOXYGEN}x" = "x"; then
- DOXYGEN=`${WHICH} doxygen 2> /dev/null`
- if whichFailed "${DOXYGEN}"; then
- DOXYGEN="/usr/bin/doxygen"
- fi
- warnValidExecutable "${DOXYGEN}" doxygen
- export DOXYGEN
-else
- warnValidExecutableInput "${DOXYGEN}" doxygen
-fi
+#if test "${DOXYGEN}x" = "x"; then
+# DOXYGEN=`${WHICH} doxygen 2> /dev/null`
+# if whichFailed "${DOXYGEN}"; then
+# DOXYGEN="/usr/bin/doxygen"
+# fi
+# warnValidExecutable "${DOXYGEN}" doxygen
+# export DOXYGEN
+#else
+# warnValidExecutableInput "${DOXYGEN}" doxygen
+#fi
if test "${SVN}x" = "x"; then
More information about the CIG-COMMITS
mailing list