joes 2004/06/21 11:32:25
Modified: . CHANGES Makefile.am configure.ac
Added: . FAQ
build dox.css dox.foot dox.head doxygen.conf.in
Removed: build doxygen.conf
Log:
Replace doxygen.conf with doxygen.conf.in (so version numbers will correctly
appear in docs). Add custom header/footer/css files to generate docs suitable
for posting on the apreq website.
Revision Changes Path
1.42 +2 -2 httpd-apreq-2/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-apreq-2/CHANGES,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- CHANGES 19 Jun 2004 19:43:20 -0000 1.41
+++ CHANGES 21 Jun 2004 18:32:24 -0000 1.42
@@ -1,5 +1,5 @@
/** @page CHANGES
-
[EMAIL PROTECTED] List of major changes.
@section v2_04_dev Changes with libapreq2-2.04-dev
@@ -226,4 +226,4 @@
-# $req->body - param lookup using only the POST data
-**/
\ No newline at end of file
+**/
1.22 +12 -3 httpd-apreq-2/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.am 16 Apr 2004 13:20:51 -0000 1.21
+++ Makefile.am 21 Jun 2004 18:32:24 -0000 1.22
@@ -8,6 +8,7 @@
POD_PREFIX=glue/perl/xsbuilder/Apache
COOKIE_POD=$(POD_PREFIX)/Cookie/Cookie_pod
REQUEST_POD=$(POD_PREFIX)/Request/Request_pod
+UPLOAD_POD=$(POD_PREFIX)/Upload/Upload_pod
SED_BODY_TAG= s(^[\S\s]+<body.+|</body>[\S\s]+$$)()gi
EUM=ExtUtils::Manifest
@@ -36,30 +37,38 @@
rm -rf $(distdir)
@echo "$(distdir).tar.gz is kosher."
+
apreq2_config:
reconfig:
./buildconf
- ./config.status
+ ./config.nice
docs_clean:
-rm -rf docs
-docs: src env glue build/doxygen.conf apr_tags pod2html
+docs: src env glue build/doxygen.conf apr_tags pod2html feather.gif
@PERL@ build/version_check.pl doxygen
doxygen build/doxygen.conf
+ cp feather.gif docs/html
+
+feather.gif:
+ wget http://httpd.apache.org/docs-2.0/images/feather.gif
+
docs_install: docs
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
cp -a docs $(DESTDIR)$(pkgdatadir)
-pod2html: Request.html Cookie.html
+pod2html: Request.html Cookie.html Upload.html
Cookie.html: Makefile.am $(COOKIE_POD)
pod2html <$(COOKIE_POD) | perl -0777 -pe '$(SED_BODY_TAG)' > Cookie.html
Request.html: Makefile.am $(REQUEST_POD)
pod2html <$(REQUEST_POD)| perl -0777 -pe '$(SED_BODY_TAG)' >
Request.html
+Upload.html: Makefile.am $(UPLOAD_POD)
+ pod2html <$(UPLOAD_POD)| perl -0777 -pe '$(SED_BODY_TAG)' > Upload.html
apr_tags: docs/apr.tag docs/apu.tag
1.19 +2 -2 httpd-apreq-2/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/httpd-apreq-2/configure.ac,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.ac 14 Jun 2004 19:16:00 -0000 1.18
+++ configure.ac 21 Jun 2004 18:32:24 -0000 1.19
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.53)
-AC_INIT(Apache HTTP Request Library, 2.04-dev, [EMAIL PROTECTED], libapreq2)
+AC_INIT(Apache HTTP Server Request Library, 2.04-dev, [EMAIL PROTECTED],
libapreq2)
dnl Generate config.nice script- macro must be here at the top
dnl to avoid corruption of $0 and [EMAIL PROTECTED]
APR_CONFIG_NICE(config.nice)
@@ -32,6 +32,6 @@
dnl Checks for library functions.
AC_APREQ
-AC_CONFIG_FILES([Makefile src/Makefile env/Makefile glue/Makefile
t/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile env/Makefile glue/Makefile t/Makefile
build/doxygen.conf])
AC_CONFIG_FILES([apreq2-config], [chmod +x apreq2-config])
AC_OUTPUT
1.1 httpd-apreq-2/FAQ
Index: FAQ
===================================================================
/** @page FAQ
The FAQ ...
*/
1.1 httpd-apreq-2/build/dox.css
Index: dox.css
===================================================================
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* manual.css
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* Copyright 2002-2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* mainframe ;-)
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
html {
font-size: 14px;
}
body {
background-color: #fff;
color: #036;
padding: 0 1em 0 0;
margin: 0;
font-family: Arial, Helvetica, sans-serif;
font-weight: normal;
}
pre, code {
font-family: "Courier New", Courier, monospace;
}
strong {
font-weight: bold;
}
q, em, var {
font-style: italic;
}
span.transnote {
background-color: inherit;
color: #888;
}
/* fixup IE & Opera
* otherwise they forget to inherit
* the computed font-size value
*/
table, code {
font-size: 1em;
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Links
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* normal links */
/* ====================== */
a:link {
color: #0073c7;
background-color: inherit;
}
a:visited {
color: #5A88B5;
background-color: inherit;
}
a:link:hover,
a:link:active,
a:visited:hover,
a:visited:active {
color: #0073c7;
background-color: #f0f0f0;
}
/* hover on non-white backgrounds */
tr.odd a:hover,
tr.odd a:active,
tr.header a:hover,
tr.header a:active,
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Headings
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* h1 */
/* ====================== */
h1 {
padding: 0.2em;
margin: 0;
background-color: inherit;
color: #036;
text-decoration: none;
font-size: 22px;
font-weight: bold;
text-align:center;
}
/* h2 */
/* ====================== */
h2 {
padding: 0.2em 0 0.2em 0.7em;
margin: 0 0 0.5em 0;
text-decoration: none;
font-size: 18px;
font-weight: bold;
text-align:left;
}
/* take care of <a name>s inside */
h2 a,
h2 a:hover,
h2 a:active {
color: inherit;
background-color: inherit;
text-decoration: none;
}
/* h3, h4 */
/* ====================== */
h3 {
background-color: inherit;
color: #036;
text-decoration: none;
font-weight: bold;
font-size: 16px;
margin: 1.3em 0 0.4em 0;
padding: 0;
}
h4 {
background-color: inherit;
color: #036;
text-decoration: none;
font-weight: bold;
font-size: 14px;
margin: 1.3em 0 0.2em 0;
padding: 0;
}
/* margin adjustment */
h3 + *, h4 + * {
margin-top: 0;
}
/* IE confuses the + * :-(
* so reset some things
*/
ul, .section table, .directive-section table {
margin-bottom: 1em;
}
/* take care of <a name>s inside */
h3 a,
h3 a:hover,
h3 a:active,
h4 a,
h4 a:hover,
h4 a:active {
color: inherit;
background-color: inherit;
text-decoration: none;
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Tables
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* general */
/* ====================== */
/*
table {
border: 1px solid #aaa;
border-collapse: collapse;
padding: 2px;
margin-top: 0.5em;
margin-bottom: 0;
}
td, th {
empty-cells: show; /* show border around empty cells */
padding: 0.1em 0.2em;
vertical-align: top;
text-align: left;
line-height: 1.3em;
}
*/
th {
font-weight: bold;
}
td.centered {
text-align: center;
}
tr.odd { /* for large tables alternating colors */
background-color: #f2f2f2;
}
tr.header, tr.header th {
background-color: #e2e2e2;
border-top: 1px solid #aaa;
border-bottom: 1px solid #aaa;
}
/* bordered table cells */
/* ====================== */
/* turn off borders in tables nested in
* bordered tables per default
*/
table.bordered table td,
table.bordered table th {
border-style: none;
}
table.bordered td,
table.bordered th,
table table.bordered td,
table table.bordered th {
border: 1px solid #aaa;
}
/* index page layout table */
/* ======================= */
body#index-page div#page-content {
width: 100%; /* IE fun */
}
body[id]#index-page div#page-content {
width: auto; /* reasonable browsers. */
}
table#indextable {
width: 100%;
border-collapse: collapse;
border: 0 none;
}
table#indextable td {
width: 33.3%;
border-left: 1px solid #aaa;
padding-top: 0;
padding-bottom: 0;
}
table#indextable td.col1 {
border-left: 0 none;
padding-left: 0;
}
table#indextable td.col3 {
padding-right: 0;
}
/* mod/dir. overview table and quick reference */
/* ============================================ */
table.module th,
table.directive th {
white-space: nowrap;
}
table.qref {
border-collapse: collapse;
width: 100%;
}
table.qref td {
border-style: none solid;
border-color: #aaa;
border-width: 1px;
}
table.qref td.descr {
padding-left: 1em;
font-size: 13px;
}
table#legend {
width: 100%;
border-style: none;
border-width: 0;
vertical-align: bottom;
padding: 0;
margin: 0;
}
table#legend td {
vertical-align: bottom;
margin: 0;
padding: 0;
}
table#legend td.letters {
width: 100%;
padding-bottom: 0.5em;
}
table#legend table {
vertical-align: bottom;
margin: 0 0 0 0.4em;
padding: 0;
height: 7.5em;
}
table#legend table td,
table#legend table th {
vertical-align: middle;
padding: 0.1ex 0.2em;
line-height: 1em;
white-space: nowrap;
}
/* related modules & dir. */
/* ====================== */
/* assuming, all links are enclosed by
* <code class="directive"> or
* <code class="module">
*/
table.related {
border-collapse: separate;
}
table.related th {
padding: 0.2ex 0.3em;
background-color: #e5ecf3;
color: #405871;
vertical-align: middle;
}
table.related td {
padding: 0.2ex 0.3em;
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Lists
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* list default values */
/* ====================== */
ul {
list-style-type: disc;
}
ul ul {
list-style-type: square;
}
ul ul ul {
list-style-type: circle;
}
li, dt, dd {
line-height: 1.3em;
}
dt {
margin-top: 0.5em;
font-weight: bold;
}
ol li {
margin-top: 0.5em;
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* main page sections
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
div#page-header img {
padding: 0;
display: block;
margin: -70px 0 1px 2em;
width: 248px;
height: 70px;
}
div#page-header p.apache {
background-color: #405871;
color: #fff;
padding: 0 0 0 248px;
margin: 0;
text-align: center;
vertical-align: middle;
font-size: 16px;
font-weight: bold;
line-height: 29px;
}
div#page-header p.menu {
text-align: right;
font-size: 13px;
margin: 30px 0 0.5em 0;
padding: 0;
}
/* breadcrumb navigation */
div.qindex,
div#path {
text-align:center;
margin: 0.2em 0 1.2em 30px;
padding: 0;
font-size: 13px;
}
p {
line-height: 1.3em;
}
/* page footer */
/* ====================== */
div#footer {
/* margin-left: 30px; */
font-size: 13px;
border-top: 1px solid #405871;
padding-top: 0.2em;
}
div#footer p.apache {
float: left;
text-align: left;
padding: 0 0 1em 0;
margin-top: 0;
}
div#footer p.menu {
float: right;
text-align: right;
margin-top: 0;
padding: 0 0 1em 0;
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* -> The End (modified doxygen-generated stylesheet below) <-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
CAPTION { font-weight: bold }
A.qindex {
text-decoration: none;
font-weight: bold;
}
A.qindexHL {
text-decoration: none;
font-weight: bold;
background-color: #405871;
color: #ffffff;
padding: 2px 6px;
}
A.qindexHL:hover {
text-decoration: none;
background-color: #405871;
color: #ffffff;
}
A.qindexHL:visited {
text-decoration: none;
background-color: #405871;
color: #ffffff
}
A.el { text-decoration: none; font-weight: bold }
A.elRef { font-weight: bold }
/*
A.code { text-decoration: none; font-weight: normal; color: #1A419D}
A.codeRef { font-weight: normal; color: #1A419D}
A:hover { text-decoration: none; background-color: #f2f2ff }
*/
DL.el { margin-left: -1cm }
PRE.fragment {
border: 1px solid #CCCCCC;
background-color: #f5f5f5;
margin-top: 4px;
margin-bottom: 4px;
margin-left: 2px;
margin-right: 8px;
padding-left: 6px;
padding-right: 6px;
padding-top: 4px;
padding-bottom: 4px;
}
DIV.fragment {
border: 1px solid #CCCCCC;
background-color: #f5f5f5;
padding: 6px;
}
DIV.ah { background-color: black; font-weight: bold; color: #ffffff;
margin-bottom: 3px; margin-top: 3px }
TD.md { background-color: #F4F4FB; font-weight: bold; }
TD.mdname1 { background-color: #F4F4FB; font-weight: bold; color: #602020; }
TD.mdname { background-color: #F4F4FB; font-weight: bold; color: #602020;
width: 600px; }
DIV.groupHeader {
margin-left: 16px;
margin-top: 12px;
margin-bottom: 6px;
font-weight: bold;
}
DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller }
BODY {
background: white;
color: black;
margin-right: 20px;
margin-left: 30px;
}
TD.indexkey {
background-color: #eeeeff;
font-weight: bold;
padding-right : 10px;
padding-top : 2px;
padding-left : 10px;
padding-bottom : 2px;
margin-left : 0px;
margin-right : 0px;
margin-top : 2px;
margin-bottom : 2px;
border: 1px solid #CCCCCC;
}
TD.indexvalue {
background-color: #eeeeff;
font-style: italic;
padding-right : 10px;
padding-top : 2px;
padding-left : 10px;
padding-bottom : 2px;
margin-left : 0px;
margin-right : 0px;
margin-top : 2px;
margin-bottom : 2px;
border: 1px solid #CCCCCC;
}
TR.memlist {
background-color: #f0f0f0;
}
P.formulaDsp { text-align: center; }
IMG.formulaDsp { }
IMG.formulaInl { vertical-align: middle; }
SPAN.keyword { color: #008000 }
SPAN.keywordtype { color: #604020 }
SPAN.keywordflow { color: #e08000 }
SPAN.comment { color: #800000 }
SPAN.preprocessor { color: #806020 }
SPAN.stringliteral { color: #002080 }
SPAN.charliteral { color: #008080 }
.mdTable {
border: 1px solid #868686;
background-color: #F4F4FB;
}
.mdRow {
padding: 8px 10px;
}
.mdescLeft {
font-size: smaller;
font-style: italic;
background-color: #FAFAFA;
padding-left: 8px;
border-top: 1px none #E0E0E0;
border-right: 1px none #E0E0E0;
border-bottom: 1px none #E0E0E0;
border-left: 1px none #E0E0E0;
margin: 0px;
}
.mdescRight {
font-size: smaller;
font-style: italic;
background-color: #FAFAFA;
padding-left: 4px;
border-top: 1px none #E0E0E0;
border-right: 1px none #E0E0E0;
border-bottom: 1px none #E0E0E0;
border-left: 1px none #E0E0E0;
margin: 0px;
padding-bottom: 0px;
padding-right: 8px;
}
.memItemLeft {
padding: 1px 0px 0px 8px;
margin: 4px;
border-top-width: 1px;
border-right-width: 1px;
border-bottom-width: 1px;
border-left-width: 1px;
border-top-style: solid;
border-top-color: #E0E0E0;
border-right-color: #E0E0E0;
border-bottom-color: #E0E0E0;
border-left-color: #E0E0E0;
border-right-style: none;
border-bottom-style: none;
border-left-style: none;
background-color: #FAFAFA;
font-size: 12px;
}
.memItemRight {
padding: 1px 0px 0px 8px;
margin: 4px;
border-top-width: 1px;
border-right-width: 1px;
border-bottom-width: 1px;
border-left-width: 1px;
border-top-style: solid;
border-top-color: #E0E0E0;
border-right-color: #E0E0E0;
border-bottom-color: #E0E0E0;
border-left-color: #E0E0E0;
border-right-style: none;
border-bottom-style: none;
border-left-style: none;
background-color: #FAFAFA;
font-size: 13px;
}
td.tiny {
font-size: 75%;
}
/*
a {
color: #252E78;
}
a:visited {
color: #3D2185;
}
*/
1.1 httpd-apreq-2/build/dox.foot
Index: dox.foot
===================================================================
<div id="footer">
<p class="apache">
Copyright © 2003-2004 <a href="http://www.apache.org";>The Apache
Software Foundation</a>.<br/>
See <a href="LICENSE.html">LICENSE</a>.</p>
<p class="menu">
<a href="http://www.apache.org/";>Apache Software Foundation</a> > <a
href="http://httpd.apache.org";>HTTP Server Project</a> >
<a href="http://httpd.apache.org/apreq/";>Request Library Subproject</a></p>
</div>
</body>
</html>
1.1 httpd-apreq-2/build/dox.head
Index: dox.head
===================================================================
<html>
<head>
<link rel="stylesheet" type="text/css" href="dox.css" />
<title>libapreq2 API Documentation</title>
</head>
<body>
<div id="page-header">
<p class="menu">
<a href="http://www.apache.org/";>Apache Software Foundation</a> > <a
href="http://httpd.apache.org";>HTTP Server Project</a> >
<a href="http://httpd.apache.org/apreq/";>Request Library Subproject</a></p>
<p class="apache">Apache HTTP Server Request Library</p>
<img alt="" src="feather.gif" /></div>
1.1 httpd-apreq-2/build/doxygen.conf.in
Index: doxygen.conf.in
===================================================================
PROJECT_NAME = "@[EMAIL PROTECTED]@VERSION@"
PROJECT_NUMBER = "Shared Library Version @APREQ_DOTTED_VERSION@"
OUTPUT_DIRECTORY = docs
OUTPUT_LANGUAGE = English
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
TAB_SIZE = 8
ALIASES =
OPTIMIZE_OUTPUT_FOR_C = YES
INTERNAL_DOCS = NO
GENERATE_TODOLIST = YES
GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= YES
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
QUIET = NO
WARNINGS = YES
WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
WARN_FORMAT = "$file:$line: $text"
INPUT = . src env
FILE_PATTERNS = *.c *.h CHANGES FAQ STATUS
RECURSIVE = NO
EXCLUDE =
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = apreq_tables* \
apreq_config*
EXAMPLE_PATH = ./
EXAMPLE_PATTERNS =
IMAGE_PATH = ./build/feather.gif
SOURCE_BROWSER = NO
ALPHABETICAL_INDEX = NO
COLS_IN_ALPHA_INDEX = 5
IGNORE_PREFIX =
GENERATE_HTML = YES
HTML_HEADER = build/dox.head
HTML_FOOTER = build/dox.foot
HTML_STYLESHEET = build/dox.css
HTML_ALIGN_MEMBERS = YES
GENERATE_LATEX = NO
GENERATE_RTF = NO
GENERATE_MAN = NO
GENERATE_XML = NO
GENERATE_AUTOGEN_DEF = NO
GENERATE_PERLMOD = NO
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
PREDEFINED = APREQ_DECLARE(x)=x \
APREQ_DECLARE_NONSTD(x)=x
TAGFILES = docs/apr.tag=http://apr.apache.org/docs/apr \
docs/apu.tag=http://apr.apache.org/docs/apr-util
GENERATE_TAGFILE = docs/apreq2.tag
ALLEXTERNALS = NO
EXTERNAL_GROUPS = NO
PERL_PATH = @PERL@
HIDE_UNDOC_RELATIONS = YES
SEARCHENGINE = NO
