Date: Mon, 8 Oct 2018 08:24:14 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r339228 - in vendor/apr/dist: . docs encoding file_io/unix include include/arch/unix locks/unix memory/unix misc/unix network_io/unix poll/unix shmem/unix strings tables threadproc/unix... Message-ID: <201810080824.w988OEdj080560@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: peter Date: Mon Oct 8 08:24:14 2018 New Revision: 339228 URL: https://svnweb.freebsd.org/changeset/base/339228 Log: Vendor import apr-1.6.5 Added: vendor/apr/dist/include/apr_cstr.h (contents, props changed) vendor/apr/dist/include/apr_perms_set.h (contents, props changed) vendor/apr/dist/poll/unix/wakeup.c (contents, props changed) vendor/apr/dist/strings/apr_cstr.c (contents, props changed) Modified: vendor/apr/dist/CHANGES vendor/apr/dist/CMakeLists.txt vendor/apr/dist/Makefile.in vendor/apr/dist/Makefile.win vendor/apr/dist/NOTICE vendor/apr/dist/NWGNUmakefile vendor/apr/dist/apr.dsp vendor/apr/dist/apr.mak vendor/apr/dist/apr.spec vendor/apr/dist/build-outputs.mk vendor/apr/dist/config.layout vendor/apr/dist/configure vendor/apr/dist/configure.in vendor/apr/dist/docs/APRDesign.html vendor/apr/dist/docs/canonical_filenames.html vendor/apr/dist/docs/incomplete_types vendor/apr/dist/docs/pool-design.html vendor/apr/dist/encoding/apr_escape.c vendor/apr/dist/file_io/unix/copy.c vendor/apr/dist/file_io/unix/flock.c vendor/apr/dist/file_io/unix/pipe.c vendor/apr/dist/file_io/unix/readwrite.c vendor/apr/dist/file_io/unix/seek.c vendor/apr/dist/include/apr.h.in vendor/apr/dist/include/apr.hnw vendor/apr/dist/include/apr.hw vendor/apr/dist/include/apr.hwc vendor/apr/dist/include/apr_allocator.h vendor/apr/dist/include/apr_atomic.h vendor/apr/dist/include/apr_errno.h vendor/apr/dist/include/apr_escape.h vendor/apr/dist/include/apr_file_info.h vendor/apr/dist/include/apr_file_io.h vendor/apr/dist/include/apr_general.h vendor/apr/dist/include/apr_global_mutex.h vendor/apr/dist/include/apr_hash.h vendor/apr/dist/include/apr_network_io.h vendor/apr/dist/include/apr_poll.h vendor/apr/dist/include/apr_portable.h vendor/apr/dist/include/apr_proc_mutex.h vendor/apr/dist/include/apr_shm.h vendor/apr/dist/include/apr_skiplist.h vendor/apr/dist/include/apr_strings.h vendor/apr/dist/include/apr_tables.h vendor/apr/dist/include/apr_thread_proc.h vendor/apr/dist/include/apr_version.h vendor/apr/dist/include/arch/unix/apr_arch_networkio.h vendor/apr/dist/include/arch/unix/apr_arch_poll_private.h vendor/apr/dist/include/arch/unix/apr_arch_proc_mutex.h vendor/apr/dist/include/arch/unix/apr_arch_shm.h vendor/apr/dist/include/arch/unix/apr_arch_threadproc.h vendor/apr/dist/include/arch/unix/apr_private.h.in vendor/apr/dist/libapr.dsp vendor/apr/dist/libapr.mak vendor/apr/dist/locks/unix/global_mutex.c vendor/apr/dist/locks/unix/proc_mutex.c vendor/apr/dist/memory/unix/apr_pools.c vendor/apr/dist/misc/unix/errorcodes.c vendor/apr/dist/network_io/unix/multicast.c vendor/apr/dist/network_io/unix/sockaddr.c vendor/apr/dist/network_io/unix/sockets.c vendor/apr/dist/network_io/unix/sockopt.c vendor/apr/dist/poll/unix/epoll.c vendor/apr/dist/poll/unix/kqueue.c vendor/apr/dist/poll/unix/poll.c vendor/apr/dist/poll/unix/pollcb.c vendor/apr/dist/poll/unix/pollset.c vendor/apr/dist/poll/unix/port.c vendor/apr/dist/poll/unix/select.c vendor/apr/dist/poll/unix/z_asio.c vendor/apr/dist/shmem/unix/shm.c vendor/apr/dist/strings/apr_cpystrn.c vendor/apr/dist/strings/apr_fnmatch.c vendor/apr/dist/strings/apr_snprintf.c vendor/apr/dist/tables/apr_skiplist.c vendor/apr/dist/tables/apr_tables.c vendor/apr/dist/threadproc/unix/proc.c vendor/apr/dist/time/unix/time.c vendor/apr/dist/tools/gen_test_char.c Modified: vendor/apr/dist/CHANGES ============================================================================== --- vendor/apr/dist/CHANGES Mon Oct 8 08:13:44 2018 (r339227) +++ vendor/apr/dist/CHANGES Mon Oct 8 08:24:14 2018 (r339228) @@ -1,179 +1,136 @@ -*- coding: utf-8 -*- -Changes for APR 1.5.2 +Changes for APR 1.6.5 - *) SECURITY: CVE-2015-1829 (cve.mitre.org) - APR applications using APR named pipe support on Windows can be - vulnerable to a pipe squatting attack from a local process; the extent - of the vulnerability, when present, depends on the application. - Initial analysis and report was provided by John Hernandez of Casaba - Security via HP SSRT Security Alert. [Yann Ylavic] + *) Fix Win32 build breakage in apr_os_exp_time_put() in 1.6.4. [Rainer Jung] + +Changes for APR 1.6.4 (not released) - *) apr_atomic: Fix errors when building on Visual Studio 2013 while - maintaining the ability to build on Visual Studio 6 with Windows - Server 2003 R2 SDK. PR 57191. [Gregg Smith] + *) configure: Fix detection of <net/if.h> on OpenBSD. + PR 61976. [David Carlier <devnexen gmail.com>, Yann Ylavic] - *) Switch to generic atomics for early/unpatched Solaris 10 not exporting - some atomic functions. PR 55418. [Yann Ylavic] + *) Fix apr_parse_addr_port() regression in scope_id parsing introduced + in 1.6.3. [Rainer Jung] - *) apr_file_mktemp() on HP-UX: Remove limitation of 26 temporary files - per process. PR 57677. [Jeff Trawick] + *) Fix Win32 file buffer locking behavior for single threaded file streams. + [Evgeny Kotkov, Mladen Turk, Jean-Frederic Clere] - *) apr_escape: Correctly calculate the size of the returned string in - apr_escape_path and set the correct return value in case we actually - escape the string. [<aduryagin gmail.com>] PR 57230. + *) Numerous corrections to APR poll behavior. [Yann Ylavic] - *) pollcb on Windows: Handle calls with no file/socket descriptors. - Follow up to PR 49882. [Jeff Trawick, Yann Ylavic] +Changes for APR 1.6.3 - *) apr_poll(cb): fix error paths returned values and leaks. [Yann Ylavic] + *) apr_file_trunc: Truncating a buffered file could add unexpected + data after the truncate position. PR 51017. + [Evgeny Kotkov <evgeny.kotkov visualsvn.com>] - *) apr_thread_cond_*wait() on BeOS: Fix broken logic. PR 45800. - [Jochen Voss (no e-mail)] + *) apr_file_trunc: Fix an issue where reading from a buffered file + after truncate could return stale data from the buffer. + [Evgeny Kotkov <evgeny.kotkov visualsvn.com>] - *) apr_skiplist: Optimize the number of allocations by reusing pooled or - malloc()ed nodes for the lifetime of the skiplist. [Yann Ylavic] + *) apr_ipsubnet_create() now fails for an empty input string. + [Joe Orton] - *) apr_skiplist: Fix possible multiple-free() on the same value in - apr_skiplist_remove_all(). [Yann Ylavic] +Changes for APR 1.6.2 - *) apr_pollset: On z/OS, threadsafe apr_pollset_poll() may return - "EDC8102I Operation would block" under load. - [Pat Odonnell <patod us.ibm.com>] + *) Corrected non-Unix builds for APR_LOCK_DEFAULT. - *) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not - returning IPv4 addresses if any IPv6 addresses were returned. - [Eric Covener] +Changes for APR 1.6.1 - *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and - later. [Jeff Trawick] + *) Defer timed locks API for later 1.7 release [Nick Kew, William Rowe] - *) apr_global_mutex/apr_proc_mutex: Resolve failures with the - POSIX sem implementation in environments which receive signals. - [Jeff Trawick] + *) Export build files find_apr.m4 and apr_common.m4 [Jacob Champion] - *) apr_skiplist: Fix potential corruption of skiplists leading to - results or crashes. [Takashi Sato <takashi tks st>, Eric Covener] - PR 56654. +Changes for APR 1.6.0 - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] + *) apr_allocator: Provide apr_allocator_align() to get the true size that + would be allocated for the given size (including the header and + alignment). [Yann Ylavic] -Changes for APR 1.5.1 + *) apr_os_proc_mutex_put_ex: Allow to specify whether the OS native + mutex should or not be cleaned up (destroyed) with the constructed + APR mutex (given pool), and default to not for the simple _put() + function. [Yann Ylavic] - *) apr_os_proc_mutex_get() on Unix: Avoid segfault for cross- - process pthread mutexes. [Yann Ylavic <ylavic.dev gmail.com>] + *) apr_proc/global_mutex: Fix API regarding the native OS mutexes + accessors from/to available APR mechanisms, adding the new functions + apr_os_proc_mutex_get_ex() and apr_os_proc_mutex_set_ex() which give + control to the user over the selected mechanisms, including the missing + POSIX semaphores (sem_t) on platforms supporting them. + [Yann Ylavic] - *) When using shmget-based shared memory, the ID used for ftok is - now an APR hash of the filename instead of the constant '1'. - We do this to help avoid collisions. PR 53996 [Jim Jagielski] + *) apr_proc_mutex-pthread: Refcount shared mutexes usage to avoid + destruction while still is use by some process(es). PR 49504. + [Yann Ylavic] - *) apr_socket_atreadeof(): Fix breakage on OS X. [Jim Jagielski] + *) apr_file_io: Add apr_file_pipe_create_pools() allowing a pair of + pipes to be created, each in a different pool. [Graham Leggett] - *) Fix POSIX shared memory (shm_open) use for named shared memory. - Includes adding '--enable-posix-shm' to force POSIX shm if - available, and OS X compatibility. PR 55928. - [Jozef Hatala <jh-asf skrt org>, Jim Jagielski] + *) Add apr_pollcb_wakeup(), with similar behavior to + apr_pollset_wakeup(). Add apr_pollcb_method_name(), with similar + behavior to apr_pollset_method_name(). + [Neil Conway <nrc cs berkeley edu>, Jeff Trawick] - *) Fix race condition when calling apr_dir_make_recursive from - multiple threads on Windows. - [Bert Huijben] + *) apr_table_overlap: Add APR_OVERLAP_TABLES_ADD to merge and set when + overlapping tables. [Graham Leggett] - *) Fix apr_escape.c compilation errors on EBCDIC platforms. - [Eric Covener] + *) locks: Introduce apr_{thread,proc,global}_mutex_timedlock(). + [Yann Ylavic] - *) FreeBSD 10: Correct a regression in 1.5.0 which affected non- - blocking sockets in some applications, including httpd. [Jeff - Trawick] + *) Introduce the apr_cstr_fn() family of functions, derived from + the svn_cstring_ functions of the Subversion project. - *) Windows cmake build: Fix incorrect installation of some .pdb - files. Fix incorrect use of some logic intended for Windows 9x, - including legacy filesystem interfaces and dynamic loading of - some Windows APIs. [Jeff Trawick] + *) Add APR_SO_FREEBIND option for apr_socket_opt_set. PR 58725. + [Ashley GC, Jan Kaluza, Joe Orton] - *) apr_skiplist: Add compatibility with C++ applications. - [Jeff Trawick] + *) apr_filepath_merge: Fix truename length calculation on Windows + in cases where the "short" name variant is actually longer than + the "long" or "true" name. See: testnames.c:merge_shortname(). + [Bert Huijben <rhuijben a.o>] - *) Correct a regression in 1.5.0 which affected out-of-tree - builds on Unix. [Rainer Jung] + *) apr_atomic: Fix errors when building on Visual Studio 2013 while + maintaining the ability to build on Visual Studio 6 with Windows + Server 2003 R2 SDK. PR 57191. [Gregg Smith] - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] + *) apr_skiplist: Add apr_skiplist_addne*() family to preserve existing + values (no duplicate), add apr_skiplist_size(), apr_skiplist_height() + and apr_skiplist_preheight() to get the corresponding current values, + and apr_skiplist_set_preheight() to modify it. [ Yann Ylavic ] -Changes for APR 1.5.0 + *) Add new --enable-allocator-guard-pages which is like allocator-uses-mmap, + but will also add inaccessible guard pages before and after each memnode. + This will result in higher ressource usage but allow to find/protect + against certain buffer overflow/overread bugs. Under Linux, it may be + necessary to increase /proc/sys/vm/max_map_count . [Stefan Fritsch] - *) Fix Linux kernel version check to recognize more versions, - including versions 3.10 and later. PR 55690. [Joe Orton, - Arfrever Frehtes Taifersar Arahesis <arfrever.fta gmail.com>] + *) apr_skiplist: Add apr_skiplist_add() to support multiple values. - *) Add apr_sockaddr_is_wildcard() to check if a socket address - refers to the wildcard address for the protocol family (e.g., - 0.0.0.0/INADDR_ANY for IPv4). [Jeff Trawick] + *) Add new --enable-pool-concurrency-check configure option to detect + thread-unsafe concurrent accesses to pools. Runtime costs should be + relatively low. [Stefan Fritsch] - *) apr_file_dup2() on Windows: Fix debug RTL assertion when - attempting to _commit(stdout) or _commit(stderr). [Mike Rumph - <mike.rumph oracle.com>] + *) Add support code to teach valgrind about APR pools and allocators. + [Stefan Fritsch] - *) apr_socket_connect() on Windows: Handle WSAEISCONN. PR 48736. - [<inoue ariel-networks.com>, Jeff Trawick] + *) Add apr_sockaddr_info_copy(), for making a deep copy of an + apr_sockaddr_t into a specified pool. [Yann Ylavic + <ylavic.dev gmail.com>] - *) z/OS: threadsafe apr_pollset_poll support for sockets [Greg Ames] + *) Added Unix domain socket support. + [Mladen Turk] - *) Windows: Don't obtain a mutex for buffered file I/O unless the - file was opened with the APR_FOPEN_XTHREAD flag. [Ivan Zhakov - <ivan visualsvn.com>] + *) Add apr_shm_delete() to compliment apr_shm_remove(). + [Jim Jagielski] - *) Windows: Create named shared memory segments under the "Local" - namespace if the caller is unprivileged, fixing an inability of - unprivileged callers to use apr_shm_create() with named shared - memory segments under recent Windows. As before, shared memory - segments are created under the "Global" namespace for privileged - callers. Add apr_shm_create_ex() and apr_shm_attach_ex(), which - provide the ability to override the normal namespace selection. - [Jeff Trawick] + *) Intruduce APR_PERMS_SET macros for setting the owner/group on + objects. Currently only implemented for shm, proc and global + mutexes on posix platforms. + [Mladen Turk] - *) Update compile settings for MINT OS. PR 47181. [Alan Hourihane - <alanh fairlite.co.uk>] + *) Add apr_escape_ldap() and apr_pescape_ldap(), escaping characters + as described by RFC4514 and RFC4515 respectively. [Graham Leggett] - *) Files and pipes on Windows: Don't create an unused pollset when - files and pipes are opened. [Mladen Turk] +Changes for APR 1.5.x and later: - *) apr_socket_timeout_set() on Windows: If the socket was in a non- - blocking state before, disable that setting so that timeouts work. - [Jeff Trawick] - - *) File info APIs: Fix calculation of atime and mtime on AIX. PR 51146. - [Ruediger Pluem] - - *) Add the apr_escape interface. [Graham Leggett] - - *) Cygwin build fixes. PRs 51016 and 55586. [Carlo Bramini - <carlo.bramix libero.it>] - - *) Add apr_skiplist family. [Jim Jagielski] - - *) Add experimental cmake-based build system for Windows. Refer to - README.cmake for more information. [Jeff Trawick, Tom Donovan] - - *) Add the apr_table_getm() call, which transparently handles the - merging of keys with multiple values. [Graham Leggett] - - *) Add apr_hash_this_key(), apr_hash_this_key_len(), and - apr_hash_this_val() for easier access to those attributes from - a hash iterator. [Hyrum K. Wright <hyrum_wright mail.utexas.edu>] - - *) MinGW/MSYS: Support shared builds of APR, other general improvements - to support of this toolchain. PR 46175. [Carlo Bramini - <carlo.bramix libero.it>] - - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] - - *) apr_socket_opt_set: Add support for APR_SO_BROADCAST. PR 46389. - [Armin Müller <mueller itestra com>] - - *) Enable platform specific support for the opening of a file or - pipe in non-blocking mode through the APR_FOPEN_NONBLOCK flag. - [Graham Leggett] + *) http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CHANGES?view=markup Changes for APR 1.4.x and later: Modified: vendor/apr/dist/CMakeLists.txt ============================================================================== --- vendor/apr/dist/CMakeLists.txt Mon Oct 8 08:13:44 2018 (r339227) +++ vendor/apr/dist/CMakeLists.txt Mon Oct 8 08:24:14 2018 (r339228) @@ -87,6 +87,7 @@ INCLUDE_DIRECTORIES(${APR_INCLUDE_DIRECTORIES}) SET(APR_PUBLIC_HEADERS_STATIC include/apr_allocator.h include/apr_atomic.h + include/apr_cstr.h include/apr_dso.h include/apr_env.h include/apr_errno.h @@ -102,6 +103,7 @@ SET(APR_PUBLIC_HEADERS_STATIC include/apr_lib.h include/apr_mmap.h include/apr_network_io.h + include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h @@ -179,11 +181,13 @@ SET(APR_SOURCES poll/unix/pollcb.c poll/unix/pollset.c poll/unix/select.c + poll/unix/wakeup.c random/unix/apr_random.c random/unix/sha2.c random/unix/sha2_glue.c shmem/win32/shm.c strings/apr_cpystrn.c + strings/apr_cstr.c strings/apr_fnmatch.c strings/apr_snprintf.c strings/apr_strings.c Modified: vendor/apr/dist/Makefile.in ============================================================================== --- vendor/apr/dist/Makefile.in Mon Oct 8 08:13:44 2018 (r339227) +++ vendor/apr/dist/Makefile.in Mon Oct 8 08:24:14 2018 (r339228) @@ -63,6 +63,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ includedir=@includedir@ +datadir=@datadir@ installbuilddir=@installbuilddir@ # Create apr-config script suitable for the install tree @@ -91,6 +92,8 @@ install: $(TARGETS) $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \ done $(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk + $(INSTALL_DATA) $(top_srcdir)/build/apr_common.m4 $(DESTDIR)$(installbuilddir) + $(INSTALL_DATA) $(top_srcdir)/build/find_apr.m4 $(DESTDIR)$(installbuilddir) $(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG) @if [ $(INSTALL_SUBDIRS) != "none" ]; then \ for i in $(INSTALL_SUBDIRS); do \ Modified: vendor/apr/dist/Makefile.win ============================================================================== --- vendor/apr/dist/Makefile.win Mon Oct 8 08:13:44 2018 (r339227) +++ vendor/apr/dist/Makefile.win Mon Oct 8 08:24:14 2018 (r339228) @@ -18,8 +18,6 @@ # # ARCH="Win32 Release" # ARCH="Win32 Debug" -# ARCH="Win32 Release9x" -# ARCH="Win32 Debug9x" # ARCH="x64 Release" # ARCH="x64 Debug" # @@ -66,14 +64,6 @@ LIBSOSPATH=LibR SLNARCH=Debug|Win32 ARCHOSPATH=Debug LIBSOSPATH=LibD -!ELSEIF "$(ARCH)" == "Win32 Release9x" -SLNARCH=Release9x|Win32 -ARCHOSPATH=9x\Release -LIBSOSPATH=9x\LibR -!ELSEIF "$(ARCH)" == "Win32 Debug9x" -SLNARCH=Debug9x|Win32 -ARCHOSPATH=9x\Debug -LIBSOSPATH=9x\LibD !ELSEIF "$(ARCH)" == "x64 Release" SLNARCH=Release|x64 ARCHOSPATH=x64\Release Modified: vendor/apr/dist/NOTICE ============================================================================== --- vendor/apr/dist/NOTICE Mon Oct 8 08:13:44 2018 (r339227) +++ vendor/apr/dist/NOTICE Mon Oct 8 08:24:14 2018 (r339228) @@ -1,5 +1,5 @@ Apache Portable Runtime -Copyright (c) 2000-2015 The Apache Software Foundation. +Copyright (c) 2000-2018 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: vendor/apr/dist/NWGNUmakefile ============================================================================== --- vendor/apr/dist/NWGNUmakefile Mon Oct 8 08:13:44 2018 (r339227) +++ vendor/apr/dist/NWGNUmakefile Mon Oct 8 08:24:14 2018 (r339228) @@ -362,6 +362,7 @@ FILES_lib_objs = \ $(OBJDIR)/userinfo.o \ $(OBJDIR)/version.o \ $(OBJDIR)/waitio.o \ + $(OBJDIR)/wakeup.o \ $(EOLIST) Modified: vendor/apr/dist/apr.dsp ============================================================================== --- vendor/apr/dist/apr.dsp Mon Oct 8 08:13:44 2018 (r339227) +++ vendor/apr/dist/apr.dsp Mon Oct 8 08:24:14 2018 (r339228) @@ -19,8 +19,6 @@ CFG=apr - Win32 Release !MESSAGE !MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Release9x" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Debug" (based on "Win32 (x86) Static Library") !MESSAGE @@ -79,53 +77,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"LibD\apr-1.lib" -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "9x\LibR" -# PROP BASE Intermediate_Dir "9x\LibR" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "9x\LibR" -# PROP Intermediate_Dir "9x\LibR" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"9x\LibR\apr-1.lib" - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "9x\LibD" -# PROP BASE Intermediate_Dir "9x\LibD" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "9x\LibD" -# PROP Intermediate_Dir "9x\LibD" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"9x\LibD\apr-1.lib" - !ELSEIF "$(CFG)" == "apr - x64 Release" # PROP BASE Use_MFC 0 @@ -179,8 +130,6 @@ LIB32=link.exe -lib # Name "apr - Win32 Release" # Name "apr - Win32 Debug" -# Name "apr - Win32 Release9x" -# Name "apr - Win32 Debug9x" # Name "apr - x64 Release" # Name "apr - x64 Debug" # Begin Group "Source Files" @@ -439,6 +388,10 @@ SOURCE=.\poll\unix\pollset.c SOURCE=.\poll\unix\select.c # End Source File +# Begin Source File + +SOURCE=.\poll\unix\wakeup.c +# End Source File # End Group # Begin Group "random" @@ -642,26 +595,6 @@ InputPath=.\include\apr.hw # End Custom Build -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -# Begin Custom Build - Creating apr.h from apr.hw -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\include\apr.hw > .\include\apr.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -# Begin Custom Build - Creating apr.h from apr.hw -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\include\apr.hw > .\include\apr.h - -# End Custom Build - !ELSEIF "$(CFG)" == "apr - x64 Release" # Begin Custom Build - Creating apr.h from apr.hw @@ -708,76 +641,48 @@ SOURCE=.\include\apr_errno.h # Begin Source File SOURCE=.\include\apr_escape.h -# End Source File -# Begin Source File -SOURCE=.\include\apr_escape.h +!IF "$(CFG)" == "libapr - Win32 Release" -!IF "$(CFG)" == "apr - Win32 Release" - # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibR\gen_test_char /Fe.\LibR\gen_test_char.exe .\tools\gen_test_char.c - .\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Release\gen_test_char /Fe.\Release\gen_test_char.exe .\tools\gen_test_char.c + .\Release\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build -!ELSEIF "$(CFG)" == "apr - Win32 Debug" +!ELSEIF "$(CFG)" == "libapr - Win32 Debug" # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibD\gen_test_char /Fe.\LibD\gen_test_char.exe .\tools\gen_test_char.c - .\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Debug\gen_test_char /Fe.\Debug\gen_test_char.exe .\tools\gen_test_char.c + .\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" +!ELSEIF "$(CFG)" == "libapr - x64 Release" # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibR\gen_test_char /Fe.\9x\LibR\gen_test_char.exe .\tools\gen_test_char.c - .\9x\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Release\gen_test_char /Fe.\x64\Release\gen_test_char.exe .\tools\gen_test_char.c + .\x64\Release\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" +!ELSEIF "$(CFG)" == "libapr - x64 Debug" # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h InputPath=.\include\apr_escape.h -InputPath=.\include\apr_escape.h ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibD\gen_test_char /Fe.\9x\LibD\gen_test_char.exe .\tools\gen_test_char.c - .\9x\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "apr - x64 Release" - -# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h -InputPath=.\include\apr_escape.h - -InputPath=.\include\apr_escape.h -".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibR\gen_test_char /Fe.\x64\LibR\gen_test_char.exe .\tools\gen_test_char.c - .\x64\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "apr - x64 Debug" - -# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h -InputPath=.\include\apr_escape.h - -".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibD\gen_test_char /Fe.\x64\LibD\gen_test_char.exe .\tools\gen_test_char.c - .\x64\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h + cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Debug\gen_test_char /Fe.\x64\Debug\gen_test_char.exe .\tools\gen_test_char.c + .\x64\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h # End Custom Build Modified: vendor/apr/dist/apr.mak ============================================================================== --- vendor/apr/dist/apr.mak Mon Oct 8 08:13:44 2018 (r339227) +++ vendor/apr/dist/apr.mak Mon Oct 8 08:24:14 2018 (r339228) @@ -4,7 +4,7 @@ CFG=apr - Win32 Release !MESSAGE No configuration specified. Defaulting to apr - Win32 Release. !ENDIF -!IF "$(CFG)" != "apr - Win32 Release" && "$(CFG)" != "apr - Win32 Debug" && "$(CFG)" != "apr - Win32 Release9x" && "$(CFG)" != "apr - Win32 Debug9x" && "$(CFG)" != "apr - x64 Release" && "$(CFG)" != "apr - x64 Debug" +!IF "$(CFG)" != "apr - Win32 Release" && "$(CFG)" != "apr - Win32 Debug" && "$(CFG)" != "apr - x64 Release" && "$(CFG)" != "apr - x64 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,8 +15,6 @@ CFG=apr - Win32 Release !MESSAGE !MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Release9x" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library") !MESSAGE "apr - x64 Debug" (based on "Win32 (x86) Static Library") !MESSAGE @@ -45,6 +43,7 @@ CLEAN : -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cstr.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -115,6 +114,7 @@ CLEAN : -@erase "$(INTDIR)\userinfo.obj" -@erase "$(INTDIR)\utf8.obj" -@erase "$(INTDIR)\version.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" -@erase ".\include\apr_gen_test_char.h" @@ -215,12 +215,14 @@ LIB32_OBJS= \ "$(INTDIR)\poll.obj" \ "$(INTDIR)\pollcb.obj" \ "$(INTDIR)\pollset.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\select.obj" \ "$(INTDIR)\apr_random.obj" \ "$(INTDIR)\sha2.obj" \ "$(INTDIR)\sha2_glue.obj" \ "$(INTDIR)\shm.obj" \ "$(INTDIR)\apr_cpystrn.obj" \ + "$(INTDIR)\apr_cstr.obj" \ "$(INTDIR)\apr_fnmatch.obj" \ "$(INTDIR)\apr_snprintf.obj" \ "$(INTDIR)\apr_strings.obj" \ @@ -259,6 +261,7 @@ CLEAN : -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cstr.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -329,6 +332,7 @@ CLEAN : -@erase "$(INTDIR)\userinfo.obj" -@erase "$(INTDIR)\utf8.obj" -@erase "$(INTDIR)\version.obj" + -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" -@erase ".\include\apr_gen_test_char.h" @@ -430,11 +434,13 @@ LIB32_OBJS= \ "$(INTDIR)\pollcb.obj" \ "$(INTDIR)\pollset.obj" \ "$(INTDIR)\select.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\apr_random.obj" \ "$(INTDIR)\sha2.obj" \ "$(INTDIR)\sha2_glue.obj" \ "$(INTDIR)\shm.obj" \ "$(INTDIR)\apr_cpystrn.obj" \ + "$(INTDIR)\apr_cstr.obj" \ "$(INTDIR)\apr_fnmatch.obj" \ "$(INTDIR)\apr_snprintf.obj" \ "$(INTDIR)\apr_strings.obj" \ @@ -457,434 +463,6 @@ LIB32_OBJS= \ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) << -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -OUTDIR=.\9x\LibR -INTDIR=.\9x\LibR -# Begin Custom Macros -OutDir=.\9x\LibR -# End Custom Macros - -ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib" - - -CLEAN : - -@erase "$(INTDIR)\apr-1.idb" - -@erase "$(INTDIR)\apr-1.pdb" - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_escape.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_skiplist.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\apr-1.lib" - -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\apr_escape.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_skiplist.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" - -"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -OUTDIR=.\9x\LibD -INTDIR=.\9x\LibD -# Begin Custom Macros -OutDir=.\9x\LibD -# End Custom Macros - -ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\LibD\gen_test_char.exe" "$(OUTDIR)\apr-1.lib" - - -CLEAN : - -@erase "$(INTDIR)\apr-1.idb" - -@erase "$(INTDIR)\apr-1.pdb" - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_escape.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_skiplist.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\apr-1.lib" - -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810080824.w988OEdj080560>