Changeset 1820

Timestamp:

Nov 5, 2010 10:18:54 AM (11 years ago)

Author:

lou

Message:

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

Location:

stable/0.6

Files:

• . (modified) (1 prop)
• coin-functions (modified) (2 diffs)
• compile_f2c (modified) (1 prop)
• prepare_new_release (modified) (1 diff)

stable/0.6/coin-functions

@@ -59 +59 @@
 # BuildTools itself. ThirdParty lives in BuildTools as of 100628, so the
 # condition is redundant. Returns yes or no.
+# 101105 Exclude CoinBazaar, which follows the Data pattern. May not be the
+#        correct choice if any CoinBazaar projects use BuildTools
 # usage: isNormal=`isNormalURL $svnURL`
 
 isNormalURL ()
 { case $1 in
-    */BuildTools/* | */ThirdParty/* | */Data/* )
+    */BuildTools/* | */ThirdParty/* | */Data/* | */CoinBazaar/* )
        echo "no"
        ;;
@@ -128 +130 @@
     */BuildTools/* )
         ;;
+    */CoinBazaar/* )
+        ;;
     *)
         etfe_pfxPat=

stable/0.6/prepare_new_release

@@ -409 +409 @@
     sed -e "s|AC_INIT\(.*\),\(\[*\)[^],]*\(\]*\),\(.*\)|AC_INIT\1,\2$newVer\3,\4|" $i > bla
     mv bla $i
-    sed -e "s|AC_COIN_PROJECTDIR_INIT(.*)|AC_COIN_PROJECTDIR_INIT\($stableProj,$newLTCurrent:$newLTRevision:$newLTAge\)|" $i > bla
+    lastComponent=`echo $stableProj | sed -e 's|.*/\([^/][^/]*\)|\1|'`
+    sed -e "s|AC_COIN_PROJECTDIR_INIT(.*)|AC_COIN_PROJECTDIR_INIT\($lastComponent,$newLTCurrent:$newLTRevision:$newLTAge\)|" $i > bla
     mv bla $i
     svn diff $i