Changeset 415


Ignore:
Timestamp:
Jun 23, 2007 10:48:45 PM (13 years ago)
Author:
andreasw
Message:

synchronize with trunk rev 414

Location:
stable/0.5
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.5/commit_new_release

    r406 r415  
    6464echo "===> Restoring version number (${stable_branch}stable) in configure.ac files"
    6565for i in $conf_ac_files; do
    66   sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\]\(.*\)|AC_INIT\1[${stable_branch}stable]\2|" $i > bla
     66  sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\],\(.*\)|AC_INIT\1[${stable_branch}stable],\2|" $i > bla
    6767  mv bla $i
    6868  svn di $i
     
    8989echo "You can now delete the directory $tmpbas including subdirectories"
    9090
     91rm .new_release_data
  • stable/0.5/prepare_new_release

    r406 r415  
    102102
    103103if test $new_rel = -10000; then
    104   new_rel=1
     104  new_rel=0
    105105else
    106106  let new_rel++
     
    116116
    117117case $base_url in
    118   *ThirdParty*)
     118  *ThirdParty/* )
    119119    is_thirdparty=yes
     120    is_data=no
     121    ;;
     122  *Data )
     123    is_thirdparty=no
     124    is_data=yes
    120125    ;;
    121126  *)
    122127    is_thirdparty=no
     128    is_data=no
    123129    ;;
    124130esac
    125131
    126 tmpbas=tmp_checkout
    127 if test $is_thirdparty = yes; then
    128   tmpcodir=$tmpbas/a/b
    129 else
    130   tmpcodir=$tmpbas
    131 fi
    132 
    133 rm -rf $tmpbas
    134 cmd="svn co --ignore-externals $stable_url $tmpcodir"
    135 echo $cmd
    136 eval $cmd
    137 
    138 if test $is_thirdparty = yes; then
     132if test $is_thirdparty = yes || test $is_data = yes; then
    139133  buildtoolsurl=$2
    140134  if test "$buildtoolsurl" == ""; then
     
    151145      ;;
    152146  esac
     147fi
     148
     149tmpbas=tmp_checkout
     150if test $is_thirdparty = yes; then
     151  tmpcodir=$tmpbas/a/b
     152elif test $is_data = yes; then
     153  tmpcodir=$tmpbas/a
     154else
     155  tmpcodir=$tmpbas
     156fi
     157
     158rm -rf $tmpbas
     159cmd="svn co --ignore-externals $stable_url $tmpcodir"
     160echo $cmd
     161eval $cmd
     162
     163if test $is_thirdparty = yes || test $is_data = yes; then
    153164  echo ''
    154165  echo '===> Checking out BuildTools for ThirdParty project...'
     
    174185echo "===> Updating version number ($new_ver) in configure.ac files"
    175186for i in $conf_ac_files; do
    176   sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\]\(.*\)|AC_INIT\1[$new_ver]\2|" $i > bla
     187  sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\],\(.*\)|AC_INIT\1[$new_ver],\2|" $i > bla
    177188  mv bla $i
    178189  svn di $i
     
    223234      if test $ext_latest = -10000; then
    224235        echo ''
    225         echo 'Error: No release for $ext_name for its stable defined in External'
     236        echo "Error: No release for $ext_name for its stable defined in External"
    226237        echo ''
    227238        exit -5
     
    299310  BuildTools/run_autotools
    300311  cd - > /dev/null
     312elif test $is_data = yes; then
     313  cd ..
     314  BuildTools/run_autotools
     315  cd - > /dev/null
    301316else
    302317  BuildTools/run_autotools
     
    346361fi # if test -r Externals
    347362
    348 if test $is_thirdparty != yes; then
     363if test $is_thirdparty != yes && test $is_data != yes; then
    349364  (set -e
    350365   echo ''
     
    391406echo ''
    392407echo '===> ALL TESTS PASSED'
    393 if test $is_thirdparty != yes; then
     408if test $is_thirdparty != yes && test $is_data != yes; then
    394409  echo ''
    395410  echo 'Please review the output above, particularly the one of make test'
     
    407422echo "          $tmpcodir"
    408423echo ''
    409 echo "and run the $tmpbas/BuildTools/commit_new_release script"
     424echo "and run the commit_new_release script"
    410425
    411426cat >.new_release_data <<EOF
     
    417432stable_branch=$stable_branch
    418433EOF
    419 
Note: See TracChangeset for help on using the changeset viewer.