Changeset 2399 for trunk


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

do not replace first argument of AC_COIN_PROJECTDIR_INIT

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/prepare_new_release

    r2395 r2399  
    349349  newLTAge=`calcLibtoolAge $stableURL $majVer $minVer`
    350350  # 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
     351  # this leads to exiting this script, which is somewhat unexpected
    352352  if test "$newLTAge" = 1 ; then
    353353    newLTAge=0
     
    429429# it's the commas that count. This does make for a surpassing ugly regular
    430430# expression.  A comma in the version string will cause a spectacular failure.
    431 # In AC_COIN_PROJECTDIR_INIT, take the attitude that the existing parameters
    432 # don't matter, we know what the release parameters should be.
     431# In AC_COIN_PROJECTDIR_INIT, take the attitude that there is one parameter
     432# with the PMs choosen project name which is preserved and we only add a
     433# libtool version number afterwards.
    433434
    434435  echo ''
     
    437438    sed -e "s|AC_INIT\(.*\),\(\[*\)[^],]*\(\]*\),\(.*\)|AC_INIT\1,\2$newVer\3,\4|" $i > bla
    438439    mv bla $i
    439     lastComponent=`echo $stableProj | sed -e 's|.*/\([^/][^/]*\)|\1|'`
    440     sed -e "s|AC_COIN_PROJECTDIR_INIT(.*)|AC_COIN_PROJECTDIR_INIT\($lastComponent,$newLTCurrent:$newLTRevision:$newLTAge\)|" $i > bla
     440    sed -e "s|AC_COIN_PROJECTDIR_INIT(\(.*\))|AC_COIN_PROJECTDIR_INIT\(\1,$newLTCurrent:$newLTRevision:$newLTAge\)|" $i > bla
    441441    mv bla $i
    442442    svn diff $i
Note: See TracChangeset for help on using the changeset viewer.