Changeset 2395


Ignore:
Timestamp:
Jul 16, 2011 9:34:24 AM (9 years ago)
Author:
stefan
Message:

disable build for thirdparty projects without get-script; workaround issue with decrementing to 0 via expr

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/prepare_new_release

    r2289 r2395  
    2020#       Change handling of externals so the svn:externals is left pointing to
    2121#       releases but Dependencies is left pointing to stable branches.
     22# Modified: Stefan Vigerske    HU       2011-07-16
     23#       Do not attempt to configure/make/make test ThirdParty projects that
     24#       do not have a get-script, since this fails in most cases (which is
     25#       the expected behaviour).
    2226
    2327#set -x -v
     
    344348  newLTRevision=$newRel
    345349  newLTAge=`calcLibtoolAge $stableURL $majVer $minVer`
    346   newLTAge=`expr $newLTAge - 1`
     350  # expr returns with status 1 if the result of the calculation is 0
     351  # this leads to exiting this script, which is a bit unexpected
     352  if test "$newLTAge" = 1 ; then
     353    newLTAge=0
     354  else
     355    newLTAge=`expr $newLTAge - 1`
     356  fi
    347357  newLTVer=${newLTCurrent}:${newLTRevision}:${newLTAge}
    348358  echo "Libtool version.....: $newLTVer"
     
    645655
    646656# Finally! Done processing externals. If this is a ThirdParty project, we
    647 # still have to run the get script.
    648 
     657# still have to run the get script, if there is one.
     658
     659isThirdPartyWithoutGet=no
    649660if test $isThirdParty = yes ; then
    650661  if test -x get.$stableProj ; then
     
    653664    echo ''
    654665    ./get.$stableProj
     666  else
     667    isThirdPartyWithoutGet=yes
    655668  fi
    656669fi
     
    676689# work above to set externals.
    677690
    678 if test $isNormal = yes ; then
     691if test $isNormal = yes && test $isThirdPartyWithoutGet = no; then
    679692  (set -e
    680693   echo ''
     
    722735
    723736echo ''
    724 if test $isNormal = yes ; then
     737if test $isNormal = yes && test $isThirdPartyWithoutGet = no; then
    725738  echo 'Please review the output above, particularly the one of make test.'
    726739else
Note: See TracChangeset for help on using the changeset viewer.