Changeset 1845 for trunk/prepare_new_stable

Timestamp:

Nov 23, 2010 12:40:12 PM (10 years ago)

Author:

lou

Message:

Implement command-line list to ignore buildtools mismatch for specified
projects.

File:

• trunk/prepare_new_stable (modified) (6 diffs)

trunk/prepare_new_stable

@@ -42 +42 @@
 
 printHelp=0
-ignoreBuildToolsMismatch=0
+ignoreBuildToolsMismatch=no
+mismatchBTExternals=
 bumpMajor=0
 suppressCheckout=0
@@ -82 +83 @@
     case "$1" in
       -h* | --h*) printHelp=1 ;;
-      -i* | --i*) ignoreBuildToolsMismatch=1 ;;
+      -i* | --i*)
+           if expr "$1" : '.*-i.*=.*' 2>&1 >/dev/null ; then
+             mismatchBTExternals=`echo $1 | sed -n -e 's/[^=]*=\(.*\)/\1/p'`
+           else
+             shift
+             mismatchBTExternals=$1
+           fi
+           if test "x$mismatchBTExternals" = "xall" ; then
+             ignoreBuildToolsMismatch=all
+           else
+             ignoreBuildToolsMismatch=partial
+           fi
+           ;;
       -m* | --m*) bumpMajor=1 ;;
       -p* | --p*) suppressCheckout=1 ;;
@@ -215 +228 @@
   -b <BuildToolsURL>    URL for BuildTools; required to generate a release
                         for a ThirdParty or Data project.
-  -i                    Ignore BuildTools version mismatches in externals.
+  -i <projectlist>      Ignore BuildTools version mismatches for the listed
+                        externals (comma-separated list of project names,
+                        e.g., -i Osi,Cbc). '-i all' ignores all mismatches.
   -p                    Suppress checkout (useful for testing)
   -m                    Bump the major version number.
   -t <project-list>     Suppress conversion from trunk to stable for the
                         listed externals (comma-separated list of project
-                        names, e.g., -t Osi,Cbc).
+                        names).
   -x <project-list>     Remove the listed projects from the list of externals
                         (comma-separated list of project names).
@@ -503 +518 @@
           testResult=`compareURLVersions "$srcBTURL" "$extBTURL"`
           if test $testResult = no ; then
-            echo "    WARNING: BuildTools mismatch: $ext_url_notail uses $extBTURL"
-            if test $ignoreBuildToolsMismatch = 0 ; then
-               buildtoolsMismatch=1
+            if test $ignoreBuildToolsMismatch = all || \
+               expr "$mismatchBTExternals" : '.*'$ext_proj'.*' 2>&1 >/dev/null ; then
+              echo "    WARNING: BuildTools mismatch: $ext_url_notail uses $extBTURL"
+            else
+              buildtoolsMismatch=1
+              echo "    ERROR: BuildTools mismatch: $ext_url_notail uses $extBTURL"
             fi
           fi
@@ -517 +535 @@
   done
 
-# If we have a BuildTools mismatch, and mismatch is not permitted, exit.
-
-  if test $buildtoolsMismatch -gt $ignoreBuildToolsMismatch ; then
+# If we have a BuildTools mismatch, exit.
+
+  if test $buildtoolsMismatch = 1 ; then
     echo "Exiting due to BuildTools mismatches; use -i to ignore."
     exit 2
@@ -526 +544 @@
   $cmdDir/set_externals Dependencies
 
+# Try three times to check out externals before conceding defeat.
+
   echo ''
   echo '===> Checking out externals ...'
   echo ''
 
-  svn update
+  svn update ||
+  { echo "Retry 1 ... " ; svn update ; } ||
+  { echo "Retry 2 ... " ; svn update ; } ||
+  { echo "Checkout of externals failed. Aborting." ; exit 3 ; }
 
 # Run any scripts to acquire ThirdParty code.