Changeset 1362 for trunk/prepare_new_release
- Timestamp:
- Jul 21, 2009 1:52:15 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/stable/BSPsplit (added) merged: 1316-1317,1319
- Property svn:mergeinfo changed
-
trunk/prepare_new_release
r1303 r1362 12 12 # Accommodate simultaneous creation of releases with circular 13 13 # dependencies. 14 # Modified: Ted Ralphs Lehigh University 2009-07-10 15 # Set libtool version info automatically 14 16 15 17 #set -x -v … … 30 32 # nomenclature. 31 33 32 determine_release () 34 #Determine revision number (patch release number--third digit in release 35 # version number 36 37 determine_revision () 33 38 { 34 39 if test $isData = no ; then … … 36 41 drtmp_stableBranch=`echo $1 | sed -e 's|.*/stable/||'` 37 42 drtmp_baseURL=`echo $1 | sed -e 's|/stable/[0-9.]*||'` 38 drtmp_returnVal=39 43 40 44 # List the existing releases and screen for releases matching stableBranch. … … 56 60 if test -z "$drtmp_release_vers" ; then 57 61 if test $2 = 1 ; then 58 drtmp_re turnVal="$drtmp_stableBranch.0"62 drtmp_revision=0 59 63 else 60 drtmp_re turnVal="Error"64 drtmp_revision="Error" 61 65 fi 62 66 else … … 64 68 # There are releases. If we don't have one after the loop, we're confused. 65 69 66 drtmp_ new_rel=-1000070 drtmp_revision=-10000 67 71 for drtmp_i in $drtmp_release_vers; do 68 drtmp_ rel=`echo $drtmp_i | sed -e "s|^$drtmp_stableBranch.||"`69 if test $drtmp_ rel -gt $drtmp_new_rel; then70 drtmp_ new_rel=$drtmp_rel72 drtmp_old_revision=`echo $drtmp_i | sed -e "s|^$drtmp_stableBranch.||"` 73 if test $drtmp_old_revision -gt $drtmp_revision; then 74 drtmp_revision=$drtmp_old_revision 71 75 fi 72 76 done 73 77 74 if test $drtmp_ new_rel= -10000; then75 drtmp_ new_rel="Error"78 if test $drtmp_revision = -10000; then 79 drtmp_revision="Error" 76 80 elif test $2 = 1 ; then 77 drtmp_ new_rel=`expr $drtmp_new_rel+ 1`81 drtmp_revision=`expr $drtmp_revision + 1` 78 82 fi 79 drtmp_returnVal="$drtmp_stableBranch.$drtmp_new_rel"80 83 fi 84 85 # determine current and age for the purposes of libtool versioning 81 86 82 87 else # end normal and ThirdParty, begin Data … … 107 112 if test -z "$drtmp_release_vers" ; then 108 113 if test $2 = 1 ; then 109 drtmp_re turnVal="$drtmp_stableBranch.0"114 drtmp_revision=0 110 115 else 111 drtmp_re turnVal="Error"116 drtmp_revision="Error" 112 117 fi 113 118 else … … 140 145 if test -z "$drtmp_release_vers" ; then 141 146 if test $2 = 0 ; then 142 drtmp_re turnVal="$drtmp_stableBranch.Error"147 drtmp_revision="Error" 143 148 else 144 drtmp_re turnVal="$drtmp_stableBranch.0"149 drtmp_revision=0 145 150 fi 146 151 else 147 drtmp_ new_rel=-10000152 drtmp_revision=-10000 148 153 for drtmp_i in $drtmp_release_vers; do 149 drtmp_ rel=`echo $drtmp_i | sed -e "s|^$drtmp_stableBranch.||"`150 if test $drtmp_ rel -gt $drtmp_new_rel; then151 drtmp_ new_rel=$drtmp_rel154 drtmp_old_revision=`echo $drtmp_i | sed -e "s|^$drtmp_stableBranch.||"` 155 if test $drtmp_old_revision -gt $drtmp_revision; then 156 drtmp_revision=$drtmp_old_revision 152 157 fi 153 158 done 154 drtmp_new_rel=`expr $drtmp_new_rel + 1` 155 drtmp_returnVal="$drtmp_stableBranch.$drtmp_new_rel" 159 drtmp_revision=`expr $drtmp_revision + 1` 156 160 fi 157 161 … … 160 164 fi # for normal/Data 161 165 162 echo $drtmp_re turnVal166 echo $drtmp_revision 163 167 } 164 168 169 # Determine current (the total number of stable releases over all time) 170 171 determine_current () 172 { 173 if test $isData = no ; then 174 175 dctmp_stableBranch=`echo $1 | sed -e 's|.*/stable/||'` 176 dctmp_baseURL=`echo $1 | sed -e 's|/stable/[0-9.]*||'` 177 178 dctmp_current=`svn list $dctmp_baseURL/stable | wc -w` 179 180 else 181 182 dctmp_current=0 183 184 fi 185 186 echo $dctmp_current 187 } 188 189 # Determine age (the number of backwards compatible stable releases (second 190 # number in stable version) 191 192 determine_age () 193 { 194 if test $isData = no ; then 195 196 datmp_stableBranch=`echo $1 | sed -e 's|.*/stable/||'` 197 datmp_baseURL=`echo $1 | sed -e 's|/stable/[0-9.]*||'` 198 199 datmp_age=`echo $datmp_stableBranch | sed -e 's|[0-9].||'` 200 201 else 202 203 datmp_age=0 204 205 fi 206 207 echo $datmp_age 208 } 165 209 166 210 # Specify the COIN URL base for convenience. … … 392 436 echo "===> Checking releases for stable branch $stableBranch ..." 393 437 394 new_ver=`determine_release "$stableURL" 1` 395 396 echo '' 438 echo $stableURL 439 new_current=`determine_current "$stableURL" 1` 440 new_revision=`determine_revision "$stableURL" 1` 441 new_age=`determine_age "$stableURL" 1` 442 new_ver="$stableBranch.$new_revision" 443 444 echo '' 445 echo "New current.......: $new_current" 446 echo "New revision......: $new_revision" 447 echo "New age...........: $new_age" 397 448 echo "New release.......: $new_ver" 398 449 buildBase="${stableProj}-$new_ver" … … 454 505 455 506 echo '' 456 echo "===> Updating version number ($new_ver)in configure.ac files"507 echo "===> Updating version numbers in configure.ac files" 457 508 for i in $conf_ac_files; do 458 509 sed -e "s|AC_INIT\(.*\)\[[0-9A-Za-z\.]*\],\(.*\)|AC_INIT\1[$new_ver],\2|" $i > bla 510 mv bla $i 511 sed -e "s|AC_COIN_PROJECTDIR_INIT\(.*\)|AC_COIN_PROJECTDIR_INIT\($new_current:$new_revision:$new_age\)|" $i > bla 459 512 mv bla $i 460 513 svn di $i
Note: See TracChangeset
for help on using the changeset viewer.