joes 2004/06/14 12:16:01
Modified: . README RELEASE apreq2-config.in configure.ac
build version_check.pl
Added: build announcement.pl
Log:
Update name (Apache != HTTPD), and RELEASE instructions: build/annoucement.pl
will generate the formal message. Add new --package-* flags to apreq2-config,
replacing --apreq2-la-file with --la-file and --version with --library-version.
Revision Changes Path
1.7 +5 -4 httpd-apreq-2/README
Index: README
===================================================================
RCS file: /home/cvs/httpd-apreq-2/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- README 29 Oct 2003 17:58:00 -0000 1.6
+++ README 14 Jun 2004 19:16:00 -0000 1.7
@@ -1,11 +1,12 @@
- libapreq - Apache Request Library
+ Apache HTTP Request Library
What is it?
-----------
- libapreq (aka `apreq') is subproject of the Apache HTTP Server Project
- whose membership (the apreq `committers') develops and maintains the
- libapreq software library.
+ httpd-apreq is subproject of the Apache HTTP Server Project
+ whose committers develop and maintain the libapreq C library
+ and its language bindings for Perl (contributions for additional
+ language bindings are most welcome).
libapreq is a safe, standards-compliant, high-performance library
used for parsing HTTP cookies, query-strings and POST data. The
1.9 +3 -6 httpd-apreq-2/RELEASE
Index: RELEASE
===================================================================
RCS file: /home/cvs/httpd-apreq-2/RELEASE,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RELEASE 14 Jun 2004 02:19:58 -0000 1.8
+++ RELEASE 14 Jun 2004 19:16:00 -0000 1.9
@@ -93,11 +93,8 @@
Be sure to update the libapreq2 documentation. For instructions on
updating
the httpd website, see build/WEBSITE.
-10. Post a final announcement to the [EMAIL PROTECTED], [EMAIL PROTECTED],
modperl@ and
- apreq-dev@ lists:
+10. Mail the announcement from your cvs.apache.org account by piping the
+ "CPAN Upload" email acknowledgement (from PAUSE) through
build/announcement.pl:
- Subject: [ANNOUNCE] libapreq2-2.XX-dev release
+ % build/announcement.pl < CPAN_ack | ssh [EMAIL PROTECTED] "sendmail
-oi -t -odq"
- Include the md5 signature in the announcement, as well as
- a list of the latest version info and changes since the
- previous release.
1.4 +39 -24 httpd-apreq-2/apreq2-config.in
Index: apreq2-config.in
===================================================================
RCS file: /home/cvs/httpd-apreq-2/apreq2-config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apreq2-config.in 28 Feb 2004 07:48:14 -0000 1.3
+++ apreq2-config.in 14 Jun 2004 19:16:00 -0000 1.4
@@ -20,7 +20,7 @@
# APR-util script designed to allow easy command line access to APR-util
# configuration parameters.
-APREQ2_DOTTED_VERSION="@APREQ2_DOTTED_VERSION@"
+APREQ_DOTTED_VERSION="@APREQ_DOTTED_VERSION@"
prefix="@prefix@"
exec_prefix="@exec_prefix@"
@@ -32,10 +32,10 @@
INCLUDES="@APREQ_INCLUDES@"
LDFLAGS="@APREQ_LDFLAGS@"
-APREQ2_LIBNAME="@APREQ_LIBNAME@"
+APREQ_LIBNAME="@APREQ_LIBNAME@"
-APREQ2_SOURCE_DIR="@abs_srcdir@"
-APREQ2_BUILD_DIR="@abs_builddir@"
+APREQ_SOURCE_DIR="@abs_srcdir@"
+APREQ_BUILD_DIR="@abs_builddir@"
show_usage()
{
@@ -52,14 +52,17 @@
--srcdir print apreq2 source directory
--link-ld print link switch(es) for linking to libapreq2
--link-libtool print the libtool inputs for linking to libapreq2
- --apreq2-la-file print the path to the .la file, if available
- --version print libapreq2's version as a dotted triple
+ --la-file print the path to the library's .la file, if available
+ --library-version print the libapreq2 library version as a dotted triple
+ --package-version print the version of the distribution
+ --package-name print the distribution file's name
+ --package-title print the full name of the release
--help print this help
When linking with libtool, an application should do something like:
- APREQ2_LIBS="\`apreq2-config --link-libtool --libs\`"
+ APREQ_LIBS="\`apreq2-config --link-libtool --libs\`"
or when linking directly:
- APREQ2_LIBS="\`apreq2-config --link-ld --libs\`"
+ APREQ_LIBS="\`apreq2-config --link-ld --ldflags --libs\`"
An application should use the results of --includes, and --ldflags in
their build process.
@@ -82,8 +85,8 @@
# Otherwise, being in a symlinked dir may result in incorrect output.
if test -x "`which realpath 2>/dev/null`"; then
thisdir="`realpath $thisdir`"
- if test -d "$APREQ2_SOURCE_DIR"; then
- APREQ2_SOURCE_DIR="`realpath $APREQ2_SOURCE_DIR`"
+ if test -d "$APREQ_SOURCE_DIR"; then
+ APREQ_SOURCE_DIR="`realpath $APREQ_SOURCE_DIR`"
fi
if test -n "$tmpbindir"; then
tmpbindir="`realpath $tmpbindir`"
@@ -91,16 +94,16 @@
fi
if test "$tmpbindir" = "$thisdir"; then
location=installed
-elif test "$APREQ2_SOURCE_DIR" = "$thisdir"; then
+elif test "$APREQ_SOURCE_DIR" = "$thisdir"; then
location=source
else
location=build
fi
if test "$location" = "installed"; then
- LA_FILE="$libdir/lib${APREQ2_LIBNAME}.la"
+ LA_FILE="$libdir/lib${APREQ_LIBNAME}.la"
else
- LA_FILE="$thisdir/src/lib${APREQ2_LIBNAME}.la"
+ LA_FILE="$thisdir/src/lib${APREQ_LIBNAME}.la"
fi
flags=""
@@ -121,6 +124,18 @@
echo $prefix
exit 0
;;
+ --package-name)
+ echo "@[EMAIL PROTECTED]@[EMAIL PROTECTED]"
+ exit 0
+ ;;
+ --package-title)
+ echo "@PACKAGE_STRING@"
+ exit 0
+ ;;
+ --package-version)
+ echo "@VERSION@"
+ exit 0
+ ;;
--bindir)
echo $bindir
exit 0
@@ -132,10 +147,10 @@
if test "$location" = "installed"; then
flags="$includedir"
elif test "$location" = "source"; then
- flags="$APREQ2_SOURCE_DIR/src"
+ flags="$APREQ_SOURCE_DIR/src"
else
# this is for VPATH builds
- flags="$thisdir/include $APREQ2_SOURCE_DIR/src"
+ flags="$thisdir/include $APREQ_SOURCE_DIR/src"
fi
echo $flags
exit 0
@@ -144,29 +159,29 @@
if test "$location" = "installed"; then
flags="$flags -I$includedir $INCLUDES"
elif test "$location" = "source"; then
- flags="$flags -I$APREQ2_SOURCE_DIR/src $INCLUDES"
+ flags="$flags -I$APREQ_SOURCE_DIR/src $INCLUDES"
else
# this is for VPATH builds
- flags="$flags -I$thisdir/include -I$APREQ2_SOURCE_DIR/src $INCLUDES"
+ flags="$flags -I$thisdir/include -I$APREQ_SOURCE_DIR/src $INCLUDES"
fi
;;
--ldflags)
flags="$flags $LDFLAGS"
;;
--srcdir)
- echo $APREQ2_SOURCE_DIR
+ echo $APREQ_SOURCE_DIR
exit 0
;;
- --version)
- echo $APREQ2_DOTTED_VERSION
+ --library-version)
+ echo $APREQ_DOTTED_VERSION
exit 0
;;
--link-ld)
if test "$location" = "installed"; then
### avoid using -L if libdir is a "standard" location like /usr/lib
- flags="$flags -L$libdir -l$APREQ2_LIBNAME"
+ flags="$flags -L$libdir -l$APREQ_LIBNAME"
else
- flags="$flags -L$thisdir/src -l$APREQ2_LIBNAME"
+ flags="$flags -L$thisdir/src -l$APREQ_LIBNAME"
fi
;;
--link-libtool)
@@ -178,12 +193,12 @@
flags="$flags $LA_FILE"
elif test "$location" = "installed"; then
### avoid using -L if libdir is a "standard" location like /usr/lib
- flags="$flags -L$libdir -l$APREQ2_LIBNAME"
+ flags="$flags -L$libdir -l$APREQ_LIBNAME"
else
flags="$flags $LA_FILE"
fi
;;
- --apreq2-la-file)
+ --la-file)
if test -f "$LA_FILE"; then
flags="$flags $LA_FILE"
fi
1.18 +1 -1 httpd-apreq-2/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/httpd-apreq-2/configure.ac,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure.ac 12 Jun 2004 15:23:58 -0000 1.17
+++ configure.ac 14 Jun 2004 19:16:00 -0000 1.18
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.53)
-AC_INIT(libapreq - Apache Request Library, 2.04-dev, [EMAIL PROTECTED],
libapreq2)
+AC_INIT(Apache HTTP 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)
1.13 +1 -1 httpd-apreq-2/build/version_check.pl
Index: version_check.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/build/version_check.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- version_check.pl 14 Jun 2004 02:19:58 -0000 1.12
+++ version_check.pl 14 Jun 2004 19:16:01 -0000 1.13
@@ -2,7 +2,7 @@
use strict;
use warnings 'FATAL';
use Getopt::Long qw/GetOptions/;
-GetOptions(\my %opts, "version=s"),
+GetOptions(\my %opts, "version=s");
my ($tool, $path) = @ARGV;
$path = $tool unless defined $path;
1.1 httpd-apreq-2/build/announcement.pl
Index: announcement.pl
===================================================================
#! /usr/bin/perl
use warnings;
use strict;
our($PACKAGE_NAME, $PACKAGE_TITLE, $PACKAGE_VERSION, $LIBRARY_VERSION);
foreach (qw/PACKAGE_TITLE PACKAGE_NAME PACKAGE_VERSION LIBRARY_VERSION/) {
no strict 'refs';
my $opt = lc;
$opt =~ tr/_/-/;
chomp ($$_ = `./apreq2-config --$opt`);
}
sub slurp {
my $file_name = shift;
open my $fh, "<", $file_name or die "Can't open $file_name: $!";
read $fh, my $buf, -s $fh;
return wantarray ? split /\n/, $buf : $buf;
}
my $MAIL_FROM = '<' . (split /[:@]/, slurp "CVS/Root")[2] . '@apache.org>';
my $RCPT_TO = join ",\n ", map "<$_>" ,
qw(
[email protected]
[EMAIL PROTECTED]
[email protected]
[email protected]
);
my ($LICENSE_VERSION) = grep s/^\s+Version (\d\.\d),.*$/$1/, slurp "LICENSE";
my $CPAN_DATA = join "", <>;
$CPAN_DATA =~ /^has entered CPAN as(.+?)\nNo action is required/ms
or die "Bad CPAN message:\n$CPAN_DATA";
$CPAN_DATA = $1;
my $TITLE = "$PACKAGE_TITLE Released";
my $mail_header = <<EOH;
Subject: [ANNOUNCE] $TITLE
From: $MAIL_FROM
To: $RCPT_TO
EOH
my $preamble = <<EOT;
$TITLE
The Apache Software Foundation and The Apache HTTP Server Project
are pleased to announce the $PACKAGE_VERSION release of libapreq2. This
Announcement notes significant changes introduced in this release.
The package $PACKAGE_NAME is released under the Apache License
version $LICENSE_VERSION. It is now available through the ASF mirrors
http://httpd.apache.org/apreq/download.cgi
http://httpd.apache.org/apreq/download.cgi
and has entered the CPAN as $CPAN_DATA
EOT
my $changes = (split /[EMAIL PROTECTED]/, slurp "CHANGES")[1];
print <<EOM;
$mail_header
$preamble
libapreq2 is an APR-based shared library used for parsing HTTP cookies,
query-strings and POST data. The package $PACKAGE_NAME provides
1) version $LIBRARY_VERSION of the libapreq2 library,
2) mod_apreq, a filter module necessary for using libapreq2
within the Apache HTTP Server,
3) the Apache::Request, Apache::Cookie, and Apache::Upload
perl modules for using libapreq2 within modperl-2.
========================================================================
$changes
EOM
1;
