Changeset 1820


Ignore:
Timestamp:
Nov 5, 2010 10:18:54 AM (9 years ago)
Author:
lou
Message:

Merge r1817:1819 from trunk; tweaks for CoinBazaar?.

Location:
stable/0.6
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6

  • stable/0.6/coin-functions

    r1816 r1820  
    5959# BuildTools itself. ThirdParty lives in BuildTools as of 100628, so the
    6060# condition is redundant. Returns yes or no.
     61# 101105 Exclude CoinBazaar, which follows the Data pattern. May not be the
     62#        correct choice if any CoinBazaar projects use BuildTools
    6163# usage: isNormal=`isNormalURL $svnURL`
    6264
    6365isNormalURL ()
    6466{ case $1 in
    65     */BuildTools/* | */ThirdParty/* | */Data/* )
     67    */BuildTools/* | */ThirdParty/* | */Data/* | */CoinBazaar/* )
    6668       echo "no"
    6769       ;;
     
    128130    */BuildTools/* )
    129131        ;;
     132    */CoinBazaar/* )
     133        ;;
    130134    *)
    131135        etfe_pfxPat=
  • stable/0.6/compile_f2c

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

    r1816 r1820  
    409409    sed -e "s|AC_INIT\(.*\),\(\[*\)[^],]*\(\]*\),\(.*\)|AC_INIT\1,\2$newVer\3,\4|" $i > bla
    410410    mv bla $i
    411     sed -e "s|AC_COIN_PROJECTDIR_INIT(.*)|AC_COIN_PROJECTDIR_INIT\($stableProj,$newLTCurrent:$newLTRevision:$newLTAge\)|" $i > bla
     411    lastComponent=`echo $stableProj | sed -e 's|.*/\([^/][^/]*\)|\1|'`
     412    sed -e "s|AC_COIN_PROJECTDIR_INIT(.*)|AC_COIN_PROJECTDIR_INIT\($lastComponent,$newLTCurrent:$newLTRevision:$newLTAge\)|" $i > bla
    412413    mv bla $i
    413414    svn diff $i
Note: See TracChangeset for help on using the changeset viewer.