Changeset 412
- Timestamp:
- Jun 22, 2007 4:53:53 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/commit_new_release
r401 r412 64 64 echo "===> Restoring version number (${stable_branch}stable) in configure.ac files" 65 65 for i in $conf_ac_files; do 66 sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\] \(.*\)|AC_INIT\1[${stable_branch}stable]\2|" $i > bla66 sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\],\(.*\)|AC_INIT\1[${stable_branch}stable]\2|" $i > bla 67 67 mv bla $i 68 68 svn di $i … … 89 89 echo "You can now delete the directory $tmpbas including subdirectories" 90 90 91 rm .new_release_data -
trunk/prepare_new_release
r401 r412 116 116 117 117 case $base_url in 118 *ThirdParty *)118 *ThirdParty/* ) 119 119 is_thirdparty=yes 120 is_data=no 121 ;; 122 *Data ) 123 is_thirdparty=no 124 is_data=yes 120 125 ;; 121 126 *) 122 127 is_thirdparty=no 128 is_data=no 123 129 ;; 124 130 esac 125 131 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 132 if test $is_thirdparty = yes || test $is_data = yes; then 139 133 buildtoolsurl=$2 140 134 if test "$buildtoolsurl" == ""; then … … 151 145 ;; 152 146 esac 147 fi 148 149 tmpbas=tmp_checkout 150 if test $is_thirdparty = yes; then 151 tmpcodir=$tmpbas/a/b 152 elif test $is_data = yes; then 153 tmpcodir=$tmpbas/a 154 else 155 tmpcodir=$tmpbas 156 fi 157 158 rm -rf $tmpbas 159 cmd="svn co --ignore-externals $stable_url $tmpcodir" 160 echo $cmd 161 eval $cmd 162 163 if test $is_thirdparty = yes || test $is_data = yes; then 153 164 echo '' 154 165 echo '===> Checking out BuildTools for ThirdParty project...' … … 174 185 echo "===> Updating version number ($new_ver) in configure.ac files" 175 186 for i in $conf_ac_files; do 176 sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\] \(.*\)|AC_INIT\1[$new_ver]\2|" $i > bla187 sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\],\(.*\)|AC_INIT\1[$new_ver]\2|" $i > bla 177 188 mv bla $i 178 189 svn di $i … … 299 310 BuildTools/run_autotools 300 311 cd - > /dev/null 312 elif test $is_data = yes; then 313 cd .. 314 BuildTools/run_autotools 315 cd - > /dev/null 301 316 else 302 317 BuildTools/run_autotools … … 346 361 fi # if test -r Externals 347 362 348 if test $is_thirdparty != yes ; then363 if test $is_thirdparty != yes && test $is_data != yes; then 349 364 (set -e 350 365 echo '' … … 391 406 echo '' 392 407 echo '===> ALL TESTS PASSED' 393 if test $is_thirdparty != yes ; then408 if test $is_thirdparty != yes && test $is_data != yes; then 394 409 echo '' 395 410 echo 'Please review the output above, particularly the one of make test'
Note: See TracChangeset
for help on using the changeset viewer.