diff options
| author | Matthias Klose <doko@debian.org> | 2001-06-11 13:04:07 +0000 |
|---|---|---|
| committer | Phil Edwards <pme@gcc.gnu.org> | 2001-06-11 13:04:07 +0000 |
| commit | cff75d2efee00dc45d4b9856c7b94c6660bd6e90 (patch) | |
| tree | 3770cf6b3ffffcb3f201c63cbb9c4b96cbe5c5b9 /libstdc++-v3 | |
| parent | bd91de63294d20aad1f34417f99fc2b2a5674e84 (diff) | |
| download | gcc-cff75d2efee00dc45d4b9856c7b94c6660bd6e90.zip gcc-cff75d2efee00dc45d4b9856c7b94c6660bd6e90.tar.gz gcc-cff75d2efee00dc45d4b9856c7b94c6660bd6e90.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/docs/doxygen/run_doxygen | 21 |
2 files changed, 20 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a930732..6a6991b 100644 --- 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 266fe3a..b329a13 100644 --- 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? |