run_doxygen (find_doxygen): Tweak version check.

2001-06-11  Matthias Klose  <doko@debian.org>
            Phil Edwards  <pme@sources.redhat.com>

	* docs/doxygen/run_doxygen (find_doxygen):  Tweak version check.
	(main script):  Echo more information.

Co-Authored-By: Phil Edwards <pme@gcc.gnu.org>
From-SVN: r43184

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a93073268e4369aeb85a8e0978ba8aa0aabd35e7..6a6991b8df1492e56013388461aeda6b272ea211 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-11  Matthias Klose  <doko@debian.org>
+            Phil Edwards  <pme@sources.redhat.com>
+
+       * docs/doxygen/run_doxygen (find_doxygen):  Tweak version check.
+       (main script):  Echo more information.
+
 2001-06-10  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/c_std/bits/std_cwchar.h: Alphabetize.

diff --git a/libstdc++-v3/docs/doxygen/run_doxygen b/libstdc++-v3/docs/doxygen/run_doxygen
index 266fe3ae625c2647e8b0ebba998dcfaddc3ad7c5..b329a1304d2d93b51d9e8c226b8d9e6e82895f99 100644 (file)
--- a/libstdc++-v3/docs/doxygen/run_doxygen
+++ b/libstdc++-v3/docs/doxygen/run_doxygen
@@ -5,15 +5,16 @@
 # Synopsis:  run_doxygen --mode=[user|maint]  v3srcdir  v3builddir
 #
 # Originally hacked together by Phil Edwards <pme@sources.redhat.com>
-# $Id: run_doxygen,v 1.3 2001/04/05 21:09:24 pme Exp $
+# $Id: run_doxygen,v 1.4 2001/04/29 01:40:34 pme Exp $
 
 
-# We can check now that the version of doxygen is = this variable.  We need
-# to check for the >= case eventually.
+# We can check now that the version of doxygen is >= this variable.
 DOXYVER=1.2.6
 doxygen=
 
 find_doxygen() {
+    v_required=`echo $DOXYVER |  \
+                awk -F. '{if(NF<3)$3=0;print ($1*100+$2)*100+$3}'`
     testing_version=
     # thank you goat book
     set `IFS=:; X="$PATH:/usr/local/bin:/bin:/usr/bin"; echo $X`
@@ -22,9 +23,13 @@ find_doxygen() {
       # AC_EXEEXT could come in useful here
       maybedoxy="$dir/doxygen"
       test -f "$maybedoxy" && testing_version=`$maybedoxy --version`
-      if test -n "$testing_version" && test $testing_version = $DOXYVER; then
-        doxygen="$maybedoxy"
-        break
+      if test -n "$testing_version"; then
+       v_found=`echo $testing_version |  \
+                awk -F. '{if(NF<3)$3=0;print ($1*100+$2)*100+$3}'`
+       if test $v_found -ge $v_required; then
+         doxygen="$maybedoxy"
+         break
+       fi
       fi
     done
     if test -z "$doxygen"; then
@@ -70,7 +75,7 @@ parse_options() {
         blank=
         Id=is
         echo You expect this dinky script to track a version?  Okay, here
-        echo it $Id: run_doxygen,v 1.3 2001/04/05 21:09:24 pme Exp $blank
+        echo it $Id: run_doxygen,v 1.4 2001/04/29 01:40:34 pme Exp $blank
         exit 0
         ;;
       *)
@@ -117,8 +122,10 @@ test -d $outdir || (mkdir -p $outdir ; chmod u+w $outdir)
   sed -e "s=@outdir@=${outdir}=" \
       -e "s=@srcdir@=${srcdir}=" \
       docs/doxygen/${mode}.cfg.in > ${outdir}/${mode}.cfg
+  echo :: NOTE that this may take some time...
   echo $doxygen ${outdir}/${mode}.cfg
   $doxygen ${outdir}/${mode}.cfg
+  echo :: Finished, exit code was $?
 )
 
 # mess with output files here?