You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Ian Holsman <ia...@cnet.com> on 2001/08/11 18:09:14 UTC
[Patch] Doxygen.conf
This patch fixes the macro expansion problems in the hook declarations.
Index: doxygen.conf
===================================================================
RCS file: /home/cvspublic/httpd-2.0/docs/doxygen.conf,v
retrieving revision 1.6
diff -u -r1.6 doxygen.conf
--- doxygen.conf 2001/06/17 14:34:14 1.6
+++ doxygen.conf 2001/08/11 16:00:40
@@ -1,21 +1,29 @@
PROJECT_NAME=Apache
+#INPUT=srclib/apr
INPUT=.
RECURSIVE=YES
FILE_PATTERNS=*.h
OUTPUT_DIRECTORY=docs/dox
+ENABLE_PREPROCESSING=YES
MACRO_EXPANSION=YES
+QUIET=YES
EXPAND_ONLY_PREDEF=YES
-EXPAND_AS_DEFINED=
+#EXPAND_AS_DEFINED=
# not sure why this doesn't work as EXPAND_AS_DEFINED, it should!
-PREDEFINED=APR_DECLARE(x)=x APR_DECLARE_NONSTD(x)=x \
- AP_DECLARE_HOOK(ret,name,args)="ret name args" AP_DECLARE(x)=x \
- AP_DECLARE_NONSTD(x)=x DOXYGEN APU_DECLARE_DATA APU_DECLARE(x)=x
+PREDEFINED="APR_DECLARE(x)=x" \
+ "APR_DECLARE_NONSTD(x)=x" \
+ "AP_DECLARE_HOOK(ret,name,args)=ret name args;" \
+ "AP_DECLARE(x)=x" \
+ "AP_DECLARE_NONSTD(x)=x" \
+ DOXYGEN= \
+ APU_DECLARE_DATA= \
+ "APU_DECLARE(x)=x"
OPTIMIZE_OUTPUT_FOR_C=YES
FULL_PATH_NAMES=YES
# some autoconf guru needs to make configure set this correctly...
-STRIP_FROM_PATH=/usr/home/ben/work/httpd-2.0
+STRIP_FROM_PATH=C:/src/apache/httpd-2.0
Index: include/http_request.h
===================================================================
RCS file: /home/cvspublic/httpd-2.0/include/http_request.h,v
retrieving revision 1.33
diff -u -r1.33 http_request.h
--- include/http_request.h 2001/08/06 19:10:12 1.33
+++ include/http_request.h 2001/08/11 16:05:05
@@ -270,10 +270,6 @@
/* Hooks */
-/* ###: doxygen grouping doesn't appear to work, but it should.
Checking with
- * doxygen (Ben).
- */
-
/**
* Gives modules a chance to create their request_config entry when the
* request is created.
Re: [Patch] Doxygen.conf
Posted by Ryan Bloom <rb...@covalent.net>.
> Index: doxygen.conf
> ===================================================================
> RCS file: /home/cvspublic/httpd-2.0/docs/doxygen.conf,v
> retrieving revision 1.6
> diff -u -r1.6 doxygen.conf
> --- doxygen.conf 2001/06/17 14:34:14 1.6
> +++ doxygen.conf 2001/08/11 16:00:40
> @@ -1,21 +1,29 @@
> PROJECT_NAME=Apache
>
> +#INPUT=srclib/apr
> INPUT=.
> RECURSIVE=YES
> FILE_PATTERNS=*.h
>
> OUTPUT_DIRECTORY=docs/dox
>
> +ENABLE_PREPROCESSING=YES
> MACRO_EXPANSION=YES
> +QUIET=YES
> EXPAND_ONLY_PREDEF=YES
> -EXPAND_AS_DEFINED=
> +#EXPAND_AS_DEFINED=
> # not sure why this doesn't work as EXPAND_AS_DEFINED, it should!
> -PREDEFINED=APR_DECLARE(x)=x APR_DECLARE_NONSTD(x)=x \
> - AP_DECLARE_HOOK(ret,name,args)="ret name args" AP_DECLARE(x)=x \
> - AP_DECLARE_NONSTD(x)=x DOXYGEN APU_DECLARE_DATA APU_DECLARE(x)=x
> +PREDEFINED="APR_DECLARE(x)=x" \
> + "APR_DECLARE_NONSTD(x)=x" \
> + "AP_DECLARE_HOOK(ret,name,args)=ret name args;" \
> + "AP_DECLARE(x)=x" \
> + "AP_DECLARE_NONSTD(x)=x" \
> + DOXYGEN= \
> + APU_DECLARE_DATA= \
> + "APU_DECLARE(x)=x"
>
> OPTIMIZE_OUTPUT_FOR_C=YES
>
> FULL_PATH_NAMES=YES
> # some autoconf guru needs to make configure set this correctly...
> -STRIP_FROM_PATH=/usr/home/ben/work/httpd-2.0
> +STRIP_FROM_PATH=C:/src/apache/httpd-2.0
>
> Index: include/http_request.h
> ===================================================================
> RCS file: /home/cvspublic/httpd-2.0/include/http_request.h,v
> retrieving revision 1.33
> diff -u -r1.33 http_request.h
> --- include/http_request.h 2001/08/06 19:10:12 1.33
> +++ include/http_request.h 2001/08/11 16:05:05
> @@ -270,10 +270,6 @@
>
> /* Hooks */
>
> -/* ###: doxygen grouping doesn't appear to work, but it should.
> Checking with
> - * doxygen (Ben).
> - */
> -
> /**
> * Gives modules a chance to create their request_config entry when the
> * request is created.
--
______________________________________________________________
Ryan Bloom rbb@apache.org
Covalent Technologies rbb@covalent.net
--------------------------------------------------------------
Re: [Patch] Doxygen.conf
Posted by Ryan Bloom <rb...@covalent.net>.
I'm about to commit this with one change.
> FULL_PATH_NAMES=YES
> # some autoconf guru needs to make configure set this correctly...
> -STRIP_FROM_PATH=/usr/home/ben/work/httpd-2.0
> +STRIP_FROM_PATH=C:/src/apache/httpd-2.0
I'm leaving this alone, and tonight when I have more time, I'll make autoconf
do the right thing. This won't fix it for Windows, but it will be easy enough to
write a small script to do the same thing that gets run when we run
make dox
Ryan
______________________________________________________________
Ryan Bloom rbb@apache.org
Covalent Technologies rbb@covalent.net
--------------------------------------------------------------