Changeset 1364

Timestamp:

Jul 22, 2009 12:24:18 AM (12 years ago)

Author:

tkr

Message:

Souping up prepare_new_release

File:

• trunk/prepare_new_release (modified) (8 diffs)

trunk/prepare_new_release

@@ -232 +232 @@
 # stableExternals, on the other hand, specifies externals for which we are
 # doing simultaneous releases. We will use the stable branch of the external
-# while preparing and testing this release candidate, changing the Externals
+# while preparing and testing this release candidate, changing the Dependencies
 # file to specify a (nonexistent) release of the external at the last moment.
 
@@ -374 +374 @@
     release)
   - Check out a clean copy of the specified stable branch, without externals
-  - Read the Externals file and create a new Externals file for the release
-    by converting references to stable branches to references to the most
-    recent release for that stable branch.
+  - Make sure that the svn:externals property points to releases
   - Create a new package configure.ac file with the release version number
     specified in the AC_INIT macro.
-  - Set the svn:externals property for the release package and check out the
-    code for the externals.
   - Use the "get.*" scripts to download any ThirdParty code.
   - Execute run_autotools to update configure, Makefile.in, etc., to reflect
     the most recent release of BuildTools.
-  - Check that all dependencies are using the same version of the BuildTools
   - Run the configure script, compile the code, and run the unit test.
-  - Replace any stable references in Externals (specified with -s) with the
+  - Replace any stable branches in externals (specified with -s) with the
     appropriate (yet to be committed) release.
 
@@ -394 +389 @@
 If the script completes without error, examine the output, particularly the
 output of the unit test ('make test') and the set of externals specified in
-the Externals file.
+the Dependencies file.
 
 This script does not make any changes to the repository.  If you want to
@@ -514 +509 @@
 done
 
-# Now fix up the Externals file, if it exists. References to stable branches
+# Now fix up the Dependencies file, if it exists. References to stable branches
 # will be converted to references to releases unless the reference is to a
-# project in the stableExternals list. Each line in an Externals file has the
+# project in the stableExternals list. Each line in a Dependencies file has the
 # format <ext_name> <ext_url>. The reference must be to a stable branch.
 
-if test -r Externals; then
-
-  echo ''
-  echo '===> Creating new Externals file with pointers to releases...'
-  echo ''
-
-  rm -f Externals.releases
+if test -r Dependencies; then
+
+  echo ''
+  echo '===> Checking externals for releases and buildtools version...'
+  echo ''
+
+  buildtools_stable=`svn pget svn:externals $stableURL | grep -e "BuildTools/releases" | sed -e 's|.*/releases/\([0-9]*.[0-9]*\).[0-9]*|\1|'`
+
+  echo "$stableProj uses build tools stable version $buildtools_stable"
+  echo ''
+
+  rm -f Externals
   ext_name=
   ext_url=
-  for i in `cat Externals`; do
+  for i in `cat Dependencies`; do
     if test "$ext_name" = ""; then
       ext_name="$i"
     else
+      echo "Now checking $ext_name..."
+      echo ''
       ext_url=$i
       if (echo $ext_name | grep -E '^#' >/dev/null); then
-        echo "Skip $ext_name $ext_url."
+        echo "===> Skip $ext_name $ext_url."
         ext_name=
         continue
@@ -542 +544 @@
       else
         echo ''
-        echo "The external URL $ext_url is not a stable branch or release. Exiting."
+        echo "===> The external URL $ext_url is not a stable branch or release. Exiting."
         echo ''
         exit -2
       fi
 
+#      buildtools_version=`svn pget svn:externals $ext_url | grep -e "BuildTools/releases" | sed -e 's|.*/releases/\([0-9]*.[0-9]*\).[0-9]*|\1|'`
+      ext_stable=`echo $ext_url | sed -e 's|\(.*/stable/[0-9]*.[0-9]*/\).*|\1|'`
+      buildtools_version=`svn pget svn:externals $ext_stable | grep -e "BuildTools/stable" | sed -e 's|.*/stable/\([0-9]*.[0-9]*\)|\1|'`
+
+      if test "$buildtools_stable" = "$buildtools_version"; then
+        echo '===> Build tools consistency check OK'
+      elif test "$buildtools_version" = ""; then
+        echo "===> Skipping build tools version check for $ext_name"
+      else
+        echo $ext_name >>problems.ext
+      fi
+
+      if test -r problems.ext; then
+        echo ''
+        echo 'PROBLEM DURING CONSISTENCY CHECK:'
+        echo ''
+        echo ''
+        echo "External $ext_name uses stable version $buildtools_version of the build tools"
+        echo "$stableProj uses stable version $buildtools_stable of the build tools"
+        echo ''
+        cat problems.ext
+        echo ''
+        rm -f problems.ext
+        if test $ignoreBuildToolsMismatch = 0 ; then
+           exit -2
+        else
+          echo "Continuing in spite of BuildTools mismatch."
+        fi
+      fi
+
       ext_base_front=`echo $ext_url | sed -e 's|/stable/.*||'`
       ext_proj=`echo $ext_base_front | sed -e 's|.*/\([^/]*\)|\1|'`
 
       if expr "$stableExternals" : '.*'"$ext_proj"'.*' 2>&1 >/dev/null ; then
-        echo "Using stable reference for $ext_name."
+        echo "===> Using stable reference for $ext_name."
         ext_rel_url=$ext_url
       elif expr "$ext_url" : '.*releases/.*' 2>&1 >/dev/null ; then
-        echo "Using specified release for $ext_name."
+        echo "===> Using specified release for $ext_name."
         ext_rel_url=$ext_url
       else
         ext_stable=`echo $ext_url | sed -e 's|\(.*/stable/[0-9\.]*\).*|\1|'`
         ext_base_end=`echo $ext_url | sed -e 's|.*/stable/[0-9\.]*||'`
-
-        echo "Determining release replacement for $ext_name:"
-        ext_latest=`determine_release $ext_stable 0`
+        ext_stable_branch=`echo $ext_stable | sed -e 's|.*/stable/||'`
+
+        echo "===> Determining release replacement for $ext_name:"
+        ext_latest=$ext_stable_branch.`determine_revision $ext_stable 0`
 
         if test "$ext_base_end" = ""; then
@@ -570 +603 @@
       fi
 
-      echo "  $ext_rel_url"
-      echo "$ext_name  $ext_rel_url" >>Externals.releases
+      echo "     $ext_rel_url"
+      echo "$ext_name  $ext_rel_url" >>Externals
       ext_name=
+      echo ''
     fi
   done
-
-  echo ''
-  echo '===> Creating backup (.bak) for Externals'
-  mv Externals Externals.bak
-  mv Externals.releases Externals
 
   echo ''
@@ -646 +675 @@
   BuildTools/run_autotools
 fi
-
-if test -r Externals; then
-
-  echo '===> Verifying consistency of the BuildTools versions...'
-  echo ''
-
-  ext_name=
-  ext_url=
-  rm -f problems.ext
-  for i in `cat Externals`; do
-    if test "$ext_name" = ""; then
-      ext_name="$i"
-    else
-      ext_url=$i
-
-      echo "  checking $ext_name"
-
-      num_M=`svn status $ext_name | grep -E '^M' | wc -l`
-
-      if test $num_M -ne 0; then
-        echo $ext_name >>problems.ext
-        echo '    ... BuildTools not consistent!'
-      else
-        echo '    ... Ok'
-      fi
-      ext_name=
-    fi
-  done
-
-  if test -r problems.ext; then
-    echo ''
-    echo 'PROBLEM DURING CONSISTENCY CHECK:'
-    echo ''
-    echo 'Please contact the project manager(s) for the following project(s).'
-    echo 'A new release needs to be made with your stable branch of BuildTools.'
-    echo ''
-    cat problems.ext
-    echo ''
-    rm -f problems.ext
-    if test $ignoreBuildToolsMismatch = 0 ; then
-      exit -2
-    else
-      echo "Continuing in spite of BuildTools mismatch."
-    fi
-  fi
-  rm -f problems.ext
-fi # if test -r Externals
 
 if test $isThirdParty != yes && test $isData != yes; then
@@ -791 +773 @@
 echo "and run the commit_new_release script"
 
+rm -rf Externals
+
 cat >.new_release_data <<EOF
 isData=$isData