Changeset 2402 for stable/0.7/prepare_new_release
- Timestamp:
- Jul 16, 2011 1:11:23 PM (10 years ago)
- Location:
- stable/0.7
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/0.7
- Property svn:mergeinfo changed
/trunk merged: 2395,2399-2401
- Property svn:mergeinfo changed
-
stable/0.7/prepare_new_release
r2306 r2402 20 20 # Change handling of externals so the svn:externals is left pointing to 21 21 # 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). 22 26 23 27 #set -x -v … … 205 209 *Data/* ) 206 210 isData=yes 207 isNormal=no208 211 ;; 209 212 *BuildTools/* ) … … 344 347 newLTRevision=$newRel 345 348 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 347 356 newLTVer=${newLTCurrent}:${newLTRevision}:${newLTAge} 348 357 echo "Libtool version.....: $newLTVer" … … 419 428 # it's the commas that count. This does make for a surpassing ugly regular 420 429 # 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. 423 433 424 434 echo '' … … 427 437 sed -e "s|AC_INIT\(.*\),\(\[*\)[^],]*\(\]*\),\(.*\)|AC_INIT\1,\2$newVer\3,\4|" $i > bla 428 438 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 431 440 mv bla $i 432 441 svn diff $i … … 645 654 646 655 # 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 658 isThirdPartyWithoutGet=no 649 659 if test $isThirdParty = yes ; then 650 660 if test -x get.$stableProj ; then … … 653 663 echo '' 654 664 ./get.$stableProj 665 else 666 isThirdPartyWithoutGet=yes 655 667 fi 656 668 fi … … 676 688 # work above to set externals. 677 689 678 if test $isNormal = yes ; then690 if test $isNormal = yes && test $isThirdPartyWithoutGet = no; then 679 691 (set -e 680 692 echo '' … … 722 734 723 735 echo '' 724 if test $isNormal = yes ; then736 if test $isNormal = yes && test $isThirdPartyWithoutGet = no; then 725 737 echo 'Please review the output above, particularly the one of make test.' 726 738 else
Note: See TracChangeset
for help on using the changeset viewer.