Changeset 2402


Ignore:
Timestamp:
Jul 16, 2011 1:11:23 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2401

Location:
stable/0.7
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin-functions

    r2231 r2402  
    536536# Count the total number of stable branches for the project for the specified
    537537# major version number, up to the specified minor version number (libtool age).
    538 # Returns 0 if handed a trunk url, or if the url is Data or BuildTools itself.
     538# Returns 0 if handed a trunk url, or if the url is BuildTools itself.
    539539# usage: calcLibtoolAge <svnURL> <major> <minor>
    540540
     
    551551  case "$cltc_URL" in
    552552    */Data/* )
    553         cltc_listURL=
     553        cltc_listURL=$cltc_baseURL/Data/$cltc_proj/stable
    554554        ;;
    555555    */ThirdParty/* )
     
    611611# Count the total number of stable branches for the project up to the
    612612# specified major.minor version number (libtool current).  Returns 0 if
    613 # handed a trunk url, or if the url is Data or BuildTools itself.
     613# handed a trunk url, or if the url is BuildTools itself.
    614614# usage: calcLibtoolCurrent <svnURL> <major> <minor>
    615615
     
    626626  case "$cltc_URL" in
    627627    */Data/* )
    628         cltc_listURL=
     628        cltc_listURL=$cltc_baseURL/Data/$cltc_proj/stable
    629629        ;;
    630630    */ThirdParty/* )
  • stable/0.7/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.7/prepare_new_release

    r2306 r2402  
    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
     
    205209      *Data/* )
    206210        isData=yes
    207         isNormal=no
    208211        ;;
    209212      *BuildTools/* )
     
    344347  newLTRevision=$newRel
    345348  newLTAge=`calcLibtoolAge $stableURL $majVer $minVer`
    346   newLTAge=`expr $newLTAge - 1`
     349  # expr returns with status 1 if the result of the calculation is 0
     350  # this leads to exiting this script, which is somewhat unexpected
     351  if test "$newLTAge" = 1 ; then
     352    newLTAge=0
     353  else
     354    newLTAge=`expr $newLTAge - 1`
     355  fi
    347356  newLTVer=${newLTCurrent}:${newLTRevision}:${newLTAge}
    348357  echo "Libtool version.....: $newLTVer"
     
    419428# it's the commas that count. This does make for a surpassing ugly regular
    420429# expression.  A comma in the version string will cause a spectacular failure.
    421 # In AC_COIN_PROJECTDIR_INIT, take the attitude that the existing parameters
    422 # don't matter, we know what the release parameters should be.
     430# In AC_COIN_PROJECTDIR_INIT, take the attitude that there is one parameter
     431# with the PMs choosen project name which is preserved and we only add a
     432# libtool version number afterwards.
    423433
    424434  echo ''
     
    427437    sed -e "s|AC_INIT\(.*\),\(\[*\)[^],]*\(\]*\),\(.*\)|AC_INIT\1,\2$newVer\3,\4|" $i > bla
    428438    mv bla $i
    429     lastComponent=`echo $stableProj | sed -e 's|.*/\([^/][^/]*\)|\1|'`
    430     sed -e "s|AC_COIN_PROJECTDIR_INIT(.*)|AC_COIN_PROJECTDIR_INIT\($lastComponent,$newLTCurrent:$newLTRevision:$newLTAge\)|" $i > bla
     439    sed -e "s|AC_COIN_PROJECTDIR_INIT(\(.*\))|AC_COIN_PROJECTDIR_INIT\(\1,$newLTCurrent:$newLTRevision:$newLTAge\)|" $i > bla
    431440    mv bla $i
    432441    svn diff $i
     
    645654
    646655# Finally! Done processing externals. If this is a ThirdParty project, we
    647 # still have to run the get script.
    648 
     656# still have to run the get script, if there is one.
     657
     658isThirdPartyWithoutGet=no
    649659if test $isThirdParty = yes ; then
    650660  if test -x get.$stableProj ; then
     
    653663    echo ''
    654664    ./get.$stableProj
     665  else
     666    isThirdPartyWithoutGet=yes
    655667  fi
    656668fi
     
    676688# work above to set externals.
    677689
    678 if test $isNormal = yes ; then
     690if test $isNormal = yes && test $isThirdPartyWithoutGet = no; then
    679691  (set -e
    680692   echo ''
     
    722734
    723735echo ''
    724 if test $isNormal = yes ; then
     736if test $isNormal = yes && test $isThirdPartyWithoutGet = no; then
    725737  echo 'Please review the output above, particularly the one of make test.'
    726738else
Note: See TracChangeset for help on using the changeset viewer.