Changeset 1800


Ignore:
Timestamp:
Nov 3, 2010 12:12:55 PM (9 years ago)
Author:
lou
Message:

Backmerge tweaks to coin-functions sucked up in r1799 to stable, to keep trunk
and stable/0.6 in sync.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/coin-functions

    r1798 r1800  
    2424# is longer:
    2525#   https://projects.coin-or.org/svn/BuildTools/ThirdParty/ProjName
    26 # Data is the real pain, with this form:
     26# Data is the real pain. Prior to 20101103 (1.0.x series), it had this form:
    2727#  https://projects.coin-or.org/svn/Data/trunk/ProjName
    2828#  https://projects.coin-or.org/svn/Data/stable/M.m/ProjName
    2929#  https://projects.coin-or.org/svn/Data/releases/M.m.r/ProjName
     30# After 20101103 (1.1 and subsequent), it uses the same layout as ThirdParty,
     31# namely <svn prefix>/Data/Projname/<trunk, stable, releases>. Macros below
     32# will cope, but really you should be using pre-1.1 Data anyway.
    3033
    3134# Extract the COIN base from the URL, up to svn. Just in case it ever changes.
     
    339342
    340343# Return the URL of the most recent stable branch matching the parameters.
    341 # A value of -1 for major or minor version is interpreted as `highest number'
     344# A value of -1 for major version is interpreted as `highest number'
    342345# Returns an empty string if no suitable stable branch exists.
    343346# usage: stableURL=`bestStable <URL> <major>`
     
    353356
    354357  case "$bstb_URL" in
     358    */Data/trunk/* )
     359        bstb_listURL=$bstb_baseURL/Data/stable
     360        ;;
    355361    */Data/* )
    356         bstb_listURL=$bstb_baseURL/Data/stable
     362        bstb_listURL=$bstb_baseURL/Data/$bstb_proj/stable
    357363        ;;
    358364    */ThirdParty/* )
     
    392398  if test -n "$bstb_filter" ; then
    393399
    394     # If we're dealing with old-style Data, we have to work a bit harder to find our
    395     # project. See if any of the filtered candidates contain the correct
    396     # project.
     400    # If we're dealing with old-style Data, we have to work a bit harder
     401    # to find our project. See if any of the filtered candidates contain
     402    # the correct project.
    397403
    398404    case "$bstb_URL" in
  • trunk/compile_f2c

Note: See TracChangeset for help on using the changeset viewer.