From d8b0c75f013f19084ac0efc1c81012c6f23b77b0 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Wed, 13 Jul 2016 13:45:50 +0100 Subject: [PATCH] ECC-200: Must use different string for Python package name: ecCodes (stop clash with F90 = eccodes) --- doxygen/make_dox.sh | 5 +++-- doxygen/process_python.pl | 7 +------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/doxygen/make_dox.sh b/doxygen/make_dox.sh index 5389deb6d..48b0789bf 100755 --- a/doxygen/make_dox.sh +++ b/doxygen/make_dox.sh @@ -10,7 +10,8 @@ set -e ./process_C_header.pl ../src/grib_api.h ../src/eccodes.h > eccodes.h -./process_python.pl ../python/gribapi.py > eccodes.py +# Python doxygen module will be "ecCodes" to distinguish it from "eccodes" for F90 +./process_python.pl ../python/gribapi.py > ecCodes.py rm -fr ../html/* touch ../html/Makefile.am @@ -21,4 +22,4 @@ doxygen grib_api_wiz.cfg # Remove temp files rm -f eccodes.h -rm -f eccodes.py +rm -f ecCodes.py diff --git a/doxygen/process_python.pl b/doxygen/process_python.pl index c238d4579..b7b39bfae 100755 --- a/doxygen/process_python.pl +++ b/doxygen/process_python.pl @@ -5,16 +5,11 @@ use strict; $|=1; my $debug = 0; -#if (scalar @ARGV < 1) { -# &usage; -#} - while (<>) { - s/\@package gribapi/\@package eccodes/; + s/\@package gribapi/\@package ecCodes/; s/\bGRIB_CHECK\b/CODES_CHECK/; - s/\bGRIB_MISSING_DOUBLE\b/CODES_MISSING_DOUBLE/; s/\bGRIB_MISSING_LONG\b/CODES_MISSING_LONG/;