From owner-svn-src-head@freebsd.org Sun May 31 22:12:59 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 185EB2F3C01; Sun, 31 May 2020 22:12:59 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Zsxl02c2z43Wh; Sun, 31 May 2020 22:12:59 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EFF732104F; Sun, 31 May 2020 22:12:58 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VMCwIh027906; Sun, 31 May 2020 22:12:58 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VMCvid027894; Sun, 31 May 2020 22:12:57 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202005312212.04VMCvid027894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 31 May 2020 22:12:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361678 - in head: contrib/apr contrib/apr/atomic/unix contrib/apr/docs contrib/apr/encoding contrib/apr/file_io/unix contrib/apr/include contrib/apr/include/arch/unix contrib/apr/inclu... X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in head: contrib/apr contrib/apr/atomic/unix contrib/apr/docs contrib/apr/encoding contrib/apr/file_io/unix contrib/apr/include contrib/apr/include/arch/unix contrib/apr/include/private contrib/apr/lo... X-SVN-Commit-Revision: 361678 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 22:12:59 -0000 Author: dim Date: Sun May 31 22:12:56 2020 New Revision: 361678 URL: https://svnweb.freebsd.org/changeset/base/361678 Log: Update apr to 1.7.0. See contrib/apr/CHANGES for a summary of changes. MFC after: 2 weeks X-MFC-With: r361677 Added: head/contrib/apr/atomic/unix/builtins64.c - copied unchanged from r361671, vendor/apr/dist/atomic/unix/builtins64.c head/contrib/apr/atomic/unix/mutex64.c - copied unchanged from r361671, vendor/apr/dist/atomic/unix/mutex64.c head/contrib/apr/encoding/apr_encode.c - copied unchanged from r361671, vendor/apr/dist/encoding/apr_encode.c head/contrib/apr/include/apr_cstr.h - copied unchanged from r361671, vendor/apr/dist/include/apr_cstr.h head/contrib/apr/include/apr_encode.h - copied unchanged from r361671, vendor/apr/dist/include/apr_encode.h head/contrib/apr/include/apr_perms_set.h - copied unchanged from r361671, vendor/apr/dist/include/apr_perms_set.h head/contrib/apr/include/private/ - copied from r361671, vendor/apr/dist/include/private/ head/contrib/apr/poll/unix/wakeup.c - copied unchanged from r361671, vendor/apr/dist/poll/unix/wakeup.c head/contrib/apr/strings/apr_cstr.c - copied unchanged from r361671, vendor/apr/dist/strings/apr_cstr.c head/usr.bin/svn/lib/libapr/apr_escape_test_char.h (contents, props changed) Modified: head/contrib/apr/CHANGES head/contrib/apr/CMakeLists.txt head/contrib/apr/Makefile.in head/contrib/apr/Makefile.win head/contrib/apr/NOTICE head/contrib/apr/NWGNUmakefile head/contrib/apr/apr.dsp head/contrib/apr/apr.mak head/contrib/apr/apr.spec head/contrib/apr/atomic/unix/ia32.c head/contrib/apr/atomic/unix/mutex.c head/contrib/apr/atomic/unix/ppc.c head/contrib/apr/atomic/unix/s390.c head/contrib/apr/atomic/unix/solaris.c head/contrib/apr/build-outputs.mk head/contrib/apr/buildconf head/contrib/apr/config.layout head/contrib/apr/configure head/contrib/apr/configure.in head/contrib/apr/docs/APRDesign.html head/contrib/apr/docs/canonical_filenames.html head/contrib/apr/docs/incomplete_types head/contrib/apr/docs/pool-design.html head/contrib/apr/encoding/apr_escape.c head/contrib/apr/file_io/unix/copy.c head/contrib/apr/file_io/unix/dir.c head/contrib/apr/file_io/unix/flock.c head/contrib/apr/file_io/unix/pipe.c head/contrib/apr/file_io/unix/readwrite.c head/contrib/apr/file_io/unix/seek.c head/contrib/apr/include/apr.h.in head/contrib/apr/include/apr.hnw head/contrib/apr/include/apr.hw head/contrib/apr/include/apr.hwc head/contrib/apr/include/apr_allocator.h head/contrib/apr/include/apr_atomic.h head/contrib/apr/include/apr_errno.h head/contrib/apr/include/apr_escape.h head/contrib/apr/include/apr_file_info.h head/contrib/apr/include/apr_file_io.h head/contrib/apr/include/apr_general.h head/contrib/apr/include/apr_global_mutex.h head/contrib/apr/include/apr_hash.h head/contrib/apr/include/apr_network_io.h head/contrib/apr/include/apr_poll.h head/contrib/apr/include/apr_portable.h head/contrib/apr/include/apr_proc_mutex.h head/contrib/apr/include/apr_shm.h head/contrib/apr/include/apr_skiplist.h head/contrib/apr/include/apr_strings.h head/contrib/apr/include/apr_tables.h head/contrib/apr/include/apr_thread_mutex.h head/contrib/apr/include/apr_thread_proc.h head/contrib/apr/include/apr_time.h head/contrib/apr/include/apr_version.h head/contrib/apr/include/arch/unix/apr_arch_atomic.h head/contrib/apr/include/arch/unix/apr_arch_networkio.h head/contrib/apr/include/arch/unix/apr_arch_poll_private.h head/contrib/apr/include/arch/unix/apr_arch_proc_mutex.h head/contrib/apr/include/arch/unix/apr_arch_shm.h head/contrib/apr/include/arch/unix/apr_arch_thread_mutex.h head/contrib/apr/include/arch/unix/apr_arch_threadproc.h head/contrib/apr/include/arch/unix/apr_private.h.in head/contrib/apr/libapr.dsp head/contrib/apr/libapr.mak head/contrib/apr/locks/unix/global_mutex.c head/contrib/apr/locks/unix/proc_mutex.c head/contrib/apr/locks/unix/thread_cond.c head/contrib/apr/locks/unix/thread_mutex.c head/contrib/apr/memory/unix/apr_pools.c head/contrib/apr/misc/unix/errorcodes.c head/contrib/apr/misc/unix/rand.c head/contrib/apr/network_io/unix/multicast.c head/contrib/apr/network_io/unix/sockaddr.c head/contrib/apr/network_io/unix/sockets.c head/contrib/apr/network_io/unix/sockopt.c head/contrib/apr/poll/unix/epoll.c head/contrib/apr/poll/unix/kqueue.c head/contrib/apr/poll/unix/poll.c head/contrib/apr/poll/unix/pollcb.c head/contrib/apr/poll/unix/pollset.c head/contrib/apr/poll/unix/port.c head/contrib/apr/poll/unix/select.c head/contrib/apr/poll/unix/z_asio.c head/contrib/apr/shmem/unix/shm.c head/contrib/apr/strings/apr_cpystrn.c head/contrib/apr/strings/apr_fnmatch.c head/contrib/apr/strings/apr_snprintf.c head/contrib/apr/tables/apr_skiplist.c head/contrib/apr/tables/apr_tables.c head/contrib/apr/threadproc/unix/proc.c head/contrib/apr/threadproc/unix/signals.c head/contrib/apr/tools/gen_test_char.c head/usr.bin/svn/lib/libapr/Makefile Directory Properties: head/contrib/apr/ (props changed) Modified: head/contrib/apr/CHANGES ============================================================================== --- head/contrib/apr/CHANGES Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/CHANGES Sun May 31 22:12:56 2020 (r361678) @@ -1,179 +1,61 @@ -*- coding: utf-8 -*- -Changes for APR 1.5.2 +Changes for APR 1.7.0 - *) 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] + *) apr_dir_read: [Unix] Dropped the preference of the dirread_r() flavor + for dirread(), because the former is both deprecated and unneeded. + [Yann Ylavic, William Rowe] - *) 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] + *) apr_file_info: [Win32 only] Treat only "name surrogate" reparse points + as symlinks, and not other reparse tag types. PR47630 + [Oleg Liatte ] - *) Switch to generic atomics for early/unpatched Solaris 10 not exporting - some atomic functions. PR 55418. [Yann Ylavic] + *) Test %ld vs. %lld to avoid compiler emits using APR_OFF_T_FMT, in the + case of apparently equivilant long and long long types. [William Rowe] - *) apr_file_mktemp() on HP-UX: Remove limitation of 26 temporary files - per process. PR 57677. [Jeff Trawick] + *) Recognize APPLE predefined macros as equivilant to DARWIN. [Jim Jagielski] - *) 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. [] PR 57230. + *) Signals: Allow handling of SIGUSR2 in apr_signal_thread. [Yann Ylavic] - *) pollcb on Windows: Handle calls with no file/socket descriptors. - Follow up to PR 49882. [Jeff Trawick, Yann Ylavic] + *) Atomics: Support for 64bit ints. [Jim Jagielski] - *) apr_poll(cb): fix error paths returned values and leaks. [Yann Ylavic] + *) Add the apr_encode_* API that implements RFC4648 and RFC7515 + compliant BASE64, BASE64URL, BASE32, BASE32HEX and BASE16 + encode/decode functions. [Graham Leggett] - *) apr_thread_cond_*wait() on BeOS: Fix broken logic. PR 45800. - [Jochen Voss (no e-mail)] + *) rand: Use arc4random_buf() on BSD platforms and getrandom() on Linux, + when available. [Christian Weisgerber ] + *) apr_sockaddr_ip_getbuf, apr_sockaddr_ip_get: Append "%zone" for + IPv6 link-local addresses. [Joe Orton] - *) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not - returning IPv4 addresses if any IPv6 addresses were returned. - [Eric Covener] + *) Locks: add a --disable-timedlocks config option in case users + encounter more platforms where it fails [Nick Kew]. - *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and - later. [Jeff Trawick] + *) apr_allocator, apr_pools: Add apr_allocator_page_size() and + apr_allocator_min_order_set() to respectively get the (system's) page size + in use and set the minimum allocation size for an allocator (expressed in + 2^order pages). [Yann Ylavic] - *) apr_global_mutex/apr_proc_mutex: Resolve failures with the - POSIX sem implementation in environments which receive signals. - [Jeff Trawick] + *) locks: provide portable implementations of timedlock()s for + posix-sems, sysv-sems and pthreads for those platforms that + lack native versions (eg: OSX/macOS). [Jim Jagielski] - *) apr_skiplist: Fix potential corruption of skiplists leading to - results or crashes. [Takashi Sato , Eric Covener] - PR 56654. + *) locks: Introduce apr_{thread,proc,global}_mutex_timedlock(). + [Yann Ylavic] - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] +Changes for APR 1.6.x and later: -Changes for APR 1.5.1 + *) http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/CHANGES?view=markup - *) apr_os_proc_mutex_get() on Unix: Avoid segfault for cross- - process pthread mutexes. [Yann Ylavic ] +Changes for APR 1.5.x and later: - *) 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_socket_atreadeof(): Fix breakage on OS X. [Jim Jagielski] - - *) 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 , Jim Jagielski] - - *) Fix race condition when calling apr_dir_make_recursive from - multiple threads on Windows. - [Bert Huijben] - - *) Fix apr_escape.c compilation errors on EBCDIC platforms. - [Eric Covener] - - *) FreeBSD 10: Correct a regression in 1.5.0 which affected non- - blocking sockets in some applications, including httpd. [Jeff - Trawick] - - *) 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] - - *) apr_skiplist: Add compatibility with C++ applications. - [Jeff Trawick] - - *) Correct a regression in 1.5.0 which affected out-of-tree - builds on Unix. [Rainer Jung] - - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] - -Changes for APR 1.5.0 - - *) Fix Linux kernel version check to recognize more versions, - including versions 3.10 and later. PR 55690. [Joe Orton, - Arfrever Frehtes Taifersar Arahesis ] - - *) 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] - - *) apr_file_dup2() on Windows: Fix debug RTL assertion when - attempting to _commit(stdout) or _commit(stderr). [Mike Rumph - ] - - *) apr_socket_connect() on Windows: Handle WSAEISCONN. PR 48736. - [, Jeff Trawick] - - *) z/OS: threadsafe apr_pollset_poll support for sockets [Greg Ames] - - *) Windows: Don't obtain a mutex for buffered file I/O unless the - file was opened with the APR_FOPEN_XTHREAD flag. [Ivan Zhakov - ] - - *) 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] - - *) Update compile settings for MINT OS. PR 47181. [Alan Hourihane - ] - - *) Files and pipes on Windows: Don't create an unused pollset when - files and pipes are opened. [Mladen Turk] - - *) 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 - ] - - *) 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 ] - - *) MinGW/MSYS: Support shared builds of APR, other general improvements - to support of this toolchain. PR 46175. [Carlo Bramini - ] - - *) 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 ] - - *) 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: head/contrib/apr/CMakeLists.txt ============================================================================== --- head/contrib/apr/CMakeLists.txt Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/CMakeLists.txt Sun May 31 22:12:56 2020 (r361678) @@ -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: head/contrib/apr/Makefile.in ============================================================================== --- head/contrib/apr/Makefile.in Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/Makefile.in Sun May 31 22:12:56 2020 (r361678) @@ -63,6 +63,8 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ +datadir=@datadir@ installbuilddir=@installbuilddir@ # Create apr-config script suitable for the install tree Modified: head/contrib/apr/Makefile.win ============================================================================== --- head/contrib/apr/Makefile.win Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/Makefile.win Sun May 31 22:12:56 2020 (r361678) @@ -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: head/contrib/apr/NOTICE ============================================================================== --- head/contrib/apr/NOTICE Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/NOTICE Sun May 31 22:12:56 2020 (r361678) @@ -1,5 +1,5 @@ Apache Portable Runtime -Copyright (c) 2000-2015 The Apache Software Foundation. +Copyright (c) 2000-2019 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: head/contrib/apr/NWGNUmakefile ============================================================================== --- head/contrib/apr/NWGNUmakefile Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/NWGNUmakefile Sun May 31 22:12:56 2020 (r361678) @@ -362,6 +362,7 @@ FILES_lib_objs = \ $(OBJDIR)/userinfo.o \ $(OBJDIR)/version.o \ $(OBJDIR)/waitio.o \ + $(OBJDIR)/wakeup.o \ $(EOLIST) Modified: head/contrib/apr/apr.dsp ============================================================================== --- head/contrib/apr/apr.dsp Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/apr.dsp Sun May 31 22:12:56 2020 (r361678) @@ -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 @@ -45,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "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 "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /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 @@ -69,7 +67,7 @@ LIB32=link.exe -lib # 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 "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /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 @@ -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 @@ -139,7 +90,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "x64\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 "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /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 @@ -163,7 +114,7 @@ LIB32=link.exe -lib # 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 "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /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 @@ -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" @@ -193,6 +142,10 @@ LIB32=link.exe -lib SOURCE=.\atomic\win32\apr_atomic.c # End Source File +# Begin Source File + +SOURCE=.\atomic\win32\apr_atomic64.c +# End Source File # End Group # Begin Group "dso" @@ -207,6 +160,11 @@ SOURCE=.\dso\win32\dso.c # PROP Default_Filter "" # Begin Source File +SOURCE=.\encoding\apr_encode.c + +# End Source File +# Begin Source File + SOURCE=.\encoding\apr_escape.c # End Source File @@ -439,6 +397,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" @@ -473,6 +435,10 @@ SOURCE=.\strings\apr_cpystrn.c # End Source File # Begin Source File +SOURCE=.\strings\apr_cstr.c +# End Source File +# Begin Source File + SOURCE=.\strings\apr_fnmatch.c # End Source File # Begin Source File @@ -642,26 +608,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 +654,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: head/contrib/apr/apr.mak ============================================================================== --- head/contrib/apr/apr.mak Sun May 31 22:04:51 2020 (r361677) +++ head/contrib/apr/apr.mak Sun May 31 22:12:56 2020 (r361678) @@ -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 @@ -29,6 +27,9 @@ NULL= NULL=nul !ENDIF +CPP=cl.exe +RSC=rc.exe + !IF "$(CFG)" == "apr - Win32 Release" OUTDIR=.\LibR @@ -37,14 +38,17 @@ INTDIR=.\LibR OutDir=.\LibR # End Custom Macros -ALL : ".\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib" +ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib" CLEAN : -@erase "$(INTDIR)\apr-1.idb" -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" + -@erase "$(INTDIR)\apr_atomic64.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cstr.obj" + -@erase "$(INTDIR)\apr_encode.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -115,49 +119,14 @@ 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" - -@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 "WINNT" /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 +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" BSC32_SBRS= \ @@ -166,7 +135,9 @@ LIB32=link.exe -lib LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" LIB32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ + "$(INTDIR)\apr_atomic64.obj" \ "$(INTDIR)\dso.obj" \ + "$(INTDIR)\apr_encode.obj" \ "$(INTDIR)\apr_escape.obj" \ "$(INTDIR)\buffer.obj" \ "$(INTDIR)\copy.obj" \ @@ -208,19 +179,21 @@ LIB32_OBJS= \ "$(INTDIR)\multicast.obj" \ "$(INTDIR)\sendrecv.obj" \ "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ "$(INTDIR)\socket_util.obj" \ + "$(INTDIR)\sockets.obj" \ "$(INTDIR)\sockopt.obj" \ "$(INTDIR)\apr_getpass.obj" \ "$(INTDIR)\poll.obj" \ "$(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" \ @@ -251,14 +224,17 @@ INTDIR=.\LibD OutDir=.\LibD # End Custom Macros -ALL : ".\LibD\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib" +ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib" CLEAN : -@erase "$(INTDIR)\apr-1.idb" -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" + -@erase "$(INTDIR)\apr_atomic64.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" + -@erase "$(INTDIR)\apr_cstr.obj" + -@erase "$(INTDIR)\apr_encode.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -329,49 +305,14 @@ 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" - -@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 "WINNT" /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 +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" BSC32_SBRS= \ @@ -380,7 +321,9 @@ LIB32=link.exe -lib LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" LIB32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ + "$(INTDIR)\apr_atomic64.obj" \ "$(INTDIR)\dso.obj" \ + "$(INTDIR)\apr_encode.obj" \ "$(INTDIR)\apr_escape.obj" \ "$(INTDIR)\buffer.obj" \ "$(INTDIR)\copy.obj" \ @@ -422,233 +365,21 @@ LIB32_OBJS= \ "$(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 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" \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***