Ignore:
Timestamp:
Dec 19, 2010 10:16:32 AM (10 years ago)
Author:
stefan
Message:

sync stable/0.6 with trunk rev.1915

Location:
stable/0.6
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6

  • stable/0.6/prepare_new_release

    r1820 r1916  
    5353
    5454printHelp=0
    55 ignoreBuildToolsMismatch=0
     55ignoreBuildToolsMismatch=no
     56mismatchBTExternals=
    5657suppressCheckout=0
    5758
     
    9899    case "$1" in
    99100      -h* | --h*) printHelp=1 ;;
    100       -i* | --i*) ignoreBuildToolsMismatch=1 ;;
     101      -i* | --i*)
     102           if expr "$1" : '.*-i.*=.*' 2>&1 >/dev/null ; then
     103             mismatchBTExternals=`echo $1 | sed -n -e 's/[^=]*=\(.*\)/\1/p'`
     104           else
     105             shift
     106             mismatchBTExternals=$1
     107           fi
     108           if test "x$mismatchBTExternals" = "xall" ; then
     109             ignoreBuildToolsMismatch=all
     110           else
     111             ignoreBuildToolsMismatch=partial
     112           fi
     113           ;;
    101114      -p* | --p*) suppressCheckout=1 ;;
    102115      -s* | --s*)
     
    233246  -b <BuildToolsURL>    URL for BuildTools; required to generate a release
    234247                        for a ThirdParty or Data project.
    235   -i                    Ignore BuildTools version mismatches in externals.
     248  -i <projectlist>      Ignore BuildTools version mismatches for the listed
     249                        externals (comma-separated list of project names,
     250                        e.g., -i Osi,Cbc). '-i all' ignores all mismatches.
    236251  -p                    Suppress checkout (useful for testing)
    237252  -s <projectlist>      Suppress conversion from stable to release for the
    238253                        listed externals (comma-separated list of project
    239                         names, e.g., -s Osi,Cbc).
     254                        names).
    240255  -x <projectlist>      Remove the listed projects from the list of externals
    241256                        (comma-separated list of project names).
     
    553568          testResult=`compareURLVersions "$ourBTURL" "$extBTURL"`
    554569          if test $testResult = no ; then
    555             echo "    WARNING: BuildTools mismatch: $ext_rel_url_notail uses $extBTURL"
    556             if test $ignoreBuildToolsMismatch = 0 ; then
    557                buildtoolsMismatch=1
     570            if test $ignoreBuildToolsMismatch = all || \
     571               expr "$mismatchBTExternals" : '.*'$ext_proj'.*' 2>&1 >/dev/null ; then
     572              echo "    WARNING: BuildTools mismatch: $ext_url_notail uses $extBTURL"
     573            else
     574              buildtoolsMismatch=1
     575              echo "    ERROR: BuildTools mismatch: $ext_url_notail uses $extBTURL"
    558576            fi
    559577          fi
    560578        fi
    561579      fi
    562 
    563580      echo "$ext_name  $ext_rel_url" >>Dependencies
    564581      ext_name=
     
    567584  done
    568585
    569 # If we have a BuildTools mismatch, and mismatch is not permitted, exit.
    570 
    571   if test $buildtoolsMismatch -gt $ignoreBuildToolsMismatch ; then
     586# If we have a BuildTools mismatch, exit.
     587
     588  if test $buildtoolsMismatch = 1 ; then
    572589    echo "Exiting due to BuildTools mismatches; use -i to ignore."
    573590    exit 2
    574591  fi
    575592
     593# Try to check out the externals. Try three times before failing.
    576594  echo ''
    577595  echo '===> Updating svn:externals property and checking out externals ...'
     
    579597
    580598  svn propset svn:externals -F Dependencies .
    581   svn update
     599  svn update ||
     600  { echo "Retry 1 ... " ; svn update ; } ||
     601  { echo "Retry 2 ... " ; svn update ; } ||
     602  { echo "Checkout of externals failed. Aborting." ; exit 3 ; }
    582603
    583604  if test -d ThirdParty ; then
Note: See TracChangeset for help on using the changeset viewer.