Changeset 1799


Ignore:
Timestamp:
Nov 3, 2010 11:56:01 AM (9 years ago)
Author:
lou
Message:

Merge trunk r1715, r1797:1798; fix one more bug in prepare_new_stable.

Location:
stable/0.6
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6

  • stable/0.6/coin-functions

    r1695 r1799  
    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.
     
    8588    */Data/stable/* | */Data/releases/* )
    8689        epfu_pfxPat='svn/Data/[^/][^/]*/[0-9][0-9.]*/'
     90        ;;
     91    */Data/* )
     92        epfu_pfxPat='svn/Data/'
    8793        ;;
    8894    */ThirdParty/* )
     
    168174          evfu_pfxPat='svn/BuildTools/ThirdParty/[^/][^/]*/[^/][^/]*/'
    169175          ;;
     176      */Data/* )
     177          evfu_pfxPat='svn/Data/'$evfu_proj'/[^/][^/]*/'
     178          ;;
    170179      *)
    171180          evfu_pfxPat='svn/'$evfu_proj'/[^/][^/]*/'
     
    243252      */ThirdParty/* )
    244253          ejfu_pfxPat='svn/BuildTools/ThirdParty/[^/][^/]*/[^/][^/]*/'
     254          ;;
     255      */Data/* )
     256          ejfu_pfxPat='svn/Data/'$ejfu_proj'/[^/][^/]*/'
    245257          ;;
    246258      *)
     
    277289          emfu_pfxPat='svn/BuildTools/ThirdParty/[^/][^/]*/[^/][^/]*/'
    278290          ;;
     291      */Data/* )
     292          emfu_pfxPat='svn/Data/'$emfu_proj'/[^/][^/]*/'
     293          ;;
    279294      *)
    280295          emfu_pfxPat='svn/'$emfu_proj'/[^/][^/]*/'
     
    310325          erfu_pfxPat='svn/BuildTools/ThirdParty/[^/][^/]*/[^/][^/]*/'
    311326          ;;
     327      */Data/*)
     328          erfu_pfxPat='svn/Data/'$erfu_proj'/[^/][^/]*/'
     329          ;;
    312330      *)
    313331          erfu_pfxPat='svn/'$erfu_proj'/[^/][^/]*/'
     
    324342
    325343# Return the URL of the most recent stable branch matching the parameters.
    326 # 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'
    327345# Returns an empty string if no suitable stable branch exists.
    328346# usage: stableURL=`bestStable <URL> <major>`
     
    338356
    339357  case "$bstb_URL" in
     358    */Data/trunk/* )
     359        bstb_listURL=$bstb_baseURL/Data/stable
     360        ;;
    340361    */Data/* )
    341         bstb_listURL=$bstb_baseURL/Data/stable
     362        bstb_listURL=$bstb_baseURL/Data/$bstb_proj/stable
    342363        ;;
    343364    */ThirdParty/* )
     
    377398  if test -n "$bstb_filter" ; then
    378399
    379     # If we're dealing with Data, we have to work a bit harder to find our
    380     # project. See if any of the filtered candidates contain the correct
    381     # project.
    382 
    383     if expr "$bstb_URL" : '.*/Data/.*' >/dev/null 2>&1 ; then
    384       bstb_projPat='.*'$bstb_proj'/.*'
    385       # echo "Pattern: $bstb_projPat"
    386       for bstb_ver in $bstb_filter ; do
    387         if  expr "$bstb_ver" : $bstb_verPat >/dev/null 2>&1 ; then
    388           # echo "  url: $bstb_listURL/$bstb_ver"
    389           bstb_svnls2="`svn list $bstb_listURL/$bstb_ver`"
    390           # echo "  result: $bstb_svnls2"
    391           if expr "$bstb_svnls2" : $bstb_projPat >/dev/null 2>&1 ; then
    392             bstb_best=$bstb_ver
    393             # echo "  best: $bstb_best"
    394             break
     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.
     403
     404    case "$bstb_URL" in
     405      */Data/trunk/* | */Data/stable/* | */Data/releases/* )
     406        bstb_projPat='.*'$bstb_proj'/.*'
     407        # echo "Pattern: $bstb_projPat"
     408        for bstb_ver in $bstb_filter ; do
     409          if  expr "$bstb_ver" : $bstb_verPat >/dev/null 2>&1 ; then
     410            # echo "  url: $bstb_listURL/$bstb_ver"
     411            bstb_svnls2="`svn list $bstb_listURL/$bstb_ver`"
     412            # echo "  result: $bstb_svnls2"
     413            if expr "$bstb_svnls2" : $bstb_projPat >/dev/null 2>&1 ; then
     414              bstb_best=$bstb_ver
     415              # echo "  best: $bstb_best"
     416              break
     417            fi
    395418          fi
    396         fi
    397       done
    398       bstb_bestURL=$bstb_listURL/$bstb_best$bstb_proj
    399     else
    400       bstb_bestURL=`echo $bstb_filter | sed -n -e 's|\([^/]*/\).*$|\1|p'`
    401       bstb_bestURL=$bstb_listURL/$bstb_bestURL
    402     fi
    403 
     419        done
     420        bstb_bestURL=$bstb_listURL/$bstb_best$bstb_proj
     421      ;;
     422      *)
     423        bstb_bestURL=`echo $bstb_filter | sed -n -e 's|\([^/]*/\).*$|\1|p'`
     424        bstb_bestURL=$bstb_listURL/$bstb_bestURL
     425      ;;
     426    esac
    404427  fi
    405428
     
    425448  case "$bstb_URL" in
    426449    */Data/* )
    427         bstb_listURL=$bstb_baseURL/Data/releases
     450        bstb_listURL=$bstb_baseURL/Data/$bstb_proj/releases
    428451        ;;
    429452    */ThirdParty/* )
     
    474497  if test -n "$bstb_filter" ; then
    475498
    476     # If we're dealing with Data, we have to work a bit harder to find our
     499    # If we're dealing with old-style Data, we have to work a bit harder to find our
    477500    # project. See if any of the filtered candidates contain the correct
    478501    # project.
    479502
    480     if expr "$bstb_URL" : '.*/Data/.*' >/dev/null 2>&1 ; then
    481       bstb_projPat='.*'$bstb_proj'/.*'
    482       # echo "Pattern: $bstb_projPat"
    483       for bstb_ver in $bstb_filter ; do
    484         if  expr "$bstb_ver" : $bstb_verPat >/dev/null 2>&1 ; then
    485           # echo "  url: $bstb_listURL/$bstb_ver"
    486           bstb_svnls2="`svn list $bstb_listURL/$bstb_ver`"
    487           # echo "  result: $bstb_svnls2"
    488           if expr "$bstb_svnls2" : $bstb_projPat >/dev/null 2>&1 ; then
    489             bstb_best=$bstb_ver
    490             # echo "  best: $bstb_best"
    491             break
     503    case "$bstb_URL" in
     504      */Data/trunk/* | */Data/stable/* | */Data/releases/* )
     505        bstb_projPat='.*'$bstb_proj'/.*'
     506        # echo "Pattern: $bstb_projPat"
     507        for bstb_ver in $bstb_filter ; do
     508          if  expr "$bstb_ver" : $bstb_verPat >/dev/null 2>&1 ; then
     509            # echo "  url: $bstb_listURL/$bstb_ver"
     510            bstb_svnls2="`svn list $bstb_listURL/$bstb_ver`"
     511            # echo "  result: $bstb_svnls2"
     512            if expr "$bstb_svnls2" : $bstb_projPat >/dev/null 2>&1 ; then
     513              bstb_best=$bstb_ver
     514              # echo "  best: $bstb_best"
     515              break
     516            fi
    492517          fi
    493         fi
    494       done
    495       bstb_bestURL=$bstb_listURL/$bstb_best$bstb_proj
    496     else
    497       bstb_bestURL=`echo $bstb_filter | sed -n -e 's|\([^/]*/\).*$|\1|p'`
    498       bstb_bestURL=$bstb_listURL/$bstb_bestURL
    499     fi
     518        done
     519        bstb_bestURL=$bstb_listURL/$bstb_best$bstb_proj
     520      ;;
     521      *)
     522        bstb_bestURL=`echo $bstb_filter | sed -n -e 's|\([^/]*/\).*$|\1|p'`
     523        bstb_bestURL=$bstb_listURL/$bstb_bestURL
     524      ;;
     525    esac
    500526
    501527  fi
  • stable/0.6/compile_f2c

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

    r1709 r1799  
    694694
    695695echo ''
    696 echo 'After reviewing the output above, you can create a new release by going into'
     696echo 'After reviewing the output above, you can create a new stable by going into'
    697697echo 'the directory'
    698698echo ''
Note: See TracChangeset for help on using the changeset viewer.