From laurawalker@example.com Sun Feb 01 16:42:46 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 58296 invoked from network); 1 Feb 2004 16:42:46 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Feb 2004 16:42:46 -0000 Received: (qmail 72569 invoked by uid 500); 1 Feb 2004 16:42:39 -0000 Delivered-To: laurawalker@example.com Received: (qmail 72511 invoked by uid 500); 1 Feb 2004 16:42:39 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 72479 invoked from network); 1 Feb 2004 16:42:39 -0000 Date: 1 Feb 2004 16:42:44 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr .cvsignore Makefile.in apr-config.in configure.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/01 08:42:44 Modified: . .cvsignore Makefile.in apr-config.in configure.in Log: Remove "location detection" from apr-config: * configure.in: Substitute APR_CONFIG_LOCATION as "build" or "source" appropriately. * apr-config.in: Set location to @APR_CONFIG_LOCATION@ rather than fragile pwd/realpath guesswork; pick up and use APR_BUILD_DIR instead of $thisdir. * Makefile.in (apr-config.out): New target. (install): Install apr-config.out instead of apr-config. PR: 8867 Revision Changes Path 1.17 +1 -0 apr/.cvsignore Index: .cvsignore =================================================================== RCS file: /home/cvs/apr/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -b -d -u -r1.16 -r1.17 --- .cvsignore 8 Dec 2002 17:16:25 -0000 1.16 +++ .cvsignore 1 Feb 2004 16:42:44 -0000 1.17 @@ -6,6 +6,7 @@ configure libtool apr-config +apr-config.out LibD LibR Debug 1.90 +7 -3 apr/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr/Makefile.in,v retrieving revision 1.89 retrieving revision 1.90 diff -b -d -u -r1.89 -r1.90 --- Makefile.in 3 Nov 2003 13:25:00 -0000 1.89 +++ Makefile.in 1 Feb 2004 16:42:44 -0000 1.90 @@ -31,7 +31,7 @@ # bring in rules.mk for standard functionality @INCLUDE_RULES@ -CLEAN_TARGETS = +CLEAN_TARGETS = apr-config.out DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ libtool apr.exp apr-config exports.c export_vars.h @@ -60,7 +60,11 @@ fi \ fi -install: $(TARGET_LIB) +# Create apr-config script suitable for the install tree +apr-config.out: apr-config + sed 's,^\(location=\).*$$,\1installed,' < apr-config > $@ + +install: $(TARGET_LIB) apr-config.out if [ ! -d $(DESTDIR)$(includedir) ]; then \ $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(includedir); \ fi; @@ -90,7 +94,7 @@ if [ ! -d $(DESTDIR)$(bindir) ]; then \ $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \ fi; - $(LIBTOOL) --mode=install cp apr-config $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install cp apr-config.out $(DESTDIR)$(bindir)/apr-config chmod 755 $(DESTDIR)$(bindir)/apr-config @if [ $(INSTALL_SUBDIRS) != "none" ]; then \ for i in $(INSTALL_SUBDIRS); do \ 1.37 +12 -33 apr/apr-config.in Index: apr-config.in =================================================================== RCS file: /home/cvs/apr/apr-config.in,v retrieving revision 1.36 retrieving revision 1.37 diff -b -d -u -r1.36 -r1.37 --- apr-config.in 24 Aug 2003 23:10:25 -0000 1.36 +++ apr-config.in 1 Feb 2004 16:42:44 -0000 1.37 @@ -2,7 +2,7 @@ # ==================================================================== # The Apache Software License, Version 1.1 # -# Copyright (c) 2001-2003 The Apache Software Foundation. All rights +# Copyright (c) 2001-2004 The Apache Software Foundation. All rights # reserved. # # Redistribution and use in source and binary forms, with or without @@ -76,10 +76,14 @@ EXTRA_INCLUDES="@EXTRA_INCLUDES@" SHLIBPATH_VAR="@shlibpath_var@" APR_SOURCE_DIR="@apr_srcdir@" +APR_BUILD_DIR="@apr_builddir@" APR_SO_EXT="@so_ext@" APR_LIB_TARGET="@export_lib_target@" APR_LIBNAME="@APR_LIBNAME@" +# NOTE: the following line is modified during 'make install': alter with care! +location=@APR_CONFIG_LOCATION@ + show_usage() { cat << EOF @@ -123,36 +127,10 @@ exit 1 fi -thisdir="`dirname $0`" -thisdir="`cd $thisdir && pwd`" -if test -d $bindir; then - tmpbindir="`cd $bindir && pwd`" -else - tmpbindir="" -fi -# If we have the realpath program, use it to resolve symlinks -# 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 "$APR_SOURCE_DIR"; then - APR_SOURCE_DIR="`realpath $APR_SOURCE_DIR`" - fi - if test -n "$tmpbindir"; then - tmpbindir="`realpath $tmpbindir`" - fi -fi -if test "$tmpbindir" = "$thisdir"; then - location=installed -elif test "$APR_SOURCE_DIR" = "$thisdir"; then - location=source -else - location=build -fi - if test "$location" = "installed"; then LA_FILE="$libdir/lib${APR_LIBNAME}.la" else - LA_FILE="$thisdir/lib${APR_LIBNAME}.la" + LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la" fi flags="" @@ -184,7 +162,7 @@ flags="$APR_SOURCE_DIR/include" else # this is for VPATH builds - flags="$thisdir/include $APR_SOURCE_DIR/include" + flags="$APR_BUILD_DIR/include $APR_SOURCE_DIR/include" fi echo $flags exit 0 @@ -216,7 +194,7 @@ flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" else # this is for VPATH builds - flags="$flags -I$thisdir/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" + flags="$flags -I$APR_BUILD_DIR/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" fi ;; --srcdir) @@ -230,7 +208,7 @@ echo "$APR_SOURCE_DIR/build" else # this is for VPATH builds - echo "$thisdir/build" + echo "$APR_BUILD_DIR/build" fi exit 0 ;; @@ -243,7 +221,8 @@ ### avoid using -L if libdir is a "standard" location like /usr/lib flags="$flags -L$libdir -l${APR_LIBNAME}" else - flags="$flags -L$thisdir -l${APR_LIBNAME}" + ### this surely can't work since the library is in .libs? + flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" fi ;; --link-libtool) @@ -281,7 +260,7 @@ if test "$location" = "installed"; then echo "${installbuilddir}/libtool" else - echo "$thisdir/libtool" + echo "$APR_BUILD_DIR/libtool" fi exit 0 ;; 1.567 +5 -0 apr/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apr/configure.in,v retrieving revision 1.566 retrieving revision 1.567 diff -b -d -u -r1.566 -r1.567 --- configure.in 26 Jan 2004 15:44:28 -0000 1.566 +++ configure.in 1 Feb 2004 16:42:44 -0000 1.567 @@ -47,7 +47,12 @@ if test "$apr_builddir" != "$apr_srcdir"; then USE_VPATH=1 + APR_CONFIG_LOCATION=build +else + APR_CONFIG_LOCATION=source fi + +AC_SUBST(APR_CONFIG_LOCATION) # Libtool might need this symbol -- it must point to the location of # the generated libtool script (not necessarily the "top" build dir). From laurawalker@example.com Mon Feb 02 21:39:24 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 66257 invoked from network); 2 Feb 2004 21:39:24 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 2 Feb 2004 21:39:24 -0000 Received: (qmail 29105 invoked by uid 500); 2 Feb 2004 21:39:01 -0000 Delivered-To: laurawalker@example.com Received: (qmail 29063 invoked by uid 500); 2 Feb 2004 21:39:01 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 29031 invoked from network); 2 Feb 2004 21:39:00 -0000 Date: 2 Feb 2004 21:39:11 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr/memory/unix apr_pools.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bnicholes 2004/02/02 13:39:11 Modified: memory/unix apr_pools.c Log: Move the NetWare memory pool cleanup code outside of the APR_POOL_DEBUG #if so that the clean up will happen regardless of the debugging mode. Submitted by: Jean-Jacques Clar [laurawalker@example.com] Revision Changes Path 1.204 +23 -18 apr/memory/unix/apr_pools.c Index: apr_pools.c =================================================================== RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- apr_pools.c 9 Dec 2003 17:43:01 -0000 1.203 +++ apr_pools.c 2 Feb 2004 21:39:11 -0000 1.204 @@ -596,24 +596,6 @@ global_allocator = NULL; } -#ifdef NETWARE -void netware_pool_proc_cleanup () -{ - apr_pool_t *pool = global_pool->child; - apr_os_proc_t owner_proc = (apr_os_proc_t)getnlmhandle(); - - while (pool) { - if (pool->owner_proc == owner_proc) { - apr_pool_destroy (pool); - pool = global_pool->child; - } - else { - pool = pool->sibling; - } - } - return; -} -#endif /* defined(NETWARE) */ /* Node list management helper macros; list_insert() inserts 'node' * before 'point'. */ @@ -1566,6 +1548,10 @@ #if APR_HAS_THREADS pool->owner = apr_os_thread_current(); #endif /* APR_HAS_THREADS */ +#ifdef NETWARE + pool->owner_proc = (apr_os_proc_t)getnlmhandle(); +#endif /* defined(NETWARE) */ + if (parent == NULL || parent->allocator != allocator) { #if APR_HAS_THREADS @@ -1758,6 +1744,25 @@ } #endif /* !APR_POOL_DEBUG */ + +#ifdef NETWARE +void netware_pool_proc_cleanup () +{ + apr_pool_t *pool = global_pool->child; + apr_os_proc_t owner_proc = (apr_os_proc_t)getnlmhandle(); + + while (pool) { + if (pool->owner_proc == owner_proc) { + apr_pool_destroy (pool); + pool = global_pool->child; + } + else { + pool = pool->sibling; + } + } + return; +} +#endif /* defined(NETWARE) */ /* From laurawalker@example.com Tue Feb 03 09:56:04 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 37236 invoked from network); 3 Feb 2004 09:56:03 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 3 Feb 2004 09:56:03 -0000 Received: (qmail 5544 invoked by uid 500); 3 Feb 2004 09:55:37 -0000 Delivered-To: laurawalker@example.com Received: (qmail 5490 invoked by uid 500); 3 Feb 2004 09:55:37 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 5457 invoked by uid 500); 3 Feb 2004 09:55:37 -0000 Delivered-To: laurawalker@example.com Date: 3 Feb 2004 09:56:01 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr-util Makefile.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/03 01:56:01 Modified: . Makefile.in Log: * Makefile.in: Remove files generated during 'make' in the 'clean' target. Revision Changes Path 1.78 +3 -4 apr-util/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr-util/Makefile.in,v retrieving revision 1.77 retrieving revision 1.78 diff -b -d -u -r1.77 -r1.78 --- Makefile.in 22 Oct 2003 13:36:46 -0000 1.77 +++ Makefile.in 3 Feb 2004 09:56:01 -0000 1.78 @@ -25,13 +25,12 @@ SUBDIRS = buckets crypto dbm encoding hooks ldap uri xml misc strmatch xlate CLEAN_SUBDIRS = . test -CLEAN_TARGETS = +CLEAN_TARGETS = exports.c export_vars.h aprutil.exp DISTCLEAN_TARGETS = config.cache config.log config.status libtool \ include/private/apu_config.h include/private/apu_private.h \ include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h \ - export_vars.sh aprutil.exp apu-config -EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in \ - exports.c export_vars.h + export_vars.sh apu-config +EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in prefix=@prefix@ exec_prefix=@exec_prefix@ From laurawalker@example.com Tue Feb 03 10:08:22 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 46750 invoked from network); 3 Feb 2004 10:08:22 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 3 Feb 2004 10:08:22 -0000 Received: (qmail 44804 invoked by uid 500); 3 Feb 2004 10:07:56 -0000 Delivered-To: laurawalker@example.com Received: (qmail 44748 invoked by uid 500); 3 Feb 2004 10:07:55 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 44724 invoked from network); 3 Feb 2004 10:07:55 -0000 Date: 3 Feb 2004 10:08:20 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr Makefile.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/03 02:08:20 Modified: . Makefile.in Log: * Makefile.in: Remove files generated during 'make' in the 'clean' target. Revision Changes Path 1.91 +2 -2 apr/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr/Makefile.in,v retrieving revision 1.90 retrieving revision 1.91 diff -b -d -u -r1.90 -r1.91 --- Makefile.in 1 Feb 2004 16:42:44 -0000 1.90 +++ Makefile.in 3 Feb 2004 10:08:20 -0000 1.91 @@ -31,10 +31,10 @@ # bring in rules.mk for standard functionality @INCLUDE_RULES@ -CLEAN_TARGETS = apr-config.out +CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.h DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ - libtool apr.exp apr-config exports.c export_vars.h + libtool apr-config EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in prefix=@prefix@ From laurawalker@example.com Tue Feb 03 10:32:33 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 62544 invoked from network); 3 Feb 2004 10:32:33 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 3 Feb 2004 10:32:33 -0000 Received: (qmail 24082 invoked by uid 500); 3 Feb 2004 10:32:07 -0000 Delivered-To: laurawalker@example.com Received: (qmail 23984 invoked by uid 500); 3 Feb 2004 10:32:06 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 23962 invoked by uid 500); 3 Feb 2004 10:32:06 -0000 Delivered-To: laurawalker@example.com Date: 3 Feb 2004 10:32:32 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr-util/xml/expat buildconf.sh X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/03 02:32:32 Modified: . buildconf xml/expat buildconf.sh Log: * buildconf, xml/expat/buildconf.sh: Remove autoconf caches after running autoconf too. Revision Changes Path 1.10 +3 -0 apr-util/buildconf Index: buildconf =================================================================== RCS file: /home/cvs/apr-util/buildconf,v retrieving revision 1.9 retrieving revision 1.10 diff -b -d -u -r1.9 -r1.10 --- buildconf 4 Feb 2003 14:22:56 -0000 1.9 +++ buildconf 3 Feb 2004 10:32:32 -0000 1.10 @@ -65,3 +65,6 @@ echo "Invoking xml/expat/buildconf.sh ..." (cd xml/expat; ./buildconf.sh) fi + +# Remove autoconf cache again +rm -rf autom4te*.cache 1.13 +3 -0 apr-util/xml/expat/buildconf.sh Index: buildconf.sh =================================================================== RCS file: /home/cvs/apr-util/xml/expat/buildconf.sh,v retrieving revision 1.12 retrieving revision 1.13 diff -b -d -u -r1.12 -r1.13 --- buildconf.sh 15 Jan 2004 14:49:07 -0000 1.12 +++ buildconf.sh 3 Feb 2004 10:32:32 -0000 1.13 @@ -60,4 +60,7 @@ ### do some work to toss config.cache? ${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" +# Remove autoconf caches +rm -rf autom4te*.cache + exit 0 From laurawalker@example.com Thu Feb 05 10:16:35 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 42418 invoked from network); 5 Feb 2004 10:16:34 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2004 10:16:34 -0000 Received: (qmail 7949 invoked by uid 500); 5 Feb 2004 10:16:03 -0000 Delivered-To: laurawalker@example.com Received: (qmail 7882 invoked by uid 500); 5 Feb 2004 10:16:03 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 7824 invoked by uid 500); 5 Feb 2004 10:16:02 -0000 Delivered-To: laurawalker@example.com Date: 5 Feb 2004 10:16:27 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr-util/xml Makefile.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N gstein 2004/02/05 02:16:27 Modified: . .cvsignore Makefile.in buildconf configure.in build apr_rules.mk.in . .cvsignore Makefile.in buildconf configure.in Added: . build.conf build gen-build.py . build.conf build gen-uri-delims.py Removed: atomic/os390 Makefile.in atomic/unix Makefile.in build Makefile.in dso/aix Makefile.in dso/beos Makefile.in dso/os2 Makefile.in dso/os390 Makefile.in dso/unix Makefile.in file_io/os2 Makefile.in file_io/unix Makefile.in locks/beos Makefile.in locks/os2 Makefile.in locks/unix Makefile.in memory/unix Makefile.in misc/unix Makefile.in mmap/unix Makefile.in network_io/beos Makefile.in network_io/os2 Makefile.in network_io/unix Makefile.in passwd Makefile.in poll/os2 Makefile.in poll/unix Makefile.in random/unix Makefile.in shmem/beos Makefile.in shmem/os2 Makefile.in shmem/unix Makefile.in strings Makefile.in support/unix Makefile.in tables Makefile.in threadproc/beos Makefile.in threadproc/os2 Makefile.in threadproc/unix Makefile.in time/unix Makefile.in user/unix Makefile.in buckets Makefile.in crypto Makefile.in dbm Makefile.in dbm/sdbm Makefile.in encoding Makefile.in hooks Makefile.in ldap Makefile.in misc Makefile.in strmatch Makefile.in uri Makefile.in xlate Makefile.in xml Makefile.in Log: First whack at switching to a single top-level make. This adds a dependency upon Python at packaging time, but not at end-user config/build time. As far as I can tell, the build continues to function properly. (out-of-dir config/make not tested, and apr-iconv prolly needs some work) The buildconf scripts now generate a build-outputs.mk file which is included by the root's Makefile (via the build/gen-build.py script). bulid-outputs.mk specifies all of the various files present in the distribution. The top-level Makefiles were simplified to use an $(OBJECTS) symbol rather than 'find'ing them. Similarly, a $(HEADERS) symbol is used for the exports. The corresponding delete-* targets were eliminated since we have a precise set of inputs. The subdirs' Makefiles were removed since they are no longer called/used. The apr-util/uri Makefile was responsible for compiling a C program to generate the uri_delims.h file. That process was replaced by a Python script to generate the header (called by buildconf). The .c and .dsp were left for the Windows build to continue, but that should be revamped. build/apr_rules.mk was revamped somewhat to avoid recursion, but a lot of cleanup is still needed. Much of the recursive/local/x- logic is no longer needed and can be elimianated. rules.mk was created for inclusion by N makefiles, but that isn't really true any more, so it could probably be tossed (caveat: test/Makefile). Saved for a phase 2. Some additional work was added to properly clean up files in */build/, rather than relying on a makefile in there. Revision Changes Path 1.18 +1 -0 apr/.cvsignore Index: .cvsignore =================================================================== RCS file: /home/cvs/apr/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -u -r1.17 -r1.18 --- .cvsignore 1 Feb 2004 16:42:44 -0000 1.17 +++ .cvsignore 5 Feb 2004 10:16:20 -0000 1.18 @@ -32,3 +32,4 @@ *.vcproj autom4te.cache ltcf-c.sh +build-outputs.mk 1.92 +15 -40 apr/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr/Makefile.in,v retrieving revision 1.91 retrieving revision 1.92 diff -u -u -r1.91 -r1.92 --- Makefile.in 3 Feb 2004 10:08:20 -0000 1.91 +++ Makefile.in 5 Feb 2004 10:16:20 -0000 1.92 @@ -10,14 +10,14 @@ # Macros for supporting directories # INCDIR=./include -INCDIR1=../include -INCLUDES=-I$(INCDIR) -I$(INCDIR1) +OSDIR=$(INCDIR)/arch/@OSDIR@ +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) # # Macros for target determination # -SUBDIRS=@SUBDIRS@ -CLEAN_SUBDIRS= . test build +CLEAN_SUBDIRS= test INSTALL_SUBDIRS=@INSTALL_SUBDIRS@ TARGET_LIB = lib@APR_LIBNAME@.la @@ -26,16 +26,18 @@ # Rules for building specific targets, starting with 'all' for # building the entire package. # -TARGETS = delete-lib $(TARGET_LIB) delete-exports export_vars.h apr.exp +TARGETS = $(TARGET_LIB) export_vars.h apr.exp # bring in rules.mk for standard functionality @INCLUDE_RULES@ +@INCLUDE_OUTPUTS@ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.h DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ - libtool apr-config -EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in + libtool apr-config build/apr_rules.mk +EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in \ + build-outputs.mk build/ltcf-c.sh build/ltmain.sh build/libtool.m4 prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -48,17 +50,6 @@ top_srcdir=@apr_srcdir@ top_blddir=@apr_builddir@ -EXPORT_FILES = $(top_srcdir)/include/*.h - -delete-lib: - @if test -f $(TARGET_LIB); then \ - for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \ - if test -n "`find $$objects -newer $(TARGET_LIB)`"; then \ - echo Found newer objects. Will relink $(TARGET_LIB). ; \ - echo $(RM) -f $(TARGET_LIB) ; \ - $(RM) -f $(TARGET_LIB) ; \ - fi \ - fi # Create apr-config script suitable for the install tree apr-config.out: apr-config @@ -102,27 +93,14 @@ done \ fi -$(TARGET_LIB): - @for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \ - tmpcmd="$(LINK) @lib_target@ $(ALL_LIBS)"; \ - echo $$tmpcmd; \ - $$tmpcmd && touch $@ - -delete-exports: - @if test -f apr.exp; then \ - headers="`find include/*.h -newer apr.exp`" ; \ - if test -n "$$headers"; then \ - echo Found newer headers. Will rebuild apr.exp. ; \ - echo $(RM) -f apr.exp exports.c export_vars.h ; \ - $(RM) -f apr.exp exports.c export_vars.h ; \ - fi \ - fi +$(TARGET_LIB): $(OBJECTS) + $(LINK) @lib_target@ $(ALL_LIBS) -exports.c: - $(AWK) -f $(top_srcdir)/build/make_exports.awk $(EXPORT_FILES) > $@ +exports.c: $(HEADERS) + $(AWK) -f $(top_srcdir)/build/make_exports.awk $^ > $@ -export_vars.h: - $(AWK) -f $(top_srcdir)/build/make_var_export.awk $(EXPORT_FILES) > $@ +export_vars.h: $(HEADERS) + $(AWK) -f $(top_srcdir)/build/make_var_export.awk $^ > $@ apr.exp: exports.c export_vars.h @echo "#! lib@APR_LIBNAME@.so" > $@ @@ -142,6 +120,3 @@ # DO NOT REMOVE docs: $(INCDIR)/*.h - -.PHONY: delete-lib delete-exports -.NOTPARALLEL: delete-lib delete-exports 1.28 +3 -0 apr/buildconf Index: buildconf =================================================================== RCS file: /home/cvs/apr/buildconf,v retrieving revision 1.27 retrieving revision 1.28 diff -u -u -r1.27 -r1.28 --- buildconf 15 Jan 2004 14:12:58 -0000 1.27 +++ buildconf 5 Feb 2004 10:16:20 -0000 1.28 @@ -118,4 +118,7 @@ # Remove autoconf 2.5x's cache directory rm -rf autom4te*.cache +echo "Generating 'make' outputs ..." +build/gen-build.py make + exit 0 1.568 +12 -41 apr/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apr/configure.in,v retrieving revision 1.567 retrieving revision 1.568 diff -u -u -r1.567 -r1.568 --- configure.in 1 Feb 2004 16:42:44 -0000 1.567 +++ configure.in 5 Feb 2004 10:16:20 -0000 1.568 @@ -178,15 +178,15 @@ [ use_libtool=$withval ], [ use_libtool="yes" ] ) if test "x$use_libtool" = "xyes"; then - lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -c $< && touch $@' + lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@' LT_VERSION="-version-info `$get_version libtool $version_hdr APR`" link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@" so_ext='lo' - lib_target='-rpath $(libdir) $$objects' - export_lib_target='-rpath \$(libdir) \$\$objects' + lib_target='-rpath $(libdir) $(OBJECTS)' + export_lib_target='-rpath \$(libdir) \$(OBJECTS)' else - lt_compile='$(COMPILE) -c $<' - link='$(AR) cr $(TARGET_LIB) $$objects; $(RANLIB) $(TARGET_LIB)' + lt_compile='$(COMPILE) -o $@ -c $<' + link='$(AR) cr $(TARGET_LIB) $(OBJECTS); $(RANLIB) $(TARGET_LIB)' so_ext='o' lib_target='' export_lib_target='' @@ -1873,24 +1873,10 @@ AC_SUBST(LIBTOOL_LIBS) echo "${nl}Construct Makefiles and header files." -MAKEFILE1="Makefile strings/Makefile passwd/Makefile tables/Makefile build/Makefile" -SUBDIRS="strings passwd tables " -for dir in $apr_modules -do - test -d $dir || $MKDIR $dir - if test -f $srcdir/$dir/$OSDIR/Makefile.in; then - MAKEFILE2="$MAKEFILE2 $dir/$OSDIR/Makefile " - SUBDIRS="$SUBDIRS $dir/$OSDIR " - else - MAKEFILE2="$MAKEFILE2 $dir/$DEFAULT_OSDIR/Makefile " - SUBDIRS="$SUBDIRS $dir/$DEFAULT_OSDIR " - fi -done - +MAKEFILES="Makefile" if test -d $srcdir/test; then - MAKEFILE3="test/Makefile test/internal/Makefile" + MAKEFILES="$MAKEFILES test/Makefile test/internal/Makefile" fi -AC_SUBST(SUBDIRS) # # BSD/OS (BSDi) needs to use a different include syntax in the Makefiles @@ -1900,16 +1886,20 @@ # Check whether they've installed GNU make if make --version > /dev/null 2>&1; then INCLUDE_RULES="include $apr_buildout/apr_rules.mk" + INCLUDE_OUTPUTS="include build-outputs.mk" else # BSDi make INCLUDE_RULES=".include \"$apr_buildout/apr_rules.mk\"" + INCLUDE_OUTPUTS=".include \"build-outputs.mk\"" fi ;; *) INCLUDE_RULES="include $apr_buildout/apr_rules.mk" + INCLUDE_OUTPUTS="include build-outputs.mk" ;; esac AC_SUBST(INCLUDE_RULES) +AC_SUBST(INCLUDE_OUTPUTS) SAVE_FILES="include/apr.h include/arch/unix/apr_private.h" @@ -1921,7 +1911,7 @@ test -d $dir || $MKDIR $dir AC_OUTPUT([ - $MAKEFILE1 $MAKEFILE2 $MAKEFILE3 + $MAKEFILES include/apr.h build/apr_rules.mk apr-config @@ -1935,22 +1925,3 @@ done chmod +x apr-config ]) - -dnl ----------------------------- Fixup Makefiles for VPATH support - -changequote({,}) - -if test -n "$USE_VPATH"; then - for makefile in $MAKEFILE1 $MAKEFILE2 $MAKEFILE3; do - cat $makefile | \ - sed \ - -e 's#-I\($(INCDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \ - -e 's#-I\($(OSDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \ - -e 's#-I\($(DEFOSDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \ - > tmp - cp tmp $makefile - done - rm -f tmp -fi - -changequote([,]) 1.1 apr/build.conf Index: build.conf =================================================================== # # Configuration file for APR. Used by APR/build/gen-build.py # [options] paths = atomic/{platform}/*.c dso/{platform}/*.c file_io/{platform}/*.c locks/{platform}/*.c memory/{platform}/*.c misc/{platform}/*.c mmap/{platform}/*.c network_io/{platform}/*.c passwd/*.c poll/{platform}/*.c random/{platform}/*.c shmem/{platform}/*.c strings/*.c support/{platform}/*.c tables/*.c threadproc/{platform}/*.c time/{platform}/*.c user/{platform}/*.c headers = include/*.h # aplibtool is manually built by the configure process # build/aplibtool.c # we have a recursive makefile for the test files (for now) # test/*.c 1.2 +14 -7 apr/build/apr_rules.mk.in Index: apr_rules.mk.in =================================================================== RCS file: /home/cvs/apr/build/apr_rules.mk.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- apr_rules.mk.in 4 Feb 2003 20:56:16 -0000 1.1 +++ apr_rules.mk.in 5 Feb 2004 10:16:21 -0000 1.2 @@ -140,9 +140,9 @@ all-recursive depend-recursive: @otarget=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; \ + list='$(SOURCE_DIRS)'; \ for i in $$list; do \ - if test -d "$$i"; then \ + if test -f "$$i/Makefile"; then \ target="$$otarget"; \ echo "Making $$target in $$i"; \ if test "$$i" = "."; then \ @@ -161,9 +161,9 @@ clean-recursive distclean-recursive extraclean-recursive: @otarget=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS) $(CLEAN_SUBDIRS)'; \ + list='$(CLEAN_SUBDIRS)'; \ for i in $$list; do \ - if test -d "$$i"; then \ + if test -f "$$i/Makefile"; then \ target="$$otarget"; \ echo "Making $$target in $$i"; \ if test "$$i" = "."; then \ @@ -182,10 +182,17 @@ # autoconf 2.5x is creating a 'autom4te.cache' directory # In case someone ran autoconf by hand, get rid of that directory -# aswell. +# as well. local-clean: x-local-clean - $(RM) -f *.o *.lo *.a *.la *.so *.obj $(CLEAN_TARGETS) $(PROGRAMS) - $(RM) -rf .libs autom4te.cache + @list='. $(SOURCE_DIRS)'; \ + for i in $$list; do \ + echo $(RM) -f $$i/*.o $$i/*.lo $$i/*.a $$i/*.la $$i/*.so $$i/*.obj; \ + $(RM) -f $$i/*.o $$i/*.lo $$i/*.a $$i/*.la $$i/*.so $$i/*.obj; \ + echo $(RM) -rf $$i/.libs; \ + $(RM) -rf $$i/.libs; \ + done + $(RM) -f $(CLEAN_TARGETS) $(PROGRAMS) + $(RM) -rf autom4te.cache local-distclean: local-clean x-local-distclean $(RM) -f Makefile $(DISTCLEAN_TARGETS) 1.1 apr/build/gen-build.py Index: gen-build.py =================================================================== #!/usr/bin/env python # # USAGE: gen-build.py TYPE # # where TYPE is one of: make, dsp, vcproj # # It reads build.conf from the current directory, and produces its output # into the current directory. # import os import ConfigParser import getopt import string import glob import re #import ezt def main(): parser = ConfigParser.ConfigParser() parser.read('build.conf') dirs = { } files = get_files(parser.get('options', 'paths')) headers = get_files(parser.get('options', 'headers')) # compute the relevant headers, along with the implied includes legal_deps = map(os.path.basename, headers) h_deps = { } for fname in headers: h_deps[os.path.basename(fname)] = extract_deps(fname, legal_deps) resolve_deps(h_deps) f = open('build-outputs.mk', 'w') f.write('# DO NOT EDIT. AUTOMATICALLY GENERATED.\n\n') objects = [ ] for file in files: assert file[-2:] == '.c' obj = file[:-2] + '.lo' objects.append(obj) dirs[os.path.dirname(file)] = None # what headers does this file include, along with the implied headers deps = extract_deps(file, legal_deps) for hdr in deps.keys(): deps.update(h_deps.get(hdr, {})) f.write('%s: %s %s\n' % (obj, file, string.join(deps.keys(), ' '))) f.write('\nOBJECTS = %s\n\n' % string.join(objects)) f.write('HEADERS = %s\n\n' % string.join(headers)) f.write('SOURCE_DIRS = %s\n\n' % string.join(dirs.keys())) def extract_deps(fname, legal_deps): "Extract the headers this file includes." deps = { } for line in open(fname).readlines(): if line[:8] != '#include': continue inc = _re_include.match(line).group(1) if inc in legal_deps: deps[inc] = None return deps _re_include = re.compile('#include *["<](.*)[">]') def resolve_deps(header_deps): "Alter the provided dictionary to flatten includes-of-includes." altered = 1 while altered: altered = 0 for hdr, deps in header_deps.items(): print hdr, deps start = len(deps) for dep in deps.keys(): deps.update(header_deps.get(dep, {})) if len(deps) != start: altered = 1 def get_files(patterns): patterns = string.replace(patterns, '{platform}', get_platform()) patterns = string.split(string.strip(patterns)) files = [ ] for pat in patterns: files.extend(glob.glob(pat)) return files def get_platform(): return 'unix' if __name__ == '__main__': main() 1.18 +1 -0 apr-util/.cvsignore Index: .cvsignore =================================================================== RCS file: /home/cvs/apr-util/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -u -r1.17 -r1.18 --- .cvsignore 12 Nov 2003 22:24:34 -0000 1.17 +++ .cvsignore 5 Feb 2004 10:16:25 -0000 1.18 @@ -33,3 +33,4 @@ *.sto *.vcproj autom4te.cache +build-outputs.mk 1.79 +14 -39 apr-util/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr-util/Makefile.in,v retrieving revision 1.78 retrieving revision 1.79 diff -u -u -r1.78 -r1.79 --- Makefile.in 3 Feb 2004 09:56:01 -0000 1.78 +++ Makefile.in 5 Feb 2004 10:16:25 -0000 1.79 @@ -17,20 +17,23 @@ TARGET_LIB = lib@APRUTIL_LIBNAME@.la INSTALL_SUBDIRS = @APR_XML_DIR@ -TARGETS = delete-lib $(TARGET_LIB) delete-exports aprutil.exp export_vars.h +TARGETS = $(TARGET_LIB) aprutil.exp export_vars.h # bring in rules.mk for standard functionality @INCLUDE_RULES@ +@INCLUDE_OUTPUTS@ -SUBDIRS = buckets crypto dbm encoding hooks ldap uri xml misc strmatch xlate -CLEAN_SUBDIRS = . test +CLEAN_SUBDIRS = test CLEAN_TARGETS = exports.c export_vars.h aprutil.exp DISTCLEAN_TARGETS = config.cache config.log config.status libtool \ include/private/apu_config.h include/private/apu_private.h \ include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h \ - export_vars.sh apu-config -EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in + export_vars.sh apu-config build/rules.mk +EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in \ + exports.c export_vars.h uri/uri_delims.h build-outputs.mk \ + build/apr_common.m4 build/find_apr.m4 build/install.sh \ + build/config.guess build/config.sub prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -40,17 +43,6 @@ top_srcdir=@abs_srcdir@ top_blddir=@abs_builddir@ -EXPORT_FILES = $(top_srcdir)/include/*.h - -delete-lib: - @if test -f $(TARGET_LIB); then \ - objects="`find $(SUBDIRS) -name expat -prune -o -name '*.@so_ext@' -a -newer $(TARGET_LIB) -print`" ; \ - if test -n "$$objects"; then \ - echo Found newer objects. Will relink $(TARGET_LIB). ; \ - echo $(RM) -f $(TARGET_LIB) ; \ - $(RM) -f $(TARGET_LIB) ; \ - fi; \ - fi install: $(TARGET_LIB) if [ ! -d $(DESTDIR)$(includedir) ]; then \ @@ -75,27 +67,14 @@ $(LIBTOOL) --mode=install cp apu-config $(DESTDIR)$(bindir) chmod 755 $(DESTDIR)$(bindir)/apu-config -$(TARGET_LIB): - @objects="`find $(SUBDIRS) -name expat -prune -o -name 'gen_uri_delims.@so_ext@' -prune -o -name '*.@so_ext@' -print`"; \ - tmpcmd="$(LINK) @lib_target@ @EXTRA_OS_LINK@"; \ - echo $$tmpcmd; \ - $$tmpcmd && touch $@ - -delete-exports: - @if test -f aprutil.exp; then \ - headers="`find include/*.h -newer aprutil.exp -print`" ; \ - if test -n "$$headers"; then \ - echo Found newer headers. Will rebuild aprutil.exp. ; \ - echo $(RM) -f aprutil.exp exports.c export_vars.h ; \ - $(RM) -f aprutil.exp exports.c export_vars.h; \ - fi \ - fi +$(TARGET_LIB): $(OBJECTS) + $(LINK) @lib_target@ $(ALL_LIBS) -exports.c: - $(AWK) -f @APR_SOURCE_DIR@/build/make_exports.awk $(EXPORT_FILES) > $@ +exports.c: $(HEADERS) + $(AWK) -f @APR_SOURCE_DIR@/build/make_exports.awk $^ > $@ -export_vars.h: - $(AWK) -f @APR_SOURCE_DIR@/build/make_var_export.awk $(EXPORT_FILES) > $@ +export_vars.h: $(HEADERS) + $(AWK) -f @APR_SOURCE_DIR@/build/make_var_export.awk $^ > $@ aprutil.exp: exports.c export_vars.h @echo "#! libaprutil.so" > $@ @@ -109,7 +88,3 @@ check: $(TARGET_LIB) (cd test && $(MAKE) check) - - -.PHONY: delete-lib delete-exports -.NOTPARALLEL: delete-lib delete-exports 1.11 +13 -0 apr-util/buildconf Index: buildconf =================================================================== RCS file: /home/cvs/apr-util/buildconf,v retrieving revision 1.10 retrieving revision 1.11 diff -u -u -r1.10 -r1.11 --- buildconf 3 Feb 2004 10:32:32 -0000 1.10 +++ buildconf 5 Feb 2004 10:16:25 -0000 1.11 @@ -59,6 +59,19 @@ fi # +# Generate the URI delimiter table +# +### this is so stupidly static, that I'm not sure why we generate it... +echo "Generating uri_delims.h ..." +build/gen-uri-delims.py > uri/uri_delims.h + +# +# Generate build-outputs.mk for the build systme +# +echo "Generating 'make' outputs ..." +$apr_src_dir/build/gen-build.py make + +# # If Expat has been bundled, then go and configure the thing # if test -d xml/expat; then 1.72 +5 -1 apr-util/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apr-util/configure.in,v retrieving revision 1.71 retrieving revision 1.72 diff -u -u -r1.71 -r1.72 --- configure.in 16 Nov 2003 23:00:45 -0000 1.71 +++ configure.in 5 Feb 2004 10:16:25 -0000 1.72 @@ -166,15 +166,19 @@ # Check whether they've installed GNU make if make --version > /dev/null 2>&1; then INCLUDE_RULES="include $abs_builddir/build/rules.mk" + INCLUDE_OUTPUTS="include build-outputs.mk" else INCLUDE_RULES=".include \"$abs_builddir/build/rules.mk\"" + INCLUDE_OUTPUTS=".include \"build-outputs.mk\"" fi ;; *) INCLUDE_RULES="include $abs_builddir/build/rules.mk" + INCLUDE_OUTPUTS="include build-outputs.mk" ;; esac AC_SUBST(INCLUDE_RULES) +AC_SUBST(INCLUDE_OUTPUTS) if test -d ./test; then test_Makefile="test/Makefile" @@ -187,7 +191,7 @@ dnl dnl everthing is done. -MAKEFILES="Makefile buckets/Makefile crypto/Makefile dbm/Makefile dbm/sdbm/Makefile encoding/Makefile hooks/Makefile ldap/Makefile uri/Makefile xml/Makefile misc/Makefile strmatch/Makefile xlate/Makefile $test_Makefile" +MAKEFILES="Makefile $test_Makefile" AC_OUTPUT([ export_vars.sh apu-config 1.1 apr-util/build.conf Index: build.conf =================================================================== # # Configuration file for APRUTIL. Used by APR/build/gen-build.py # [options] paths = buckets/*.c crypto/*.c dbm/*.c dbm/sdbm/*.c encoding/*.c hooks/*.c ldap/*.c misc/*.c uri/apr_uri.c xml/*.c strmatch/*.c xlate/*.c headers = include/*.h # gen_uri_delim.c # we have a recursive makefile for the test files (for now) # test/*.c 1.1 apr-util/build/gen-uri-delims.py Index: gen-uri-delims.py =================================================================== #!/usr/bin/env python # # generates a table of 256 values, where certain characters are # marked "interesting" for the uri parsing process. # # USAGE: # $ gen-uri-delims.py > uri/uri_delims.h # # typically invoked by the "buildconf" script # import sys import string write = sys.stdout.write write('/* this file is automatically generated by gen-uri-delims.py, ' 'do not edit */\n') write('static const unsigned char uri_delims[256] = {') values = [ '0' ] * 256 values[ord(':')] = 'T_COLON' values[ord('/')] = 'T_SLASH' values[ord('?')] = 'T_QUESTION' values[ord('#')] = 'T_HASH' values[0] = 'T_NUL' while values: write('\n %s' % string.join(values[:20], ',')) del values[:20] if values: write(',') write('\n};\n') From laurawalker@example.com Thu Feb 05 10:17:35 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 43805 invoked from network); 5 Feb 2004 10:17:34 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2004 10:17:34 -0000 Received: (qmail 11708 invoked by uid 500); 5 Feb 2004 10:17:08 -0000 Delivered-To: laurawalker@example.com Received: (qmail 11662 invoked by uid 500); 5 Feb 2004 10:17:08 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 11635 invoked by uid 500); 5 Feb 2004 10:17:07 -0000 Delivered-To: laurawalker@example.com Date: 5 Feb 2004 10:17:32 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr-util CHANGES X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N gstein 2004/02/05 02:17:32 Modified: . CHANGES . CHANGES Log: record recent changes for a single top-level make Revision Changes Path 1.450 +2 -0 apr/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/apr/CHANGES,v retrieving revision 1.449 retrieving revision 1.450 diff -u -u -r1.449 -r1.450 --- CHANGES 30 Jan 2004 12:33:46 -0000 1.449 +++ CHANGES 5 Feb 2004 10:17:(949)954-7432.450 @@ -7,6 +7,8 @@ Changes with APR 1.0 + *) Switch to a single, top-level make. [Greg Stein] + *) Return an error instead of silently failing when apr_poll() is used with file descriptors >= FD_SETSIZE. (Unix systems with no native poll()) [Jeff Trawick, Brad Nicholes] 1.124 +2 -0 apr-util/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/apr-util/CHANGES,v retrieving revision 1.123 retrieving revision 1.124 diff -u -u -r1.123 -r1.124 --- CHANGES 22 Dec 2003 23:02:32 -0000 1.123 +++ CHANGES 5 Feb 2004 10:17:32 -0000 1.124 @@ -1,5 +1,7 @@ Changes with APR-util 1.0 + *) Switch to a single, top-level make. [Greg Stein] + *) Add timeout feature to apr_reslist_acquire(). [Mladen Turk <mturk apache.org>] From laurawalker@example.com Thu Feb 05 10:24:19 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 48342 invoked from network); 5 Feb 2004 10:24:19 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2004 10:24:19 -0000 Received: (qmail 32749 invoked by uid 500); 5 Feb 2004 10:23:53 -0000 Delivered-To: laurawalker@example.com Received: (qmail 32688 invoked by uid 500); 5 Feb 2004 10:23:52 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 32650 invoked from network); 5 Feb 2004 10:23:52 -0000 Date: 5 Feb 2004 10:24:17 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr/misc/unix errorcodes.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N martin 2004/02/05 02:24:17 Modified: misc/unix errorcodes.c Log: The APR_EGENERAL error is used inside Apache for returning internal error situations. However, when it was actually translated into a string, it read "Error string not specified yet". Add a string "Internal error" (and use "Error string not specified yet" for other (unspecified) APR errors). Revision Changes Path 1.57 +2 -0 apr/misc/unix/errorcodes.c Index: errorcodes.c =================================================================== RCS file: /home/cvs/apr/misc/unix/errorcodes.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -u -r1.56 -r1.57 --- errorcodes.c 12 Nov 2003 14:57:26 -0000 1.56 +++ errorcodes.c 5 Feb 2004 10:24:17 -0000 1.57 @@ -168,6 +168,8 @@ return "The given path contained wildcard characters"; case APR_EPROC_UNKNOWN: return "The process is not recognized."; + case APR_EGENERAL: + return "Internal error"; default: return "Error string not specified yet"; } From laurawalker@example.com Thu Feb 05 11:10:42 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 87088 invoked from network); 5 Feb 2004 11:10:42 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2004 11:10:42 -0000 Received: (qmail 74413 invoked by uid 500); 5 Feb 2004 11:10:14 -0000 Delivered-To: laurawalker@example.com Received: (qmail 74345 invoked by uid 500); 5 Feb 2004 11:10:13 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 74317 invoked from network); 5 Feb 2004 11:10:13 -0000 Date: 5 Feb 2004 11:10:39 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr configure.in Makefile.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/05 03:10:39 Modified: . configure.in Makefile.in Log: VPATH build fixes: * configure.in: laurawalker@example.com in the srcdir. * Makefile.in: Define top_srcdir and top_blddir etc higher; include $srcdir/arch/@OSDIR@ and $srcdir/include. Revision Changes Path 1.569 +3 -3 apr/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apr/configure.in,v retrieving revision 1.568 retrieving revision 1.569 diff -b -d -u -r1.568 -r1.569 --- configure.in 5 Feb 2004 10:16:20 -0000 1.568 +++ configure.in 5 Feb 2004 11:10:39 -0000 1.569 @@ -1886,16 +1886,16 @@ # Check whether they've installed GNU make if make --version > /dev/null 2>&1; then INCLUDE_RULES="include $apr_buildout/apr_rules.mk" - INCLUDE_OUTPUTS="include build-outputs.mk" + INCLUDE_OUTPUTS="include $apr_srcdir/build-outputs.mk" else # BSDi make INCLUDE_RULES=".include \"$apr_buildout/apr_rules.mk\"" - INCLUDE_OUTPUTS=".include \"build-outputs.mk\"" + INCLUDE_OUTPUTS=".include \"$apr_srcdir/build-outputs.mk\"" fi ;; *) INCLUDE_RULES="include $apr_buildout/apr_rules.mk" - INCLUDE_OUTPUTS="include build-outputs.mk" + INCLUDE_OUTPUTS="include $apr_srcdir/build-outputs.mk" ;; esac AC_SUBST(INCLUDE_RULES) 1.93 +8 -7 apr/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr/Makefile.in,v retrieving revision 1.92 retrieving revision 1.93 diff -b -d -u -r1.92 -r1.93 --- Makefile.in 5 Feb 2004 10:16:20 -0000 1.92 +++ Makefile.in 5 Feb 2004 11:10:39 -0000 1.93 @@ -1,3 +1,9 @@ + +srcdir=@srcdir@ +VPATH=@srcdir@ +top_srcdir=@apr_srcdir@ +top_blddir=@apr_builddir@ + # # APR (Apache Portable Runtime) library Makefile. # @@ -10,9 +16,9 @@ # Macros for supporting directories # INCDIR=./include -OSDIR=$(INCDIR)/arch/@OSDIR@ +OSDIR=$(top_srcdir)/include/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include # # Macros for target determination @@ -45,11 +51,6 @@ libdir=@libdir@ includedir=@includedir@ installbuilddir=@installbuilddir@ -srcdir=@srcdir@ -VPATH=@srcdir@ -top_srcdir=@apr_srcdir@ -top_blddir=@apr_builddir@ - # Create apr-config script suitable for the install tree apr-config.out: apr-config From laurawalker@example.com Thu Feb 05 11:21:52 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 93734 invoked from network); 5 Feb 2004 11:21:51 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2004 11:21:51 -0000 Received: (qmail 8194 invoked by uid 500); 5 Feb 2004 11:21:24 -0000 Delivered-To: laurawalker@example.com Received: (qmail 8150 invoked by uid 500); 5 Feb 2004 11:21:24 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 8135 invoked from network); 5 Feb 2004 11:21:24 -0000 Date: 5 Feb 2004 11:21:50 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr Makefile.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/05 03:21:50 Modified: . Makefile.in Log: * Makefile.in: Use portable make syntax. Revision Changes Path 1.94 +2 -2 apr/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr/Makefile.in,v retrieving revision 1.93 retrieving revision 1.94 diff -b -d -u -r1.93 -r1.94 --- Makefile.in 5 Feb 2004 11:10:39 -0000 1.93 +++ Makefile.in 5 Feb 2004 11:21:50 -0000 1.94 @@ -98,10 +98,10 @@ $(LINK) @lib_target@ $(ALL_LIBS) exports.c: $(HEADERS) - $(AWK) -f $(top_srcdir)/build/make_exports.awk $^ > $@ + $(AWK) -f $(top_srcdir)/build/make_exports.awk $(HEADERS) > $@ export_vars.h: $(HEADERS) - $(AWK) -f $(top_srcdir)/build/make_var_export.awk $^ > $@ + $(AWK) -f $(top_srcdir)/build/make_var_export.awk $(HEADERS) > $@ apr.exp: exports.c export_vars.h @echo "#! lib@APR_LIBNAME@.so" > $@ From laurawalker@example.com Thu Feb 05 14:35:29 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 15198 invoked from network); 5 Feb 2004 14:35:29 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2004 14:35:29 -0000 Received: (qmail 14874 invoked by uid 500); 5 Feb 2004 14:12:15 -0000 Delivered-To: laurawalker@example.com Received: (qmail 14803 invoked by uid 500); 5 Feb 2004 14:12:15 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 14742 invoked from network); 5 Feb 2004 14:12:14 -0000 Date: 5 Feb 2004 14:12:17 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr/build buildcheck.sh X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N trawick 2004/02/05 06:12:17 Modified: build buildcheck.sh Log: gotta have python to build APR Revision Changes Path 1.10 +11 -0 apr/build/buildcheck.sh Index: buildcheck.sh =================================================================== RCS file: /home/cvs/apr/build/buildcheck.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- buildcheck.sh 20 Jan 2004 16:28:55 -0000 1.9 +++ buildcheck.sh 5 Feb 2004 14:12:17 -0000 1.10 @@ -2,6 +2,17 @@ echo "buildconf: checking installation..." +# any python +py_version=`python -V 2>&1|sed -e 's/^[^0-9]*//'` +if test -z "$py_version"; then +echo "buildconf: python not found." +echo " You need python installed" +echo " to build APR from CVS." +exit 1 +else +echo "buildconf: python version $py_version (ok)" +fi + # autoconf 2.13 or newer ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'` if test -z "$ac_version"; then From laurawalker@example.com Thu Feb 05 14:43:39 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 20446 invoked from network); 5 Feb 2004 14:43:39 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2004 14:43:39 -0000 Received: (qmail 46094 invoked by uid 500); 5 Feb 2004 14:19:14 -0000 Delivered-To: laurawalker@example.com Received: (qmail 46038 invoked by uid 500); 5 Feb 2004 14:19:13 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 46003 invoked from network); 5 Feb 2004 14:19:13 -0000 Date: 5 Feb 2004 14:19:16 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr/build buildcheck.sh X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N trawick 2004/02/05 06:19:16 Modified: build buildcheck.sh Log: fix the python detection; python -V isn't cool for detecting presence since that writes to stderr, same place as a "not found" message from the shell Revision Changes Path 1.11 +3 -2 apr/build/buildcheck.sh Index: buildcheck.sh =================================================================== RCS file: /home/cvs/apr/build/buildcheck.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- buildcheck.sh 5 Feb 2004 14:12:17 -0000 1.10 +++ buildcheck.sh 5 Feb 2004 14:19:16 -0000 1.11 @@ -3,13 +3,14 @@ echo "buildconf: checking installation..." # any python -py_version=`python -V 2>&1|sed -e 's/^[^0-9]*//'` -if test -z "$py_version"; then +python=`build/PrintPath python` +if test -z "$python"; then echo "buildconf: python not found." echo " You need python installed" echo " to build APR from CVS." exit 1 else +py_version=`python -V 2>&1|sed -e 's/^[^0-9]*//'` echo "buildconf: python version $py_version (ok)" fi From laurawalker@example.com Thu Feb 05 18:52:04 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 87107 invoked from network); 5 Feb 2004 18:52:04 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2004 18:52:04 -0000 Received: (qmail 96725 invoked by uid 500); 5 Feb 2004 17:37:35 -0000 Delivered-To: laurawalker@example.com Received: (qmail 96643 invoked by uid 500); 5 Feb 2004 17:37:34 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 96567 invoked by uid 500); 5 Feb 2004 17:37:34 -0000 Delivered-To: laurawalker@example.com Date: 5 Feb 2004 17:37:40 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr-util configure.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jerenkrantz 2004/02/05 09:37:40 Modified: . configure.in Log: Apply Joe Orton's APR patch to APR-util as well to allow VPATH builds. Revision Changes Path 1.73 +3 -3 apr-util/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apr-util/configure.in,v retrieving revision 1.72 retrieving revision 1.73 diff -u -u -r1.72 -r1.73 --- configure.in 5 Feb 2004 10:16:25 -0000 1.72 +++ configure.in 5 Feb 2004 17:37:40 -0000 1.73 @@ -166,15 +166,15 @@ # Check whether they've installed GNU make if make --version > /dev/null 2>&1; then INCLUDE_RULES="include $abs_builddir/build/rules.mk" - INCLUDE_OUTPUTS="include build-outputs.mk" + INCLUDE_OUTPUTS="include $abs_srcdir/build-outputs.mk" else INCLUDE_RULES=".include \"$abs_builddir/build/rules.mk\"" - INCLUDE_OUTPUTS=".include \"build-outputs.mk\"" + INCLUDE_OUTPUTS=".include \"$abs_srcdir/build-outputs.mk\"" fi ;; *) INCLUDE_RULES="include $abs_builddir/build/rules.mk" - INCLUDE_OUTPUTS="include build-outputs.mk" + INCLUDE_OUTPUTS="include $abs_srcdir/build-outputs.mk" ;; esac AC_SUBST(INCLUDE_RULES) From laurawalker@example.com Thu Feb 05 22:18:13 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 15099 invoked from network); 5 Feb 2004 22:18:13 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2004 22:18:13 -0000 Received: (qmail 67903 invoked by uid 500); 5 Feb 2004 22:17:54 -0000 Delivered-To: laurawalker@example.com Received: (qmail 67820 invoked by uid 500); 5 Feb 2004 22:17:53 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 67787 invoked from network); 5 Feb 2004 22:17:53 -0000 Date: 5 Feb 2004 21:18:04 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr/build apr_common.m4 X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/05 13:18:04 Modified: build apr_common.m4 Log: * build/apr_common.m4 (APR_CONFIG_NICE): Preserve LTFLAGS setting. Revision Changes Path 1.58 +3 -0 apr/build/apr_common.m4 Index: apr_common.m4 =================================================================== RCS file: /home/cvs/apr/build/apr_common.m4,v retrieving revision 1.57 retrieving revision 1.58 diff -b -d -u -r1.57 -r1.58 --- apr_common.m4 17 Nov 2003 13:29:34 -0000 1.57 +++ apr_common.m4 5 Feb 2004 21:18:04 -0000 1.58 @@ -26,6 +26,9 @@ if test -n "$LDFLAGS"; then echo "LDFLAGS=\"$LDFLAGS\"; export LDFLAGS" >> $1 fi + if test -n "$LTFLAGS"; then + echo "LTFLAGS=\"$LTFLAGS\"; export LTFLAGS" >> $1 + fi if test -n "$LIBS"; then echo "LIBS=\"$LIBS\"; export LIBS" >> $1 fi From laurawalker@example.com Thu Feb 05 22:44:28 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 28339 invoked from network); 5 Feb 2004 22:44:28 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2004 22:44:28 -0000 Received: (qmail 58776 invoked by uid 500); 5 Feb 2004 22:44:06 -0000 Delivered-To: laurawalker@example.com Received: (qmail 58738 invoked by uid 500); 5 Feb 2004 22:44:06 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 58700 invoked from network); 5 Feb 2004 22:44:06 -0000 Date: 5 Feb 2004 19:57:37 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr/build gen-build.py X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/05 11:57:37 Modified: build gen-build.py Log: * build/gen-build.py: Fix paths to headers in dependencies; fix HEADERS to work for a VPATH build. Revision Changes Path 1.2 +2 -2 apr/build/gen-build.py Index: gen-build.py =================================================================== RCS file: /home/cvs/apr/build/gen-build.py,v retrieving revision 1.1 retrieving revision 1.2 diff -b -d -u -r1.1 -r1.2 --- gen-build.py 5 Feb 2004 10:16:21 -0000 1.1 +++ gen-build.py 5 Feb 2004 19:57:37 -0000 1.2 @@ -50,10 +50,10 @@ for hdr in deps.keys(): deps.update(h_deps.get(hdr, {})) - f.write('%s: %s %s\n' % (obj, file, string.join(deps.keys(), ' '))) + f.write('%s: %s include/%s\n' % (obj, file, string.join(deps.keys(), ' include/'))) f.write('\nOBJECTS = %s\n\n' % string.join(objects)) - f.write('HEADERS = %s\n\n' % string.join(headers)) + f.write('HEADERS = $(top_srcdir)/%s\n\n' % string.join(headers, ' $(top_srcdir)/')) f.write('SOURCE_DIRS = %s\n\n' % string.join(dirs.keys())) From laurawalker@example.com Fri Feb 06 11:11:15 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 56284 invoked from network); 6 Feb 2004 11:11:14 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 6 Feb 2004 11:11:14 -0000 Received: (qmail 18395 invoked by uid 500); 6 Feb 2004 11:10:23 -0000 Delivered-To: laurawalker@example.com Received: (qmail 18183 invoked by uid 500); 6 Feb 2004 11:10:21 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 18163 invoked by uid 500); 6 Feb 2004 11:10:21 -0000 Delivered-To: laurawalker@example.com Date: 6 Feb 2004 11:10:47 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr-util Makefile.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/06 03:10:47 Modified: . Makefile.in Log: * Makefile.in: Use portable make syntax. Revision Changes Path 1.80 +2 -2 apr-util/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr-util/Makefile.in,v retrieving revision 1.79 retrieving revision 1.80 diff -b -d -u -r1.79 -r1.80 --- Makefile.in 5 Feb 2004 10:16:25 -0000 1.79 +++ Makefile.in 6 Feb 2004 11:10:47 -0000 1.80 @@ -71,10 +71,10 @@ $(LINK) @lib_target@ $(ALL_LIBS) exports.c: $(HEADERS) - $(AWK) -f @APR_SOURCE_DIR@/build/make_exports.awk $^ > $@ + $(AWK) -f @APR_SOURCE_DIR@/build/make_exports.awk $(HEADERS) > $@ export_vars.h: $(HEADERS) - $(AWK) -f @APR_SOURCE_DIR@/build/make_var_export.awk $^ > $@ + $(AWK) -f @APR_SOURCE_DIR@/build/make_var_export.awk $(HEADERS) > $@ aprutil.exp: exports.c export_vars.h @echo "#! libaprutil.so" > $@ From laurawalker@example.com Fri Feb 06 12:52:39 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 11703 invoked from network); 6 Feb 2004 12:52:39 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 6 Feb 2004 12:52:39 -0000 Received: (qmail 79114 invoked by uid 500); 6 Feb 2004 12:52:37 -0000 Delivered-To: laurawalker@example.com Received: (qmail 79076 invoked by uid 500); 6 Feb 2004 12:52:37 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 79054 invoked by uid 500); 6 Feb 2004 12:52:37 -0000 Delivered-To: laurawalker@example.com Date: 6 Feb 2004 12:52:38 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr-util/include apr_optional.h apr_optional_hooks.h X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/06 04:52:38 Modified: include apr_optional.h apr_optional_hooks.h Log: * include/apr_optional.h (APR_REGISTER_OPTIONAL_FN), include/apr_optional_hooks.h (APR_OPTIONAL_HOOK): Rewrite to avoid calling a function through a function pointer of incompatible type, which is not conformant C99 code (by section 83.161.120.155 para 8) and triggers a warning from gcc 3.4. Reviewed by: Ben Laurie Revision Changes Path 1.13 +5 -4 apr-util/include/apr_optional.h Index: apr_optional.h =================================================================== RCS file: /home/cvs/apr-util/include/apr_optional.h,v retrieving revision 1.12 retrieving revision 1.13 diff -b -d -u -r1.12 -r1.13 --- apr_optional.h 16 Nov 2003 01:50:10 -0000 1.12 +++ apr_optional.h 6 Feb 2004 12:52:38 -0000 1.13 @@ -1,7 +1,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -105,9 +105,10 @@ * confusingly but correctly, the function itself can be static! * @param name The name of the function */ -#define APR_REGISTER_OPTIONAL_FN(name) \ - (((void (*)(const char *, APR_OPTIONAL_FN_TYPE(name) *)) \ - &apr_dynamic_fn_register)(#name,name)) +#define APR_REGISTER_OPTIONAL_FN(name) do { \ + APR_OPTIONAL_FN_TYPE(name) *apu__opt = name; \ + apr_dynamic_fn_register(#name,(apr_opt_fn_t *)apu__opt); \ +} while (0) /** @internal * Private function! DO NOT USE! 1.10 +5 -5 apr-util/include/apr_optional_hooks.h Index: apr_optional_hooks.h =================================================================== RCS file: /home/cvs/apr-util/include/apr_optional_hooks.h,v retrieving revision 1.9 retrieving revision 1.10 diff -b -d -u -r1.9 -r1.10 --- apr_optional_hooks.h 1 Jan 2003 00:02:20 -0000 1.9 +++ apr_optional_hooks.h 6 Feb 2004 12:52:38 -0000 1.10 @@ -1,7 +1,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2000-2003 The Apache Software Foundation. All rights + * Copyright (c) 2000-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -99,10 +99,10 @@ * @param nOrder an integer determining order before honouring aszPre and aszSucc (for example HOOK_MIDDLE) */ -#define APR_OPTIONAL_HOOK(ns,name,pfn,aszPre,aszSucc,nOrder) \ - ((void (APR_THREAD_FUNC *)(const char *,ns##_HOOK_##name##_t *,const char * const *, \ - const char * const *,int))&apr_optional_hook_add)(#name,pfn,aszPre, \ - aszSucc, nOrder) +#define APR_OPTIONAL_HOOK(ns,name,pfn,aszPre,aszSucc,nOrder) do { \ + ns##_HOOK_##name##_t *apu__hook = pfn; \ + apr_optional_hook_add(#name,(void (*)(void))apu__hook,aszPre, aszSucc, nOrder); \ +} while (0) /** * @internal From laurawalker@example.com Fri Feb 06 22:45:40 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 53830 invoked from network); 6 Feb 2004 22:45:40 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 6 Feb 2004 22:45:40 -0000 Received: (qmail 96873 invoked by uid 500); 6 Feb 2004 22:45:27 -0000 Delivered-To: laurawalker@example.com Received: (qmail 96825 invoked by uid 500); 6 Feb 2004 22:45:26 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 96796 invoked by uid 500); 6 Feb 2004 22:45:26 -0000 Delivered-To: laurawalker@example.com Date: 6 Feb 2004 22:45:38 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr-util Makefile.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/06 14:45:38 Modified: . Makefile.in Log: * Makefile.in (DISTCLEAN_TARGETS): Add apu_want.h. Revision Changes Path 1.81 +1 -1 apr-util/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr-util/Makefile.in,v retrieving revision 1.80 retrieving revision 1.81 diff -b -d -u -r1.80 -r1.81 --- Makefile.in 6 Feb 2004 11:10:47 -0000 1.80 +++ Makefile.in 6 Feb 2004 22:45:38 -0000 1.81 @@ -29,7 +29,7 @@ DISTCLEAN_TARGETS = config.cache config.log config.status libtool \ include/private/apu_config.h include/private/apu_private.h \ include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h \ - export_vars.sh apu-config build/rules.mk + export_vars.sh apu-config build/rules.mk include/apu_want.h EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in \ exports.c export_vars.h uri/uri_delims.h build-outputs.mk \ build/apr_common.m4 build/find_apr.m4 build/install.sh \ From laurawalker@example.com Fri Feb 06 22:57:49 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 59977 invoked from network); 6 Feb 2004 22:57:49 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 6 Feb 2004 22:57:49 -0000 Received: (qmail 36928 invoked by uid 500); 6 Feb 2004 22:57:35 -0000 Delivered-To: laurawalker@example.com Received: (qmail 36875 invoked by uid 500); 6 Feb 2004 22:57:35 -0000 Mailing-List: contact laurawalker@example.com; run by ezmlm Precedence: bulk List-Post: <mailto:laurawalker@example.com> List-Help: <mailto:laurawalker@example.com> List-Unsubscribe: <mailto:laurawalker@example.com> List-Subscribe: <mailto:laurawalker@example.com> Reply-To: laurawalker@example.com Delivered-To: mailing list laurawalker@example.com Received: (qmail 36858 invoked from network); 6 Feb 2004 22:57:35 -0000 Date: 6 Feb 2004 22:57:47 -0000 Message-ID: <laurawalker@example.com> From: laurawalker@example.com To: laurawalker@example.com Subject: cvs commit: apr/test Makefile.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/02/06 14:57:47 Modified: test Makefile.in Log: * test/Makefile.in (CLEAN_SUBDIRS): Clean in the 'internal' directory. Revision Changes Path 1.146 +1 -0 apr/test/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr/test/Makefile.in,v retrieving revision 1.145 retrieving revision 1.146 diff -b -d -u -r1.145 -r1.146 --- Makefile.in 17 Nov 2003 12:58:24 -0000 1.145 +++ Makefile.in 6 Feb 2004 22:57:47 -0000 1.146 @@ -38,6 +38,7 @@ CLEAN_TARGETS = testfile.tmp mod_test.slo proc_child@EXEEXT@ occhild@EXEEXT@ \ readchild@EXEEXT@ +CLEAN_SUBDIRS = internal INCDIR=../include INCLUDES=-I$(INCDIR) From laurawalker@example.com Sat Feb 07 00:07:41 2004 Return-Path: <laurawalker@example.com> Delivered-To: laurawalker@example.com Received: (qmail 83477 invoked from network); 7 Feb 2004 00:07:41 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 7 Feb 2004 00:07:41 -0000 Received: (qmail 44745 invoked by uid 500); 7 Feb 2004 00:07:17 -0000 Delivered-To: laurawalker@example.com Received: (qmail 44701 invoked by uid 500);
{'source': 'Apache Software Foundation Public Mail Archives'}