Changeset 2402 for stable/0.7

Timestamp:

Jul 16, 2011 1:11:23 PM (10 years ago)

Author:

stefan

Message:

sync with trunk rev2401

Location:

stable/0.7

Files:

• . (modified) (1 prop)
• coin-functions (modified) (4 diffs)
• compile_f2c (modified) (1 prop)
• prepare_new_release (modified) (9 diffs)

stable/0.7/coin-functions

@@ -536 +536 @@
 # Count the total number of stable branches for the project for the specified
 # major version number, up to the specified minor version number (libtool age).
-# Returns 0 if handed a trunk url, or if the url is Data or BuildTools itself.
+# Returns 0 if handed a trunk url, or if the url is BuildTools itself.
 # usage: calcLibtoolAge <svnURL> <major> <minor>
 
@@ -551 +551 @@
   case "$cltc_URL" in
     */Data/* )
-        cltc_listURL=
+        cltc_listURL=$cltc_baseURL/Data/$cltc_proj/stable
         ;;
     */ThirdParty/* )
@@ -611 +611 @@
 # Count the total number of stable branches for the project up to the
 # specified major.minor version number (libtool current).  Returns 0 if
-# handed a trunk url, or if the url is Data or BuildTools itself.
+# handed a trunk url, or if the url is BuildTools itself.
 # usage: calcLibtoolCurrent <svnURL> <major> <minor>
 
@@ -626 +626 @@
   case "$cltc_URL" in
     */Data/* )
-        cltc_listURL=
+        cltc_listURL=$cltc_baseURL/Data/$cltc_proj/stable
         ;;
     */ThirdParty/* )

stable/0.7/prepare_new_release

@@ -20 +20 @@
 #       Change handling of externals so the svn:externals is left pointing to
 #       releases but Dependencies is left pointing to stable branches.
+# Modified: Stefan Vigerske    HU       2011-07-16
+#       Do not attempt to configure/make/make test ThirdParty projects that
+#       do not have a get-script, since this fails in most cases (which is
+#       the expected behaviour).
 
 #set -x -v
@@ -205 +209 @@
       *Data/* )
         isData=yes
-        isNormal=no
         ;;
       *BuildTools/* )
@@ -344 +347 @@
   newLTRevision=$newRel
   newLTAge=`calcLibtoolAge $stableURL $majVer $minVer`
-  newLTAge=`expr $newLTAge - 1`
+  # expr returns with status 1 if the result of the calculation is 0
+  # this leads to exiting this script, which is somewhat unexpected
+  if test "$newLTAge" = 1 ; then
+    newLTAge=0
+  else
+    newLTAge=`expr $newLTAge - 1`
+  fi
   newLTVer=${newLTCurrent}:${newLTRevision}:${newLTAge}
   echo "Libtool version.....: $newLTVer"
@@ -419 +428 @@
 # it's the commas that count. This does make for a surpassing ugly regular
 # expression.  A comma in the version string will cause a spectacular failure.
-# In AC_COIN_PROJECTDIR_INIT, take the attitude that the existing parameters
-# don't matter, we know what the release parameters should be.
+# In AC_COIN_PROJECTDIR_INIT, take the attitude that there is one parameter
+# with the PMs choosen project name which is preserved and we only add a
+# libtool version number afterwards.
 
   echo ''
@@ -427 +437 @@
     sed -e "s|AC_INIT\(.*\),\(\[*\)[^],]*\(\]*\),\(.*\)|AC_INIT\1,\2$newVer\3,\4|" $i > bla
     mv bla $i
-    lastComponent=`echo $stableProj | sed -e 's|.*/\([^/][^/]*\)|\1|'`
-    sed -e "s|AC_COIN_PROJECTDIR_INIT(.*)|AC_COIN_PROJECTDIR_INIT\($lastComponent,$newLTCurrent:$newLTRevision:$newLTAge\)|" $i > bla
+    sed -e "s|AC_COIN_PROJECTDIR_INIT(\(.*\))|AC_COIN_PROJECTDIR_INIT\(\1,$newLTCurrent:$newLTRevision:$newLTAge\)|" $i > bla
     mv bla $i
     svn diff $i
@@ -645 +654 @@
 
 # Finally! Done processing externals. If this is a ThirdParty project, we
-# still have to run the get script.
-
+# still have to run the get script, if there is one.
+
+isThirdPartyWithoutGet=no
 if test $isThirdParty = yes ; then
   if test -x get.$stableProj ; then
@@ -653 +663 @@
     echo ''
     ./get.$stableProj
+  else
+    isThirdPartyWithoutGet=yes
   fi
 fi
@@ -676 +688 @@
 # work above to set externals.
 
-if test $isNormal = yes ; then
+if test $isNormal = yes && test $isThirdPartyWithoutGet = no; then
   (set -e
    echo ''
@@ -722 +734 @@
 
 echo ''
-if test $isNormal = yes ; then
+if test $isNormal = yes && test $isThirdPartyWithoutGet = no; then
   echo 'Please review the output above, particularly the one of make test.'
 else