[Opalvoip-svn] SF.net SVN: opalvoip:[34651] ptlib/trunk

[<rjo...@us...>]

Revision: 34651
          http://sourceforge.net/p/opalvoip/code/34651
Author:   rjongbloed
Date:     2016-03-01 19:45:51 +0000 (Tue, 01 Mar 2016)
Log Message:
-----------
Allow override of version number during configure

Modified Paths:
--------------
    ptlib/trunk/configure
    ptlib/trunk/make/my_macros.m4

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2016-03-01 15:51:27 UTC (rev 34650)
+++ ptlib/trunk/configure	2016-03-01 19:45:51 UTC (rev 34651)
@@ -7273,10 +7273,26 @@
 
 
 
-   major=`cat $VERSION_DIR/version.h | grep MAJOR_VERSION | cut -f3 -d' '`
-   minor=`cat $VERSION_DIR/version.h | grep MINOR_VERSION | cut -f3 -d' '`
-   build=`cat $VERSION_DIR/version.h | grep BUILD_NUMBER | cut -f3 -d' '`
-   stage=`cat $VERSION_DIR/version.h | grep BUILD_TYPE | cut -f 3 -d ' ' | sed 's/BetaCode/-beta/' | sed 's/AlphaCode/-alpha/' | sed 's/ReleaseCode/\./'`
+   if ${PTLIB_MAJOR+:} false; then :
+  major=$PTLIB[_MAJOR]
+else
+  major=`cat $VERSION_DIR/version.h | grep MAJOR_VERSION | cut -f3 -d' '`
+fi
+   if ${PTLIB_MINOR+:} false; then :
+  minor=$PTLIB[_MINOR]
+else
+  minor=`cat $VERSION_DIR/version.h | grep MINOR_VERSION | cut -f3 -d' '`
+fi
+   if ${PTLIB_BUILD+:} false; then :
+  build=$PTLIB[_BUILD]
+else
+  build=`cat $VERSION_DIR/version.h | grep BUILD_NUMBER  | cut -f3 -d' '`
+fi
+   if ${PTLIB_STAGE+:} false; then :
+  stage=$PTLIB[_STAGE]
+else
+  stage=`cat $VERSION_DIR/version.h | grep BUILD_TYPE    | cut -f 3 -d ' ' | sed 's/BetaCode/-beta/' | sed 's/AlphaCode/-alpha/' | sed 's/ReleaseCode/\./'`
+fi
    version="${major}.${minor}.${build}"
 
    if test -z "$major" -o -z "$minor" -o -z "$build"; then :
@@ -7291,7 +7307,7 @@
 
    PTLIB_STAGE=$stage
 
-   PTLIB_VERSION="${major}.${minor}.${build}"
+   PTLIB_VERSION="${version}"
 
 
 

Modified: ptlib/trunk/make/my_macros.m4
===================================================================
--- ptlib/trunk/make/my_macros.m4	2016-03-01 15:51:27 UTC (rev 34650)
+++ ptlib/trunk/make/my_macros.m4	2016-03-01 19:45:51 UTC (rev 34651)
@@ -302,10 +302,10 @@
 dnl $1 file location
 dnl $2 variable prefix
 AC_DEFUN([MY_VERSION_FILE],[
-   major=`cat $1 | grep MAJOR_VERSION | cut -f3 -d' '`
-   minor=`cat $1 | grep MINOR_VERSION | cut -f3 -d' '`
-   build=`cat $1 | grep BUILD_NUMBER | cut -f3 -d' '`
-   stage=`cat $1 | grep BUILD_TYPE | cut -f 3 -d ' ' | sed 's/BetaCode/-beta/' | sed 's/AlphaCode/-alpha/' | sed 's/ReleaseCode/\./'`
+   AS_VAR_SET_IF([$2[_MAJOR]],[major=$[$2[_MAJOR]]],[major=`cat $1 | grep MAJOR_VERSION | cut -f3 -d' '`])
+   AS_VAR_SET_IF([$2[_MINOR]],[minor=$[$2[_MINOR]]],[minor=`cat $1 | grep MINOR_VERSION | cut -f3 -d' '`])
+   AS_VAR_SET_IF([$2[_BUILD]],[build=$[$2[_BUILD]]],[build=`cat $1 | grep BUILD_NUMBER  | cut -f3 -d' '`])
+   AS_VAR_SET_IF([$2[_STAGE]],[stage=$[$2[_STAGE]]],[stage=`cat $1 | grep BUILD_TYPE    | cut -f 3 -d ' ' | sed 's/BetaCode/-beta/' | sed 's/AlphaCode/-alpha/' | sed 's/ReleaseCode/\./'`])
    version="${major}.${minor}.${build}"
 
    AS_IF([test -z "$major" -o -z "$minor" -o -z "$build"], AC_MSG_ERROR(Could not determine version number from $1))
@@ -314,7 +314,7 @@
    AC_SUBST($2[_MINOR], $minor)
    AC_SUBST($2[_BUILD], $build)
    AC_SUBST($2[_STAGE], $stage)
-   AC_SUBST($2[_VERSION], "${major}.${minor}.${build}")
+   AC_SUBST($2[_VERSION], "${version}")
 
    AC_DEFINE_UNQUOTED([$2[_MAJOR]],   [${major}], [Major version])
    AC_DEFINE_UNQUOTED([$2[_MINOR]],   [${minor}], [Minor version])

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.