":" was a poor choice for a field delimeter for the version number
because "svnversion" may emit a version number with ":" in it (duh!). This fixes the problem where, depending on the status of your svn checkout, you could get a string in a MAJOR version number instead of an integer (i.e., "1234M" instead of "10"). This was caused by extraneous ":" in the output, causing autogen.sh to grab the wrong field. This commit was SVN r1991.
Этот коммит содержится в:
родитель
de00ca3429
Коммит
2271910f22
14
autogen.sh
14
autogen.sh
@ -501,13 +501,13 @@ EOF
|
||||
|
||||
pd_get_ver="../../../../config/ompi_get_version.sh"
|
||||
pd_ver="`sh $pd_get_ver $pd_ver_file --all`"
|
||||
pd_ver_full="`echo $pd_ver | cut -d: -f1`"
|
||||
pd_ver_major="`echo $pd_ver | cut -d: -f2`"
|
||||
pd_ver_minor="`echo $pd_ver | cut -d: -f3`"
|
||||
pd_ver_release="`echo $pd_ver | cut -d: -f4`"
|
||||
pd_ver_alpha="`echo $pd_ver | cut -d: -f5`"
|
||||
pd_ver_beta="`echo $pd_ver | cut -d: -f6`"
|
||||
pd_ver_svn="`echo $pd_ver | cut -d: -f7`"
|
||||
pd_ver_full="`echo $pd_ver | awk '{ print $1 }'`"
|
||||
pd_ver_major="`echo $pd_ver | awk '{ print $2 }'`"
|
||||
pd_ver_minor="`echo $pd_ver | awk '{ print $3 }'`"
|
||||
pd_ver_release="`echo $pd_ver | awk '{ print $4 }'`"
|
||||
pd_ver_alpha="`echo $pd_ver | awk '{ print $5 }'`"
|
||||
pd_ver_beta="`echo $pd_ver | awk '{ print $6 }'`"
|
||||
pd_ver_svn="`echo $pd_ver | awk '{ print $7 }'`"
|
||||
cat >> $pd_list_file <<EOF
|
||||
|
||||
MCA_${pd_component_type}_NO_CONFIGURE_SUBDIRS="$pd_dir \$MCA_${pd_component_type}_NO_CONFIGURE_SUBDIRS"
|
||||
|
@ -37,7 +37,7 @@ else
|
||||
|
||||
if test "$OMPI_SVN_VERSION" != "0"; then
|
||||
if test -d .svn; then
|
||||
ver=`svnversion .`
|
||||
ver="r`svnversion .`"
|
||||
else
|
||||
ver="svn`date '+%m%d%Y'`"
|
||||
fi
|
||||
@ -73,7 +73,7 @@ case "$option" in
|
||||
echo $OMPI_SVN_VERSION
|
||||
;;
|
||||
--all)
|
||||
echo ${OMPI_VERSION}:${OMPI_MAJOR_VERSION}:${OMPI_MINOR_VERSION}:${OMPI_RELEASE_VERSION}:${OMPI_ALPHA_VERSION}:${OMPI_BETA_VERSION}:${OMPI_SVN_VERSION}
|
||||
echo ${OMPI_VERSION} ${OMPI_MAJOR_VERSION} ${OMPI_MINOR_VERSION} ${OMPI_RELEASE_VERSION} ${OMPI_ALPHA_VERSION} ${OMPI_BETA_VERSION} ${OMPI_SVN_VERSION}
|
||||
;;
|
||||
-h|--help)
|
||||
cat <<EOF
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user