Changeset 412

Timestamp:

Jun 22, 2007 4:53:53 PM (14 years ago)

Author:

andreasw

Message:

some changes for release files; make it work for Data projects

Location:

trunk

Files:

• commit_new_release (modified) (2 diffs)
• prepare_new_release (modified) (6 diffs)

trunk/commit_new_release

@@ -64 +64 @@
 echo "===> Restoring version number (${stable_branch}stable) in configure.ac files"
 for i in $conf_ac_files; do
-  sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\]\(.*\)|AC_INIT\1[${stable_branch}stable]\2|" $i > bla
+  sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\],\(.*\)|AC_INIT\1[${stable_branch}stable]\2|" $i > bla
   mv bla $i
   svn di $i
@@ -89 +89 @@
 echo "You can now delete the directory $tmpbas including subdirectories"
 
+rm .new_release_data

trunk/prepare_new_release

@@ -116 +116 @@
 
 case $base_url in
-  *ThirdParty*)
+  *ThirdParty/* )
     is_thirdparty=yes
+    is_data=no
+    ;;
+  *Data )
+    is_thirdparty=no
+    is_data=yes
     ;;
   *)
     is_thirdparty=no
+    is_data=no
     ;;
 esac
 
-tmpbas=tmp_checkout
-if test $is_thirdparty = yes; then
-  tmpcodir=$tmpbas/a/b
-else
-  tmpcodir=$tmpbas
-fi
-
-rm -rf $tmpbas
-cmd="svn co --ignore-externals $stable_url $tmpcodir"
-echo $cmd
-eval $cmd
-
-if test $is_thirdparty = yes; then
+if test $is_thirdparty = yes || test $is_data = yes; then
   buildtoolsurl=$2
   if test "$buildtoolsurl" == ""; then
@@ -151 +145 @@
       ;;
   esac
+fi
+
+tmpbas=tmp_checkout
+if test $is_thirdparty = yes; then
+  tmpcodir=$tmpbas/a/b
+elif test $is_data = yes; then
+  tmpcodir=$tmpbas/a
+else
+  tmpcodir=$tmpbas
+fi
+
+rm -rf $tmpbas
+cmd="svn co --ignore-externals $stable_url $tmpcodir"
+echo $cmd
+eval $cmd
+
+if test $is_thirdparty = yes || test $is_data = yes; then
   echo ''
   echo '===> Checking out BuildTools for ThirdParty project...'
@@ -174 +185 @@
 echo "===> Updating version number ($new_ver) in configure.ac files"
 for i in $conf_ac_files; do
-  sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\]\(.*\)|AC_INIT\1[$new_ver]\2|" $i > bla
+  sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\],\(.*\)|AC_INIT\1[$new_ver]\2|" $i > bla
   mv bla $i
   svn di $i
@@ -299 +310 @@
   BuildTools/run_autotools
   cd - > /dev/null
+elif test $is_data = yes; then
+  cd ..
+  BuildTools/run_autotools
+  cd - > /dev/null
 else
   BuildTools/run_autotools
@@ -346 +361 @@
 fi # if test -r Externals
 
-if test $is_thirdparty != yes; then
+if test $is_thirdparty != yes && test $is_data != yes; then
   (set -e
    echo ''
@@ -391 +406 @@
 echo ''
 echo '===> ALL TESTS PASSED'
-if test $is_thirdparty != yes; then
+if test $is_thirdparty != yes && test $is_data != yes; then
   echo ''
   echo 'Please review the output above, particularly the one of make test'