You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by vm...@apache.org on 2012/06/21 07:54:47 UTC
svn commit: r1352418 [1/6] - in /subversion/branches/javahl-ra: ./ build/
build/ac-macros/ build/generator/ build/generator/templates/ build/win32/
contrib/server-side/ notes/wc-ng/
subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversio...
Author: vmpn
Date: Thu Jun 21 05:54:42 2012
New Revision: 1352418
URL: http://svn.apache.org/viewvc?rev=1352418&view=rev
Log:
On the javahl-ra branch:
Bring up-to-date with trunk@1352411
Added:
subversion/branches/javahl-ra/notes/wc-ng/conflict-storage-2.0
- copied unchanged from r1352411, subversion/trunk/notes/wc-ng/conflict-storage-2.0
subversion/branches/javahl-ra/subversion/tests/cmdline/svndumpfilter_tests_data/simple_v3.dump
- copied unchanged from r1352411, subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests_data/simple_v3.dump
Removed:
subversion/branches/javahl-ra/build/ac-macros/neon.m4
subversion/branches/javahl-ra/build/generator/templates/neon.dsp.ezt
subversion/branches/javahl-ra/build/generator/templates/neon.vcproj.ezt
subversion/branches/javahl-ra/build/generator/templates/neon.vcxproj.ezt
subversion/branches/javahl-ra/subversion/libsvn_ra_neon/
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/COMMITTERS
subversion/branches/javahl-ra/Makefile.in
subversion/branches/javahl-ra/build.conf
subversion/branches/javahl-ra/build/ac-macros/swig.m4
subversion/branches/javahl-ra/build/generator/gen_msvc_dsp.py
subversion/branches/javahl-ra/build/generator/gen_vcnet_vcproj.py
subversion/branches/javahl-ra/build/generator/gen_win.py
subversion/branches/javahl-ra/build/run_tests.py
subversion/branches/javahl-ra/build/win32/make_dist.py
subversion/branches/javahl-ra/build/win32/vc6-build.bat.in
subversion/branches/javahl-ra/configure.ac
subversion/branches/javahl-ra/contrib/server-side/fsfsverify.py
subversion/branches/javahl-ra/gen-make.py
subversion/branches/javahl-ra/get-deps.sh
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/javahl-ra/subversion/bindings/swig/core.i
subversion/branches/javahl-ra/subversion/include/private/svn_client_private.h
subversion/branches/javahl-ra/subversion/include/private/svn_dav_protocol.h
subversion/branches/javahl-ra/subversion/include/private/svn_repos_private.h
subversion/branches/javahl-ra/subversion/include/svn_auth.h
subversion/branches/javahl-ra/subversion/include/svn_delta.h
subversion/branches/javahl-ra/subversion/include/svn_error_codes.h
subversion/branches/javahl-ra/subversion/include/svn_io.h
subversion/branches/javahl-ra/subversion/include/svn_ra.h
subversion/branches/javahl-ra/subversion/include/svn_repos.h
subversion/branches/javahl-ra/subversion/include/svn_wc.h
subversion/branches/javahl-ra/subversion/libsvn_client/deprecated.c
subversion/branches/javahl-ra/subversion/libsvn_client/info.c
subversion/branches/javahl-ra/subversion/libsvn_client/merge.c
subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.c
subversion/branches/javahl-ra/subversion/libsvn_client/patch.c
subversion/branches/javahl-ra/subversion/libsvn_client/repos_diff.c
subversion/branches/javahl-ra/subversion/libsvn_client/status.c
subversion/branches/javahl-ra/subversion/libsvn_client/switch.c
subversion/branches/javahl-ra/subversion/libsvn_client/update.c
subversion/branches/javahl-ra/subversion/libsvn_delta/compat.c
subversion/branches/javahl-ra/subversion/libsvn_delta/svndiff.c
subversion/branches/javahl-ra/subversion/libsvn_delta/text_delta.c
subversion/branches/javahl-ra/subversion/libsvn_delta/xdelta.c
subversion/branches/javahl-ra/subversion/libsvn_diff/diff_file.c
subversion/branches/javahl-ra/subversion/libsvn_diff/diff_memory.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/key-gen.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/lock.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/javahl-ra/subversion/libsvn_ra/compat.c
subversion/branches/javahl-ra/subversion/libsvn_ra/ra_loader.c
subversion/branches/javahl-ra/subversion/libsvn_ra/ra_loader.h
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/blame.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/commit.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/merge.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/options.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/property.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/replay.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/serf.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/update.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/util.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/xml.c
subversion/branches/javahl-ra/subversion/libsvn_ra_svn/marshal.c
subversion/branches/javahl-ra/subversion/libsvn_repos/deprecated.c
subversion/branches/javahl-ra/subversion/libsvn_repos/dump.c
subversion/branches/javahl-ra/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/javahl-ra/subversion/libsvn_repos/load.c
subversion/branches/javahl-ra/subversion/libsvn_repos/replay.c
subversion/branches/javahl-ra/subversion/libsvn_subr/adler32.c
subversion/branches/javahl-ra/subversion/libsvn_subr/auth.c
subversion/branches/javahl-ra/subversion/libsvn_subr/base64.c
subversion/branches/javahl-ra/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/javahl-ra/subversion/libsvn_subr/cache-memcache.c
subversion/branches/javahl-ra/subversion/libsvn_subr/cache.c
subversion/branches/javahl-ra/subversion/libsvn_subr/checksum.c
subversion/branches/javahl-ra/subversion/libsvn_subr/config_file.c
subversion/branches/javahl-ra/subversion/libsvn_subr/dirent_uri.c
subversion/branches/javahl-ra/subversion/libsvn_subr/io.c
subversion/branches/javahl-ra/subversion/libsvn_subr/path.c
subversion/branches/javahl-ra/subversion/libsvn_subr/pool.c
subversion/branches/javahl-ra/subversion/libsvn_subr/quoprint.c
subversion/branches/javahl-ra/subversion/libsvn_subr/skel.c
subversion/branches/javahl-ra/subversion/libsvn_subr/spillbuf.c
subversion/branches/javahl-ra/subversion/libsvn_subr/sqlite.c
subversion/branches/javahl-ra/subversion/libsvn_subr/stream.c
subversion/branches/javahl-ra/subversion/libsvn_subr/string.c
subversion/branches/javahl-ra/subversion/libsvn_subr/temp_serializer.c
subversion/branches/javahl-ra/subversion/libsvn_subr/win32_crypto.c
subversion/branches/javahl-ra/subversion/libsvn_wc/adm_ops.c
subversion/branches/javahl-ra/subversion/libsvn_wc/conflicts.c
subversion/branches/javahl-ra/subversion/libsvn_wc/copy.c
subversion/branches/javahl-ra/subversion/libsvn_wc/merge.c
subversion/branches/javahl-ra/subversion/libsvn_wc/old-and-busted.c
subversion/branches/javahl-ra/subversion/libsvn_wc/props.c
subversion/branches/javahl-ra/subversion/libsvn_wc/upgrade.c
subversion/branches/javahl-ra/subversion/libsvn_wc/wc_db.c
subversion/branches/javahl-ra/subversion/libsvn_wc/wc_db_util.c
subversion/branches/javahl-ra/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/liveprops.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/mirror.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/reports/update.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/repos.c
subversion/branches/javahl-ra/subversion/svn/main.c
subversion/branches/javahl-ra/subversion/svn/merge-cmd.c
subversion/branches/javahl-ra/subversion/svn/notify.c
subversion/branches/javahl-ra/subversion/svndumpfilter/main.c
subversion/branches/javahl-ra/subversion/svnrdump/load_editor.c
subversion/branches/javahl-ra/subversion/svnserve/cyrus_auth.c
subversion/branches/javahl-ra/subversion/svnserve/serve.c
subversion/branches/javahl-ra/subversion/svnversion/main.c
subversion/branches/javahl-ra/subversion/tests/cmdline/atomic-ra-revprop-change.c
subversion/branches/javahl-ra/subversion/tests/cmdline/blame_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/davautocheck.sh
subversion/branches/javahl-ra/subversion/tests/cmdline/merge_symmetric_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/merge_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/stat_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svnserveautocheck.sh
subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/actions.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/main.py
subversion/branches/javahl-ra/subversion/tests/cmdline/update_tests.py
subversion/branches/javahl-ra/subversion/tests/libsvn_delta/random-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_delta/svndiff-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_delta/vdelta-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_delta/window-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/skel-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/string-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/utf-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svncheck.sh
subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svnclean.sh
subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
subversion/branches/javahl-ra/tools/dev/gdb-py/svndbg/printers.py
subversion/branches/javahl-ra/tools/dev/svnraisetreeconflict/main.c
subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn
subversion/branches/javahl-ra/tools/dev/windows-build/Makefile
subversion/branches/javahl-ra/win-tests.py
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1347594-1352411
Modified: subversion/branches/javahl-ra/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/COMMITTERS?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/COMMITTERS [UTF-8] (original)
+++ subversion/branches/javahl-ra/COMMITTERS [UTF-8] Thu Jun 21 05:54:42 2012
@@ -13,7 +13,7 @@ Blanket commit access:
sussman Ben Collins-Sussman <su...@red-bean.com>
kfogel Karl Fogel <kf...@red-bean.com>
gstein Greg Stein <gs...@gmail.com>
- brane Branko Čibej <br...@xbc.nu>
+ brane Branko Čibej <br...@apache.org>
jorton Joe Orton <jo...@manyfish.co.uk>
ghudson Greg Hudson <gh...@mit.edu>
fitz Brian W. Fitzpatrick <fi...@red-bean.com>
@@ -95,6 +95,7 @@ Commit access for specific areas:
jrvernooij Jelmer Vernooij <je...@samba.org> (Python bindings)
sage Sage LaTorra <sa...@gmail.com> (Ctypes-Python b.)
rdonch Роман Донченко <dp...@corrigendum.ru> (Swig-Python b.)
+ vmpn Vladimir Berezniker <vm...@hitechman.com> (JavaHL bindings)
Packages:
Modified: subversion/branches/javahl-ra/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/Makefile.in?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/Makefile.in (original)
+++ subversion/branches/javahl-ra/Makefile.in Thu Jun 21 05:54:42 2012
@@ -42,7 +42,6 @@ SVN_EXTERNAL_PROJECT_SUBDIRS = @SVN_EXTE
SCHEMA_DIR = subversion/svn/schema
-NEON_LIBS = @NEON_LIBS@
SVN_APR_LIBS = @SVN_APR_LIBS@
SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
SVN_APR_MEMCACHE_LIBS = @SVN_APR_MEMCACHE_LIBS@
@@ -70,7 +69,6 @@ gnome_keyring_libdir = @libdir@
gpg_agent_libdir = @libdir@
gssapi_libdir = @libdir@
kwallet_libdir = @libdir@
-neon_libdir = @libdir@
serf_libdir = @libdir@
bindir = @bindir@
includedir = @includedir@
@@ -129,7 +127,7 @@ LT_CXX_LIBADD = @LT_CXX_LIBADD@
INCLUDES = -I$(top_srcdir)/subversion/include -I$(top_builddir)/subversion \
@SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@ @SVN_APR_MEMCACHE_INCLUDES@ \
@SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@ @SVN_GSSAPI_INCLUDES@ \
- @SVN_KWALLET_INCLUDES@ @SVN_MAGIC_INCLUDES@ @SVN_NEON_INCLUDES@ \
+ @SVN_KWALLET_INCLUDES@ @SVN_MAGIC_INCLUDES@ \
@SVN_SASL_INCLUDES@ @SVN_SERF_INCLUDES@ @SVN_SQLITE_INCLUDES@ \
@SVN_XML_INCLUDES@ @SVN_ZLIB_INCLUDES@
@@ -218,7 +216,6 @@ libsvn_fs_fs_LDFLAGS = @libsvn_fs_fs_LDF
libsvn_fs_util_LDFLAGS = @libsvn_fs_util_LDFLAGS@
libsvn_ra_LDFLAGS = @libsvn_ra_LDFLAGS@
libsvn_ra_local_LDFLAGS = @libsvn_ra_local_LDFLAGS@
-libsvn_ra_neon_LDFLAGS = @libsvn_ra_neon_LDFLAGS@
libsvn_ra_serf_LDFLAGS = @libsvn_ra_serf_LDFLAGS@
libsvn_ra_svn_LDFLAGS = @libsvn_ra_svn_LDFLAGS@
libsvn_repos_LDFLAGS = @libsvn_repos_LDFLAGS@
@@ -245,7 +242,6 @@ INSTALL_GPG_AGENT_LIB = $(INSTALL_LIB)
INSTALL_GNOME_KEYRING_LIB = $(INSTALL_LIB)
INSTALL_GSSAPI_LIB = $(INSTALL_LIB)
INSTALL_KWALLET_LIB = $(INSTALL_LIB)
-INSTALL_NEON_LIB = $(INSTALL_LIB)
INSTALL_SERF_LIB = $(INSTALL_LIB)
INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
@@ -491,6 +487,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
if test "$(SET_LOG_LEVEL)" != ""; then \
flags="--set-log-level $(SET_LOG_LEVEL) $$flags"; \
fi; \
+ if test "$(SSL_CERT)" != ""; then \
+ flags="--ssl-cert $(SSL_CERT) $$flags"; \
+ fi; \
LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)' \
$(PYTHON) $(top_srcdir)/build/run_tests.py \
--config-file $(top_srcdir)/subversion/tests/tests.conf \
@@ -584,15 +583,9 @@ external-clean external-distclean extern
revlist="$$i $$revlist"; \
done; \
for i in $$revlist; do \
- if test "$$i" = "neon" -a "$$target" = "extraclean"; then \
- echo "------ making distclean (no extraclean) in $$i"; \
- (cd $$i && $(MAKE) distclean) || exit 1; \
- echo "------ completed distclean (no extraclean) in $$i"; \
- else \
- echo "------ making $$target in $$i"; \
- (cd $$i && $(MAKE) $$target) || exit 1; \
- echo "------ completed $$target in $$i"; \
- fi; \
+ echo "------ making $$target in $$i"; \
+ (cd $$i && $(MAKE) $$target) || exit 1; \
+ echo "------ completed $$target in $$i"; \
done;
Modified: subversion/branches/javahl-ra/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build.conf?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build.conf (original)
+++ subversion/branches/javahl-ra/build.conf Thu Jun 21 05:54:42 2012
@@ -84,32 +84,13 @@ swig-checkout-files = common.swg swigrun
# BUILD TARGETS
#
-# Explanation for the seemingly-spurious mention of 'neon' in the libs lines
-# for svn, svnsync, ra-local-test, client-test, svn-push and svnmucc:
-# This is a workaround for a libtool bug, which manifests on Linux and similar
-# ELF platforms, when linking to an installed Neon, and there are old
-# Subversion libraries in the same directory as the installed Neon. In such
-# cases, the run-before-installing version of the executables (.libs/lt-foo),
-# gets given an ELF RPATH which includes the install directory *before* all the
-# uninstalled libsvn_foo/.libs directories have been mentioned. This occurs
-# because when libtool is at the point of handling Neon, it adds an RPATH entry
-# pointing to its directory, but fails to correctly consider that it should
-# prioritize all the RPATH entries for *un*installed libraries before all those
-# for installed libraries, to avoid this bug. As a kludgy workaround, we add
-# a mention of 'neon' to the end of the libs lines for executables which
-# indirectly link to libsvn_ra_neon, which has the effect of 'pulling' the
-# harmful RPATH entry toward the end of RPATH, enabling the executables to run
-# correctly before installation, even when old versions of the Subversion
-# libraries are present.
-# This bug was last confirmed to be present in libtool 1.5.22.
-
# The subversion command-line client
[svn]
description = Subversion Client
type = exe
path = subversion/svn
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr
- apriconv apr neon
+ apriconv apr
manpages = subversion/svn/svn.1
install = bin
@@ -154,7 +135,7 @@ msvc-libs = advapi32.lib ws2_32.lib
description = Subversion repository replicator
type = exe
path = subversion/svnsync
-libs = libsvn_ra libsvn_delta libsvn_subr apr neon
+libs = libsvn_ra libsvn_delta libsvn_subr apr
install = bin
manpages = subversion/svnsync/svnsync.1
@@ -178,7 +159,7 @@ manpages = subversion/svnrdump/svnrdump.
description = Subversion Multiple URL Command Client
type = exe
path = subversion/svnmucc
-libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr neon
+libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr
install = bin
manpages = subversion/svnmucc/svnmucc.1
@@ -274,14 +255,6 @@ add-install-deps = $(SVN_RA_LIB_INSTALL_
install = lib
msvc-export = svn_ra.h private\svn_ra_private.h
-# Accessing repositories via DAV through neon
-[libsvn_ra_neon]
-type = ra-module
-path = subversion/libsvn_ra_neon
-install = neon-lib
-libs = libsvn_delta libsvn_subr aprutil apriconv apr neon
-msvc-static = yes
-
# Accessing repositories via DAV through serf
[libsvn_ra_serf]
type = ra-module
@@ -615,7 +588,7 @@ description = Subversion Java HighLevel
type = lib
path = subversion/bindings/javahl/native
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
- libsvn_subr libsvn_fs aprutil apriconv apr neon
+ libsvn_subr libsvn_fs aprutil apriconv apr
sources = *.cpp *.c
add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS)
install = javahl-lib
@@ -932,7 +905,7 @@ type = exe
path = subversion/tests/libsvn_client
sources = client-test.c
install = test
-libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr neon
+libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr
# ----------------------------------------------------------------------------
# Tests for libsvn_diff
@@ -963,7 +936,7 @@ path = subversion/tests/libsvn_ra_local
sources = ra-local-test.c
install = test
libs = libsvn_test libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr
- apriconv apr neon
+ apriconv apr
# ----------------------------------------------------------------------------
# Tests for libsvn_wc
@@ -1120,14 +1093,6 @@ external-lib = $(SVN_ZLIB_LIBS)
external-project = zlib
msvc-static = yes
-[neon]
-type = lib
-external-lib = $(NEON_LIBS)
-external-project = neon/neon
-libs = xml
-msvc-libs = ws2_32.lib
-msvc-static = yes
-
[apr_memcache]
type = lib
external-lib = $(SVN_APR_MEMCACHE_LIBS)
@@ -1150,7 +1115,7 @@ external-lib = $(SVN_XML_LIBS)
[ra-libs]
type = lib
external-lib = $(SVN_RA_LIB_LINK)
-libs = libsvn_ra_neon libsvn_ra_serf libsvn_ra_local libsvn_ra_svn
+libs = libsvn_ra_serf libsvn_ra_local libsvn_ra_svn
[fs-libs]
type = lib
@@ -1194,7 +1159,7 @@ libs = __ALL__
type = project
path = build/win32
libs = fs-libs ra-libs libsvn_client libsvn_subr libsvn_wc
- aprutil apriconv apr neon
+ aprutil apriconv apr
[__CONFIG__]
type = lib
Modified: subversion/branches/javahl-ra/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/ac-macros/swig.m4?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/ac-macros/swig.m4 (original)
+++ subversion/branches/javahl-ra/build/ac-macros/swig.m4 Thu Jun 21 05:54:42 2012
@@ -120,6 +120,10 @@ AC_DEFUN(SVN_FIND_SWIG,
])
SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+ dnl Swig-generated code results in a number of shadowed variables, so
+ dnl ignore those warnings when compiling swig-py
+ SWIG_PY_COMPILE=`echo "$SWIG_PY_COMPILE" | $SED -e 's/-Wshadow //'`
+
AC_CACHE_CHECK([for linking Python extensions], [ac_cv_python_link],[
ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
])
Modified: subversion/branches/javahl-ra/build/generator/gen_msvc_dsp.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/generator/gen_msvc_dsp.py?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/generator/gen_msvc_dsp.py (original)
+++ subversion/branches/javahl-ra/build/generator/gen_msvc_dsp.py Thu Jun 21 05:54:42 2012
@@ -129,7 +129,6 @@ class Generator(gen_win.WinGeneratorBase
('project_guid', self.makeguid('svn_locale')),
))
self.write_zlib_project_file('zlib.dsp')
- self.write_neon_project_file('neon.dsp')
self.write_serf_project_file('serf.dsp')
install_targets = self.get_install_targets()
Modified: subversion/branches/javahl-ra/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/generator/gen_vcnet_vcproj.py?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/javahl-ra/build/generator/gen_vcnet_vcproj.py Thu Jun 21 05:54:42 2012
@@ -156,7 +156,6 @@ class Generator(gen_win.WinGeneratorBase
('project_guid', self.makeguid('svn_locale')),
))
self.write_zlib_project_file('zlib' + self.vcproj_extension)
- self.write_neon_project_file('neon' + self.vcproj_extension)
self.write_serf_project_file('serf' + self.vcproj_extension)
install_targets = self.get_install_targets()
Modified: subversion/branches/javahl-ra/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/generator/gen_win.py?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/generator/gen_win.py (original)
+++ subversion/branches/javahl-ra/build/generator/gen_win.py Thu Jun 21 05:54:42 2012
@@ -73,9 +73,6 @@ class GeneratorBase(gen_base.GeneratorBa
self.serf_path = None
self.serf_lib = None
self.bdb_path = 'db4-win32'
- self.without_neon = False
- self.neon_path = 'neon'
- self.neon_ver = 25005
self.httpd_path = None
self.libintl_path = None
self.zlib_path = 'zlib'
@@ -119,10 +116,6 @@ class GeneratorBase(gen_base.GeneratorBa
self.apr_iconv_path = val
elif opt == '--with-serf':
self.serf_path = val
- elif opt == '--with-neon':
- self.neon_path = val
- elif opt == '--without-neon':
- self.without_neon = True
elif opt == '--with-httpd':
self.httpd_path = val
del self.skip_sections['mod_dav_svn']
@@ -270,10 +263,6 @@ class WinGeneratorBase(GeneratorBase):
self._find_zlib()
self._find_ml()
- # Find neon version
- if self.neon_path:
- self._find_neon()
-
# Find serf and its dependencies
if self.serf_path:
self._find_serf()
@@ -391,9 +380,6 @@ class WinGeneratorBase(GeneratorBase):
if not self.serf_lib:
install_targets = [x for x in install_targets if x.name != 'serf']
install_targets = [x for x in install_targets if x.name != 'libsvn_ra_serf']
- if self.without_neon:
- install_targets = [x for x in install_targets if x.name != 'neon']
- install_targets = [x for x in install_targets if x.name != 'libsvn_ra_neon']
# Drop the swig targets if we don't have swig
if not self.swig_path and not self.swig_libdir:
@@ -690,9 +676,7 @@ class WinGeneratorBase(GeneratorBase):
and target.external_project):
return None
- if target.external_project[:5] == 'neon/':
- path = self.neon_path + target.external_project[4:]
- elif target.external_project[:5] == 'serf/' and self.serf_lib:
+ if target.external_project[:5] == 'serf/' and self.serf_lib:
path = self.serf_path + target.external_project[4:]
elif target.external_project.find('/') != -1:
path = target.external_project
@@ -715,8 +699,8 @@ class WinGeneratorBase(GeneratorBase):
if self.enable_nls and name == '__ALL__':
depends.extend(self.sections['locale'].get_targets())
- # Build ZLib as a dependency of Neon or Serf if we have it
- if self.zlib_path and (name == 'neon' or name == 'serf'):
+ # Build ZLib as a dependency of Serf if we have it
+ if self.zlib_path and name == 'serf':
depends.extend(self.sections['zlib'].get_targets())
# To set the correct build order of the JavaHL targets, the javahl-javah
@@ -881,26 +865,10 @@ class WinGeneratorBase(GeneratorBase):
if self.enable_nls:
fakedefines.append("ENABLE_NLS")
- # check for neon 0.26.x or newer
- if self.neon_ver >= 26000:
- fakedefines.append("SVN_NEON_0_26=1")
-
- # check for neon 0.27.x or newer
- if self.neon_ver >= 27000:
- fakedefines.append("SVN_NEON_0_27=1")
-
- # check for neon 0.28.x or newer
- if self.neon_ver >= 28000:
- fakedefines.append("SVN_NEON_0_28=1")
-
if self.serf_lib:
fakedefines.append("SVN_HAVE_SERF")
fakedefines.append("SVN_LIBSVN_CLIENT_LINKS_RA_SERF")
- if self.neon_lib:
- fakedefines.append("SVN_HAVE_NEON")
- fakedefines.append("SVN_LIBSVN_CLIENT_LINKS_RA_NEON")
-
# check we have sasl
if self.sasl_path:
fakedefines.append("SVN_HAVE_SASL")
@@ -938,7 +906,6 @@ class WinGeneratorBase(GeneratorBase):
self.path(util_includes) ])
else:
fakeincludes.extend([ self.apath(self.apr_util_path, "xml/expat/lib"),
- self.apath(self.neon_path, "src"),
self.path("subversion/bindings/swig/proxy"),
self.apath(self.bdb_path, "include") ])
@@ -988,7 +955,6 @@ class WinGeneratorBase(GeneratorBase):
libcfg = cfg.replace("Debug", "LibD").replace("Release", "LibR")
fakelibdirs = [ self.apath(self.bdb_path, "lib"),
- self.apath(self.neon_path),
self.apath(self.zlib_path),
]
@@ -1029,9 +995,6 @@ class WinGeneratorBase(GeneratorBase):
if self.bdb_lib:
dblib = self.bdb_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
- if self.neon_lib:
- neonlib = self.neon_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
-
if self.serf_lib:
if self.serf_ver_maj != 0:
serflib = 'serf-%d.lib' % self.serf_ver_maj
@@ -1080,9 +1043,6 @@ class WinGeneratorBase(GeneratorBase):
if dep.external_lib == '$(SVN_SQLITE_LIBS)' and not self.sqlite_inline:
nondeplibs.append('sqlite3.lib')
- if self.neon_lib and dep.external_lib == '$(NEON_LIBS)':
- nondeplibs.append(neonlib)
-
if self.serf_lib and dep.external_lib == '$(SVN_SERF_LIBS)':
nondeplibs.append(serflib)
@@ -1171,30 +1131,6 @@ class WinGeneratorBase(GeneratorBase):
('use_ml', self.have_ml and 1 or None),
))
- def write_neon_project_file(self, name):
- if self.without_neon:
- return
-
- neon_path = os.path.abspath(self.neon_path)
- neon_sources = map(lambda x : os.path.relpath(x, self.neon_path),
- glob.glob(os.path.join(neon_path, 'src', '*.c')))
- neon_headers = map(lambda x : os.path.relpath(x, self.neon_path),
- glob.glob(os.path.join(neon_path, 'src', '*.h')))
-
- self.move_proj_file(self.neon_path, name,
- (('neon_sources', neon_sources),
- ('neon_headers', neon_headers),
- ('expat_path',
- os.path.relpath(os.path.join(self.apr_util_path,
- 'xml', 'expat', 'lib'),
- self.neon_path)),
- ('zlib_path', os.path.relpath(self.zlib_path,
- self.neon_path)),
- ('openssl_path', os.path.relpath(self.openssl_path,
- self.neon_path)),
- ('project_guid', self.makeguid('neon')),
- ))
-
def write_serf_project_file(self, name):
if not self.serf_lib:
return
@@ -1232,7 +1168,7 @@ class WinGeneratorBase(GeneratorBase):
def move_proj_file(self, path, name, params=()):
### Move our slightly templatized pre-built project files into place --
- ### these projects include zlib, neon, serf, locale, config, etc.
+ ### these projects include zlib, serf, locale, config, etc.
dest_file = os.path.join(path, name)
source_template = os.path.join('templates', name + '.ezt')
@@ -1443,33 +1379,6 @@ class WinGeneratorBase(GeneratorBase):
finally:
fp.close()
- def _find_neon(self):
- "Find the neon version"
- msg = 'WARNING: Unable to determine neon version\n'
- if self.without_neon:
- self.neon_lib = None
- msg = 'Not attempting to find neon\n'
- else:
- try:
- self.neon_lib = "libneon"
- fp = open(os.path.join(self.neon_path, '.version'))
- txt = fp.read()
- vermatch = re.compile(r'(\d+)\.(\d+)\.(\d+)$', re.M) \
- .search(txt)
-
- if vermatch:
- version = tuple(map(int, vermatch.groups()))
- # build/ac-macros/swig.m4 explains the next incantation
- self.neon_ver = int('%d%02d%03d' % version)
- msg = 'Found neon version %d.%d.%d\n' % version
- if self.neon_ver < 25005:
- msg = 'WARNING: Neon version 0.25.5 or higher is required'
- except:
- msg = 'WARNING: Error while determining neon version\n'
- self.neon_lib = None
-
- print(msg)
-
def _get_serf_version(self):
"Retrieves the serf version from serf.h"
Modified: subversion/branches/javahl-ra/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/run_tests.py?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/run_tests.py (original)
+++ subversion/branches/javahl-ra/build/run_tests.py Thu Jun 21 05:54:42 2012
@@ -29,7 +29,7 @@
[--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]
[--list] [--milestone-filter=<regex>] [--mode-filter=<type>]
[--server-minor-version=<version>]
- [--config-file=<file>]
+ [--config-file=<file>] [--ssl-cert=<file>]
<abs_srcdir> <abs_builddir>
<prog ...>
@@ -124,7 +124,7 @@ class TestHarness:
cleanup=None, enable_sasl=None, parallel=None, config_file=None,
fsfs_sharding=None, fsfs_packing=None,
list_tests=None, svn_bin=None, mode_filter=None,
- milestone_filter=None, set_log_level=None):
+ milestone_filter=None, set_log_level=None, ssl_cert=None):
'''Construct a TestHarness instance.
ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -175,6 +175,7 @@ class TestHarness:
self.svn_bin = svn_bin
self.mode_filter = mode_filter
self.log = None
+ self.ssl_cert = ssl_cert
if not sys.stdout.isatty() or sys.platform == 'win32':
TextColors.disable()
@@ -467,6 +468,8 @@ class TestHarness:
svntest.main.options.fsfs_packing = self.fsfs_packing
if self.mode_filter is not None:
svntest.main.options.mode_filter = self.mode_filter
+ if self.ssl_cert is not None:
+ svntest.main.options.ssl_cert = self.ssl_cert
svntest.main.options.srcdir = self.srcdir
@@ -623,7 +626,7 @@ def main():
'fsfs-packing', 'fsfs-sharding=',
'enable-sasl', 'parallel', 'config-file=',
'log-to-stdout', 'list', 'milestone-filter=',
- 'mode-filter=', 'set-log-level='])
+ 'mode-filter=', 'set-log-level=', 'ssl-cert='])
except getopt.GetoptError:
args = []
@@ -634,9 +637,9 @@ def main():
base_url, fs_type, verbose, cleanup, enable_sasl, http_library, \
server_minor_version, fsfs_sharding, fsfs_packing, parallel, \
config_file, log_to_stdout, list_tests, mode_filter, milestone_filter, \
- set_log_level = \
+ set_log_level, ssl_cert = \
None, None, None, None, None, None, None, None, None, None, None, \
- None, None, None, None, None
+ None, None, None, None, None, None
for opt, val in opts:
if opt in ['-u', '--url']:
base_url = val
@@ -670,6 +673,8 @@ def main():
mode_filter = val
elif opt in ['--set-log-level']:
set_log_level = val
+ elif opt in ['--ssl-cert']:
+ ssl_cert = val
else:
raise getopt.GetoptError
@@ -685,7 +690,7 @@ def main():
verbose, cleanup, enable_sasl, parallel, config_file,
fsfs_sharding, fsfs_packing, list_tests,
mode_filter=mode_filter, milestone_filter=milestone_filter,
- set_log_level=set_log_level)
+ set_log_level=set_log_level, ssl_cert=ssl_cert)
failed = th.run(args[2:])
if failed:
Modified: subversion/branches/javahl-ra/build/win32/make_dist.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/win32/make_dist.py?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/win32/make_dist.py (original)
+++ subversion/branches/javahl-ra/build/win32/make_dist.py Thu Jun 21 05:54:42 2012
@@ -273,9 +273,6 @@ _disttree = {'': OptFile('%(readme)s', '
File('%(@apr-util)s/%(aprxml)s/xml.lib'),
File('%(@apr-util)s/%(aprxml)s/xml.pdb'),
),
- 'lib/neon': (File('%(@neon)s/libneon.lib'),
- OptFile('%(@zlib)s/zlibstat.lib'),
- ),
'lib/serf': (File('%(@serf)s/Release/serf.lib'),
),
@@ -286,7 +283,6 @@ _disttree = {'': OptFile('%(readme)s', '
'licenses': None,
'licenses/bdb': File('%(@berkeley-db)s/LICENSE'),
- 'licenses/neon': File('%(@neon)s/src/COPYING.LIB'),
'licenses/serf': File('%(@serf)s/LICENSE'),
'licenses/zlib': File('%(@zlib)s/README'),
'licenses/apr-util': (File('%(@apr-util)s/LICENSE'),
@@ -381,8 +377,6 @@ def _read_config():
os.path.abspath(os.path.join(_srcdir, 'apr-iconv')),
'@apr-util':
os.path.abspath(os.path.join(_srcdir, 'apr-util')),
- '@neon':
- os.path.abspath(os.path.join(_srcdir, 'neon')),
}
cfg = configparser.ConfigParser(path_defaults)
Modified: subversion/branches/javahl-ra/build/win32/vc6-build.bat.in
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/win32/vc6-build.bat.in?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/win32/vc6-build.bat.in (original)
+++ subversion/branches/javahl-ra/build/win32/vc6-build.bat.in Thu Jun 21 05:54:42 2012
@@ -56,7 +56,6 @@ if not exist src-%DIR% goto svnerr
if not exist zlib goto zliberr
if not exist zlib\zlibstat.lib goto zlibstaterr
if not exist src-%DIR%\db4-win32 goto bdberr
-if not exist src-%DIR%\neon goto neonerr
if not exist gettext goto gettexterr
goto allok
@@ -84,9 +83,6 @@ goto end
:bdberr
echo Unable to find Berekely DB
goto end
-:neonerr
-echo Unable to find neon
-goto end
:gettexterr
echo Unable to find gettext
goto end
Modified: subversion/branches/javahl-ra/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/configure.ac?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/configure.ac (original)
+++ subversion/branches/javahl-ra/configure.ac Thu Jun 21 05:54:42 2012
@@ -115,29 +115,7 @@ AC_SUBST(SVN_LT_SOVERSION)
dnl Search for pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config)
-# Either a space-separated list of allowable Neon versions, or "any" to
-# mean allow anything.
-NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29"
-NEON_RECOMMENDED_VER="0.29.6"
-NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz"
-dnl You can skip the neon version check only if you know what you are doing
-AC_ARG_ENABLE(neon-version-check,
- AS_HELP_STRING([--disable-neon-version-check],
- [do not check the Neon version]),
- [
- if test "$enableval" = "no" ; then
- NEON_ALLOWED_LIST="any"
- fi
- ],
- [])
-SVN_LIB_NEON($NEON_ALLOWED_LIST, $NEON_RECOMMENDED_VER, $NEON_URL)
-
-if test "$svn_lib_neon" = "yes"; then
- AC_DEFINE([SVN_HAVE_NEON], 1,
- [Defined if support for Neon is enabled])
-fi
-
-dnl Search for serf as an alternative to neon
+dnl Search for serf
SVN_LIB_SERF(1,0,0)
if test "$svn_lib_serf" = "yes"; then
@@ -166,8 +144,8 @@ dnl Find Apache with a recent-enough mag
SVN_FIND_APACHE(20020903)
dnl Search for SQLite
-SQLITE_MINIMUM_VER="3.6.18"
-SQLITE_RECOMMENDED_VER="3.7.6.3"
+SQLITE_MINIMUM_VER="3.7.12"
+SQLITE_RECOMMENDED_VER="3.7.12"
SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER}.tar.gz"
SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
${SQLITE_URL})
@@ -395,6 +373,11 @@ AC_ARG_WITH(expat,
[svn_lib_expat="$withval"],
[svn_lib_expat="::expat"])
+# APR-util accepts "builtin" as an argument to this option so if the user
+# passed "builtin" pretend the user didn't specify the --with-expat option
+# at all. Expat will (hopefully) be found in apr-util.
+test "_$svn_lib_expat" = "_builtin" && svn_lib_expat="::expat"
+
AC_MSG_CHECKING([for Expat])
if test -n "`echo "$svn_lib_expat" | $EGREP ":.*:"`"; then
SVN_XML_INCLUDES=""
@@ -840,12 +823,6 @@ if test "$svn_lib_berkeley_db" = "yes";
BDB_TEST_DEPS="\$(BDB_TEST_DEPS)"
BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)"
fi
-
-if test "$svn_lib_neon" = "yes"; then
- BUILD_RULES="$BUILD_RULES neon-lib"
- INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-ramod-lib/install-ramod-lib install-neon-lib/'`"
- INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-neon-lib"
-fi
if test "$svn_lib_serf" = "yes"; then
BUILD_RULES="$BUILD_RULES serf-lib"
@@ -924,10 +901,7 @@ AS_HELP_STRING([--with-openssl],
process where to locate the OpenSSL library when (and only when)
building Serf as an integrated part of the Subversion build
process. When linking to a previously installed version of Serf
- instead, you do not need to use this option. (Note that
- Subversion may also or alternatively be configured to use the
- Neon library for http:// and https:// access; see the
- --with-neon and --with-ssl options.)]),
+ instead, you do not need to use this option.]),
[])
AC_ARG_ENABLE(debug,
@@ -996,7 +970,6 @@ AC_SUBST([libsvn_fs_fs_LDFLAGS])
AC_SUBST([libsvn_fs_util_LDFLAGS])
AC_SUBST([libsvn_ra_LDFLAGS])
AC_SUBST([libsvn_ra_local_LDFLAGS])
-AC_SUBST([libsvn_ra_neon_LDFLAGS])
AC_SUBST([libsvn_ra_serf_LDFLAGS])
AC_SUBST([libsvn_ra_svn_LDFLAGS])
AC_SUBST([libsvn_repos_LDFLAGS])
@@ -1232,11 +1205,6 @@ AS_HELP_STRING([--enable-runtime-module-
])
if test "$svn_enable_shared" = "no" || test "$use_dso" != "yes"; then
- ### We want ra_local first to handle the following scenario:
- ### user has neon and db3 in /usr/local, and db4 in
- ### /usr/local/BerkeleyDB.4.0. If libsvn_ra_neon.la comes before
- ### libsvn_fs.la then libtool ends up linking libsvn_fs to the db3
- ### in /usr/local/lib
AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL, 1,
[Defined if libsvn_client should link against libsvn_ra_local])
svn_ra_lib_deps="\$(RA_LOCAL_DEPS)"
@@ -1248,14 +1216,6 @@ if test "$svn_enable_shared" = "no" || t
svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_SVN_DEPS)"
svn_ra_lib_link="$svn_ra_lib_link \$(RA_SVN_LINK)"
- if test "$svn_lib_neon" = "yes"; then
- AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_NEON, 1,
- [Defined if libsvn_client should link against libsvn_ra_neon])
- svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_NEON_DEPS)"
- svn_ra_lib_install_deps="$svn_ra_lib_install_deps install-neon-lib"
- svn_ra_lib_link="$svn_ra_lib_link \$(RA_NEON_LINK)"
- fi
-
if test "$svn_lib_serf" = "yes"; then
AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_SERF, 1,
[Defined if libsvn_client should link against libsvn_ra_serf])
@@ -1366,6 +1326,17 @@ AC_SUBST(JAVAHL_COMPAT_TESTS_TARGET)
# ==== Miscellaneous bits ====================================================
+# Strip '-no-cpp-precomp' from CPPFLAGS for the clang compiler
+### I think we get this flag from APR, so the fix probably belongs there
+if test "$CC" = "clang"; then
+ CPPFLAGS=`echo "$CPPFLAGS" | $SED -e 's/-no-cpp-precomp //'`
+fi
+
+# Clang also doesn't (yet) support the '-ansi' flag
+if test "$CC" = "clang"; then
+ CFLAGS=`echo "$CFLAGS" | $SED -e 's/-ansi //'`
+fi
+
dnl Since this is used only on Unix-y systems, define the path separator as '/'
AC_DEFINE_UNQUOTED(SVN_PATH_LOCAL_SEPARATOR, '/',
[Defined to be the path separator used on your local filesystem])
@@ -1431,9 +1402,12 @@ if test "$svn_lib_berkeley_db" = "no" &&
You don't seem to have Berkeley DB version $db_version or newer
-installed and linked to APR-UTIL. We have created Makefile which will build
+installed and linked to APR-UTIL. We have created a Makefile which will build
Subversion without support for the Berkeley DB back-end. You can find the
latest version of Berkeley DB here:
- http://www.oracle.com/technology/software/products/berkeley-db/index.html
+
+ http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
+
+or explicitly specify --without-berkeley-db to silence this warning.
])
fi
Modified: subversion/branches/javahl-ra/contrib/server-side/fsfsverify.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/contrib/server-side/fsfsverify.py?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/contrib/server-side/fsfsverify.py (original)
+++ subversion/branches/javahl-ra/contrib/server-side/fsfsverify.py Thu Jun 21 05:54:42 2012
@@ -1043,7 +1043,7 @@ def fixStream(e, revFile):
break
if not m:
- raise "Couldn't find end of rep!"
+ raise Exception("Couldn't find end of rep!")
finalOffset = errorOffset + srcLength
srcOffset = errorOffset
Modified: subversion/branches/javahl-ra/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/gen-make.py?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/gen-make.py (original)
+++ subversion/branches/javahl-ra/gen-make.py Thu Jun 21 05:54:42 2012
@@ -142,12 +142,6 @@ def _usage_exit(err=None):
print(" look for Berkeley DB headers and libs in")
print(" DIR")
print("")
- print(" --with-neon=DIR")
- print(" the Neon sources are in DIR")
- print("")
- print(" --without-neon")
- print(" Don't build Neon sources (if present)")
- print("")
print(" --with-serf=DIR")
print(" the Serf sources are in DIR")
print("")
@@ -162,11 +156,11 @@ def _usage_exit(err=None):
print(" implies --enable-nls")
print("")
print(" --with-openssl=DIR")
- print(" tell neon to look for OpenSSL headers")
+ print(" tell serf to look for OpenSSL headers")
print(" and libs in DIR")
print("")
print(" --with-zlib=DIR")
- print(" tell neon to look for ZLib headers and")
+ print(" tell Subversion to look for ZLib headers and")
print(" libs in DIR")
print("")
print(" --with-jdk=DIR")
@@ -242,8 +236,6 @@ if __name__ == '__main__':
'with-apr-util=',
'with-apr-iconv=',
'with-berkeley-db=',
- 'with-neon=',
- 'without-neon',
'with-serf=',
'with-httpd=',
'with-libintl=',
@@ -265,6 +257,13 @@ if __name__ == '__main__':
'disable-shared',
'installed-libs=',
'vsnet-version=',
+
+ # Keep distributions that help by adding a path
+ # working. On unix this would be filtered by
+ # configure, but on Windows gen-make.py is used
+ # directly.
+ 'with-neon=',
+ 'without-neon',
])
if len(args) > 1:
_usage_exit("Too many arguments")
@@ -289,6 +288,9 @@ if __name__ == '__main__':
if opt != '--debug':
rest.add(opt, val)
del prev_conf
+ elif opt == '--with-neon' or opt == '--without-neon':
+ # Provide a warning that we ignored these arguments
+ print("Ignoring no longer supported argument '%s'" % opt)
else:
rest.add(opt, val)
Modified: subversion/branches/javahl-ra/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/get-deps.sh?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/get-deps.sh (original)
+++ subversion/branches/javahl-ra/get-deps.sh Thu Jun 21 05:54:42 2012
@@ -25,10 +25,9 @@
APR=apr-1.4.6
APR_UTIL=apr-util-1.4.1
-NEON=neon-0.29.6
SERF=serf-1.0.1
-ZLIB=zlib-1.2.6
-SQLITE_VERSION=3.7.10
+ZLIB=zlib-1.2.7
+SQLITE_VERSION=3.7.12
SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e "s/\./ /g"))
HTTPD=httpd-2.2.22
@@ -56,28 +55,20 @@ usage() {
# getters
get_apr() {
cd $TEMPDIR
- $HTTP_FETCH $APACHE_MIRROR/apr/$APR.tar.bz2
- $HTTP_FETCH $APACHE_MIRROR/apr/$APR_UTIL.tar.bz2
+ test -d $BASEDIR/apr || $HTTP_FETCH $APACHE_MIRROR/apr/$APR.tar.bz2
+ test -d $BASEDIR/apr-util || $HTTP_FETCH $APACHE_MIRROR/apr/$APR_UTIL.tar.bz2
cd $BASEDIR
- bzip2 -dc $TEMPDIR/$APR.tar.bz2 | tar -xf -
- bzip2 -dc $TEMPDIR/$APR_UTIL.tar.bz2 | tar -xf -
+ test -d $BASEDIR/apr || bzip2 -dc $TEMPDIR/$APR.tar.bz2 | tar -xf -
+ test -d $BASEDIR/apr-util || bzip2 -dc $TEMPDIR/$APR_UTIL.tar.bz2 | tar -xf -
- mv $APR apr
- mv $APR_UTIL apr-util
-}
-
-get_neon() {
- cd $TEMPDIR
- $HTTP_FETCH http://webdav.org/neon/$NEON.tar.gz
- cd $BASEDIR
-
- gzip -dc $TEMPDIR/$NEON.tar.gz | tar -xf -
-
- mv $NEON neon
+ test -d $BASEDIR/apr || mv $APR apr
+ test -d $BASEDIR/apr-util || mv $APR_UTIL apr-util
}
get_serf() {
+ test -d $BASEDIR/serf && return
+
cd $TEMPDIR
$HTTP_FETCH http://serf.googlecode.com/files/$SERF.tar.bz2
cd $BASEDIR
@@ -88,6 +79,8 @@ get_serf() {
}
get_zlib() {
+ test -d $BASEDIR/zlib && return
+
cd $TEMPDIR
$HTTP_FETCH http://www.zlib.net/$ZLIB.tar.bz2
cd $BASEDIR
@@ -98,6 +91,8 @@ get_zlib() {
}
get_sqlite() {
+ test -d $BASEDIR/sqlite-amalgamation && return
+
cd $TEMPDIR
$HTTP_FETCH http://www.sqlite.org/$SQLITE.zip
cd $BASEDIR
@@ -124,7 +119,6 @@ get_deps() {
done
else
get_apr
- get_neon
get_serf
get_zlib
get_sqlite
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Thu Jun 21 05:54:42 2012
@@ -550,8 +550,11 @@ public class ClientNotifyInformation ext
update_broken_lock ("broken lock removed"),
/** Operation failed because a node is obstructed */
- failed_obstructed ("failed by obstruction");
+ failed_obstructed ("failed by obstruction"),
+ /** Conflict resolver is starting/ending. */
+ conflict_resolver_starting ("conflict resolver starting"),
+ conflict_resolver_done ("conflict resolver done");
/**
* The description of the action.
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Thu Jun 21 05:54:42 2012
@@ -204,7 +204,12 @@ public class ConflictDescriptor
/**
* Attempting to delete object.
*/
- delete;
+ delete,
+
+ /**
+ * Attempting to replace object.
+ */
+ replace;
}
/**
@@ -240,7 +245,12 @@ public class ConflictDescriptor
/**
* Object is already added or schedule-add.
*/
- added;
+ added,
+
+ /**
+ * Object is already replaced.
+ */
+ replaced;
}
public enum Operation
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java Thu Jun 21 05:54:42 2012
@@ -125,8 +125,12 @@ public class ConflictDescriptor
aDesc.getAction().ordinal(), aDesc.getReason().ordinal(),
aDesc.getOperation().ordinal(), aDesc.getBasePath(),
aDesc.getTheirPath(), aDesc.getMyPath(), aDesc.getMergedPath(),
- new ConflictVersion(aDesc.getSrcLeftVersion()),
- new ConflictVersion(aDesc.getSrcRightVersion()));
+ aDesc.getSrcLeftVersion() != null
+ ? new ConflictVersion(aDesc.getSrcLeftVersion())
+ : null,
+ aDesc.getSrcRightVersion() != null
+ ? new ConflictVersion(aDesc.getSrcRightVersion())
+ : null);
}
public String getPath()
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Thu Jun 21 05:54:42 2012
@@ -145,6 +145,16 @@ class SVNTests extends TestCase
protected static String rootUrl;
/**
+ * Username to use in tests
+ */
+ protected final static String USERNAME = "jrandom";
+
+ /**
+ * Password to use in tests
+ */
+ protected final static String PASSWORD = "rayjandom";
+
+ /**
* Create a JUnit <code>TestCase</code> instance.
*/
protected SVNTests()
@@ -276,7 +286,7 @@ class SVNTests extends TestCase
this.client = new SVNClient();
this.client.notification2(new MyNotifier());
this.client.setPrompt(new DefaultPromptUserPassword());
- this.client.username("jrandom");
+ this.client.username(USERNAME);
this.client.setProgressCallback(new DefaultProgressListener());
this.client.setConfigDirectory(this.conf.getAbsolutePath());
this.expectedCommitItems = new HashMap<String, MyCommitItem>();
@@ -284,7 +294,7 @@ class SVNTests extends TestCase
/**
* the default prompt : never prompts the user, provides defaults answers
*/
- private static class DefaultPromptUserPassword implements UserPasswordCallback
+ protected static class DefaultPromptUserPassword implements UserPasswordCallback
{
public int askTrustSSLServer(String info, boolean allowPermanently)
@@ -304,12 +314,12 @@ class SVNTests extends TestCase
public String getPassword()
{
- return "rayjandom";
+ return PASSWORD;
}
public String getUsername()
{
- return "jrandom";
+ return USERNAME;
}
public boolean prompt(String realm, String username)
Modified: subversion/branches/javahl-ra/subversion/bindings/swig/core.i
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/swig/core.i?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/swig/core.i (original)
+++ subversion/branches/javahl-ra/subversion/bindings/swig/core.i Thu Jun 21 05:54:42 2012
@@ -351,12 +351,17 @@
*/
#ifdef SWIGPYTHON
%typemap(in) (char *buffer, apr_size_t *len) ($*2_type temp) {
- if (!PyInt_Check($input)) {
+ if (PyLong_Check($input)) {
+ temp = PyLong_AsLong($input);
+ }
+ else if (PyInt_Check($input)) {
+ temp = PyInt_AsLong($input);
+ }
+ else {
PyErr_SetString(PyExc_TypeError,
"expecting an integer for the buffer size");
SWIG_fail;
}
- temp = PyInt_AsLong($input);
if (temp < 0) {
PyErr_SetString(PyExc_ValueError,
"buffer size must be a positive integer");
Modified: subversion/branches/javahl-ra/subversion/include/private/svn_client_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/private/svn_client_private.h?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/private/svn_client_private.h (original)
+++ subversion/branches/javahl-ra/subversion/include/private/svn_client_private.h Thu Jun 21 05:54:42 2012
@@ -180,9 +180,7 @@ svn_client__wc_node_get_origin(svn_clien
/* A macro to mark sections of code that belong to the 'symmetric merge'
* feature while it's still new. */
-#ifdef SVN_DEBUG
#define SVN_WITH_SYMMETRIC_MERGE
-#endif
#ifdef SVN_WITH_SYMMETRIC_MERGE
Modified: subversion/branches/javahl-ra/subversion/include/private/svn_dav_protocol.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/private/svn_dav_protocol.h?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/private/svn_dav_protocol.h (original)
+++ subversion/branches/javahl-ra/subversion/include/private/svn_dav_protocol.h Thu Jun 21 05:54:42 2012
@@ -1,7 +1,6 @@
/*
* svn_dav_protocol.h: Declarations of the protocol shared by the
- * mod_dav_svn backend for httpd's mod_dav, and its ra_neon and
- * ra_serf RA DAV clients.
+ * mod_dav_svn backend for httpd's mod_dav and its ra_serf RA DAV clients.
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
Modified: subversion/branches/javahl-ra/subversion/include/private/svn_repos_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/private/svn_repos_private.h?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/private/svn_repos_private.h (original)
+++ subversion/branches/javahl-ra/subversion/include/private/svn_repos_private.h Thu Jun 21 05:54:42 2012
@@ -108,7 +108,6 @@ svn_error_t *
svn_repos__replay_ev2(svn_fs_root_t *root,
const char *base_dir,
svn_revnum_t low_water_mark,
- svn_boolean_t send_deltas,
svn_editor_t *editor,
svn_repos_authz_func_t authz_read_func,
void *authz_read_baton,
Modified: subversion/branches/javahl-ra/subversion/include/svn_auth.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/svn_auth.h?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/svn_auth.h (original)
+++ subversion/branches/javahl-ra/subversion/include/svn_auth.h Thu Jun 21 05:54:42 2012
@@ -416,8 +416,8 @@ typedef svn_error_t *(*svn_auth_username
#define SVN_AUTH_SSL_CNMISMATCH 0x00000004
/** @brief Certificate authority is unknown (i.e. not trusted) */
#define SVN_AUTH_SSL_UNKNOWNCA 0x00000008
-/** @brief Other failure. This can happen if neon has introduced a new
- * failure bit that we do not handle yet. */
+/** @brief Other failure. This can happen if an unknown failure occurs
+ * that we do not handle yet. */
#define SVN_AUTH_SSL_OTHER 0x40000000
/** @} */
Modified: subversion/branches/javahl-ra/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/svn_delta.h?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/svn_delta.h (original)
+++ subversion/branches/javahl-ra/subversion/include/svn_delta.h Thu Jun 21 05:54:42 2012
@@ -367,10 +367,26 @@ svn_txdelta_md5_digest(svn_txdelta_strea
*
* @a source and @a target are both readable generic streams. When we call
* svn_txdelta_next_window() on @a *stream, it will read from @a source and
- * @a target to gather as much data as it needs.
+ * @a target to gather as much data as it needs. If @a calculate_checksum
+ * is set, you may call @ref svn_txdelta_md5_digest to get an MD5 checksum
+ * for @a target.
*
* Do any necessary allocation in a sub-pool of @a pool.
+ *
+ * @since New in 1.8.
+ */
+void
+svn_txdelta2(svn_txdelta_stream_t **stream,
+ svn_stream_t *source,
+ svn_stream_t *target,
+ svn_boolean_t calculate_checksum,
+ apr_pool_t *pool);
+
+/** Similar to svn_txdelta2 but always calculating the target checksum.
+ *
+ * @deprecated Provided for backward compatibility with the 1.7 API.
*/
+SVN_DEPRECATED
void
svn_txdelta(svn_txdelta_stream_t **stream,
svn_stream_t *source,
Modified: subversion/branches/javahl-ra/subversion/include/svn_error_codes.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/svn_error_codes.h?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/svn_error_codes.h (original)
+++ subversion/branches/javahl-ra/subversion/include/svn_error_codes.h Thu Jun 21 05:54:42 2012
@@ -915,7 +915,7 @@ SVN_ERROR_START
"Invalid configuration value")
/** @deprecated To improve consistency between ra layers, this error code
- is replaced in ra_{neon|serf} by SVN_ERR_FS_NOT_FOUND.
+ is replaced in ra_serf by SVN_ERR_FS_NOT_FOUND.
Slated for removal in the next major release. */
SVN_ERRDEF(SVN_ERR_RA_DAV_PATH_NOT_FOUND,
SVN_ERR_RA_DAV_CATEGORY_START + 7,
@@ -1400,6 +1400,11 @@ SVN_ERROR_START
SVN_ERR_MISC_CATEGORY_START + 35,
"Constraint error in SQLite db")
+ /** @since New in 1.8. */
+ SVN_ERRDEF(SVN_ERR_TOO_MANY_MEMCACHED_SERVERS,
+ SVN_ERR_MISC_CATEGORY_START + 36,
+ "too many memcached servers configured")
+
/* command-line client errors */
SVN_ERRDEF(SVN_ERR_CL_ARG_PARSING_ERROR,
Modified: subversion/branches/javahl-ra/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/svn_io.h?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/svn_io.h (original)
+++ subversion/branches/javahl-ra/subversion/include/svn_io.h Thu Jun 21 05:54:42 2012
@@ -592,14 +592,14 @@ svn_io_set_file_affected_time(apr_time_t
void
svn_io_sleep_for_timestamps(const char *path, apr_pool_t *pool);
-/** Set @a *different_p to non-zero if @a file1 and @a file2 have different
- * sizes, else set to zero. Both @a file1 and @a file2 are utf8-encoded.
+/** Set @a *different_p to TRUE if @a file1 and @a file2 have different
+ * sizes, else set to FALSE. Both @a file1 and @a file2 are utf8-encoded.
*
* Setting @a *different_p to zero does not mean the files definitely
* have the same size, it merely means that the sizes are not
* definitely different. That is, if the size of one or both files
* cannot be determined, then the sizes are not known to be different,
- * so @a *different_p is set to 0.
+ * so @a *different_p is set to FALSE.
*/
svn_error_t *
svn_io_filesizes_different_p(svn_boolean_t *different_p,
Modified: subversion/branches/javahl-ra/subversion/include/svn_ra.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/svn_ra.h?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/svn_ra.h (original)
+++ subversion/branches/javahl-ra/subversion/include/svn_ra.h Thu Jun 21 05:54:42 2012
@@ -2027,7 +2027,7 @@ svn_ra_print_ra_libraries(svn_stringbuf_
*/
typedef struct svn_ra_plugin_t
{
- /** The proper name of the RA library, (like "ra_neon" or "ra_local") */
+ /** The proper name of the RA library, (like "ra_serf" or "ra_local") */
const char *name;
/** Short doc string printed out by `svn --version` */
@@ -2298,7 +2298,7 @@ typedef svn_error_t *(*svn_ra_init_func_
/* Public RA implementations. */
-/** Initialize libsvn_ra_neon.
+/** Initialize libsvn_ra_serf.
*
* @deprecated Provided for backward compatibility with the 1.1 API. */
SVN_DEPRECATED
Modified: subversion/branches/javahl-ra/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/svn_repos.h?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/svn_repos.h (original)
+++ subversion/branches/javahl-ra/subversion/include/svn_repos.h Thu Jun 21 05:54:42 2012
@@ -2705,21 +2705,17 @@ svn_repos_load_fs(svn_repos_t *repos,
/**
- * A vtable that is driven by svn_repos_parse_dumpstream2().
+ * A vtable that is driven by svn_repos_parse_dumpstream3().
*
- * @since New in 1.1.
+ * @since New in 1.8.
*/
-typedef struct svn_repos_parse_fns2_t
+typedef struct svn_repos_parse_fns3_t
{
- /** The parser has discovered a new revision record within the
- * parsing session represented by @a parse_baton. All the headers are
- * placed in @a headers (allocated in @a pool), which maps <tt>const
- * char *</tt> header-name ==> <tt>const char *</tt> header-value.
- * The @a revision_baton received back (also allocated in @a pool)
- * represents the revision.
+ /** The parser has discovered a new "magic header" record within the
+ * parsing session represented by @a parse_baton. The dump-format
+ * version number is @a version.
*/
- svn_error_t *(*new_revision_record)(void **revision_baton,
- apr_hash_t *headers,
+ svn_error_t *(*magic_header_record)(int version,
void *parse_baton,
apr_pool_t *pool);
@@ -2731,6 +2727,18 @@ typedef struct svn_repos_parse_fns2_t
void *parse_baton,
apr_pool_t *pool);
+ /** The parser has discovered a new revision record within the
+ * parsing session represented by @a parse_baton. All the headers are
+ * placed in @a headers (allocated in @a pool), which maps <tt>const
+ * char *</tt> header-name ==> <tt>const char *</tt> header-value.
+ * The @a revision_baton received back (also allocated in @a pool)
+ * represents the revision.
+ */
+ svn_error_t *(*new_revision_record)(void **revision_baton,
+ apr_hash_t *headers,
+ void *parse_baton,
+ apr_pool_t *pool);
+
/** The parser has discovered a new node record within the current
* revision represented by @a revision_baton. All the headers are
* placed in @a headers (as with @c new_revision_record), allocated in
@@ -2793,22 +2801,28 @@ typedef struct svn_repos_parse_fns2_t
*/
svn_error_t *(*close_revision)(void *revision_baton);
-} svn_repos_parse_fns2_t;
-
-/** @deprecated Provided for backward compatibility with the 1.2 API. */
-typedef svn_repos_parse_fns2_t svn_repos_parser_fns2_t;
+} svn_repos_parse_fns3_t;
/**
* Read and parse dumpfile-formatted @a stream, calling callbacks in
* @a parse_fns/@a parse_baton, and using @a pool for allocations.
*
+ * If @a deltas_are_text is @c TRUE, handle text-deltas with the @a
+ * set_fulltext callback. This is useful when manipulating a dump
+ * stream without loading it. Otherwise handle text-deltas with the
+ * @a apply_textdelta callback.
+ *
* If @a cancel_func is not @c NULL, it is called periodically with
* @a cancel_baton as argument to see if the client wishes to cancel
* the dump.
*
* This parser has built-in knowledge of the dumpfile format, but only
- * in a general sense:
+ * in a limited sense:
+ *
+ * * it recognizes the "magic" format-version header.
+ *
+ * * it recognizes the UUID header.
*
* * it recognizes revision and node records by looking for either
* a REVISION_NUMBER or NODE_PATH headers.
@@ -2820,14 +2834,16 @@ typedef svn_repos_parse_fns2_t svn_repos
* and text, and pass the pieces to the vtable.
*
* This is enough knowledge to make it easy on vtable implementors,
- * but still allow expansion of the format: most headers are ignored.
+ * but still allow expansion of the format: most headers do not have
+ * to be handled explicitly.
*
- * @since New in 1.1.
+ * @since New in 1.8.
*/
svn_error_t *
-svn_repos_parse_dumpstream2(svn_stream_t *stream,
- const svn_repos_parse_fns2_t *parse_fns,
+svn_repos_parse_dumpstream3(svn_stream_t *stream,
+ const svn_repos_parse_fns3_t *parse_fns,
void *parse_baton,
+ svn_boolean_t deltas_are_text,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
@@ -2868,7 +2884,7 @@ svn_repos_parse_dumpstream2(svn_stream_t
* @since New in 1.8.
*/
svn_error_t *
-svn_repos_get_fs_build_parser4(const svn_repos_parse_fns2_t **parser,
+svn_repos_get_fs_build_parser4(const svn_repos_parse_fns3_t **parser,
void **parse_baton,
svn_repos_t *repos,
svn_revnum_t start_rev,
@@ -2881,44 +2897,59 @@ svn_repos_get_fs_build_parser4(const svn
void *notify_baton,
apr_pool_t *pool);
+
/**
- * Similar to svn_repos_get_fs_build_parser4(), but with @a start_rev
- * and @a end_rev always passed as #SVN_INVALID_REVNUM.
+ * A vtable that is driven by svn_repos_parse_dumpstream2().
+ * Similar to #svn_repos_parse_fns3_t except that it lacks
+ * the delete_node_property and apply_textdelta callbacks.
*
* @deprecated Provided for backward compatibility with the 1.7 API.
- * @since New in 1.7.
*/
-SVN_DEPRECATED
-svn_error_t *
-svn_repos_get_fs_build_parser3(const svn_repos_parse_fns2_t **parser,
- void **parse_baton,
- svn_repos_t *repos,
- svn_boolean_t use_history,
- svn_boolean_t validate_props,
- enum svn_repos_load_uuid uuid_action,
- const char *parent_dir,
- svn_repos_notify_func_t notify_func,
- void *notify_baton,
- apr_pool_t *pool);
+typedef struct svn_repos_parse_fns2_t
+{
+ /** Same as #svn_repos_parse_fns3_t.new_revision_record. */
+ svn_error_t *(*new_revision_record)(void **revision_baton,
+ apr_hash_t *headers,
+ void *parse_baton,
+ apr_pool_t *pool);
+ /** Same as #svn_repos_parse_fns3_t.uuid_record. */
+ svn_error_t *(*uuid_record)(const char *uuid,
+ void *parse_baton,
+ apr_pool_t *pool);
+ /** Same as #svn_repos_parse_fns3_t.new_node_record. */
+ svn_error_t *(*new_node_record)(void **node_baton,
+ apr_hash_t *headers,
+ void *revision_baton,
+ apr_pool_t *pool);
+ /** Same as #svn_repos_parse_fns3_t.set_revision_property. */
+ svn_error_t *(*set_revision_property)(void *revision_baton,
+ const char *name,
+ const svn_string_t *value);
+ /** Same as #svn_repos_parse_fns3_t.set_node_property. */
+ svn_error_t *(*set_node_property)(void *node_baton,
+ const char *name,
+ const svn_string_t *value);
+ /** Same as #svn_repos_parse_fns3_t.delete_node_property. */
+ svn_error_t *(*delete_node_property)(void *node_baton,
+ const char *name);
+ /** Same as #svn_repos_parse_fns3_t.remove_node_props. */
+ svn_error_t *(*remove_node_props)(void *node_baton);
+ /** Same as #svn_repos_parse_fns3_t.set_fulltext. */
+ svn_error_t *(*set_fulltext)(svn_stream_t **stream,
+ void *node_baton);
+ /** Same as #svn_repos_parse_fns3_t.apply_textdelta. */
+ svn_error_t *(*apply_textdelta)(svn_txdelta_window_handler_t *handler,
+ void **handler_baton,
+ void *node_baton);
+ /** Same as #svn_repos_parse_fns3_t.close_node. */
+ svn_error_t *(*close_node)(void *node_baton);
+ /** Same as #svn_repos_parse_fns3_t.close_revision. */
+ svn_error_t *(*close_revision)(void *revision_baton);
+} svn_repos_parse_fns2_t;
+
+/** @deprecated Provided for backward compatibility with the 1.7 API. */
+typedef svn_repos_parse_fns2_t svn_repos_parser_fns2_t;
-/**
- * Similar to svn_repos_get_fs_build_parser3(), but with @a outstream
- * in place if a #svn_repos_notify_func_t and baton and with
- * @a validate_props always FALSE.
- *
- * @since New in 1.1.
- * @deprecated Provided for backward compatibility with the 1.6 API.
- */
-SVN_DEPRECATED
-svn_error_t *
-svn_repos_get_fs_build_parser2(const svn_repos_parse_fns2_t **parser,
- void **parse_baton,
- svn_repos_t *repos,
- svn_boolean_t use_history,
- enum svn_repos_load_uuid uuid_action,
- svn_stream_t *outstream,
- const char *parent_dir,
- apr_pool_t *pool);
/**
* A vtable that is driven by svn_repos_parse_dumpstream().
@@ -2964,6 +2995,21 @@ typedef struct svn_repos_parse_fns_t
/**
+ * Similar to svn_repos_parse_dumpstream3(), but uses the more limited
+ * #svn_repos_parser_fns2_t vtable type.
+ *
+ * @deprecated Provided for backward compatibility with the 1.7 API.
+ */
+SVN_DEPRECATED
+svn_error_t *
+svn_repos_parse_dumpstream2(svn_stream_t *stream,
+ const svn_repos_parser_fns2_t *parse_fns,
+ void *parse_baton,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool);
+
+/**
* Similar to svn_repos_parse_dumpstream2(), but uses the more limited
* #svn_repos_parser_fns_t vtable type.
*
@@ -2978,6 +3024,45 @@ svn_repos_parse_dumpstream(svn_stream_t
void *cancel_baton,
apr_pool_t *pool);
+/**
+ * Similar to svn_repos_get_fs_build_parser4(), but with @a start_rev
+ * and @a end_rev always passed as #SVN_INVALID_REVNUM, and yielding
+ * the more limited svn_repos_parse_fns2_t.
+ *
+ * @since New in 1.7.
+ * @deprecated Provided for backward compatibility with the 1.7 API.
+ */
+SVN_DEPRECATED
+svn_error_t *
+svn_repos_get_fs_build_parser3(const svn_repos_parse_fns2_t **parser,
+ void **parse_baton,
+ svn_repos_t *repos,
+ svn_boolean_t use_history,
+ svn_boolean_t validate_props,
+ enum svn_repos_load_uuid uuid_action,
+ const char *parent_dir,
+ svn_repos_notify_func_t notify_func,
+ void *notify_baton,
+ apr_pool_t *pool);
+
+/**
+ * Similar to svn_repos_get_fs_build_parser3(), but with @a outstream
+ * in place if a #svn_repos_notify_func_t and baton and with
+ * @a validate_props always FALSE.
+ *
+ * @since New in 1.1.
+ * @deprecated Provided for backward compatibility with the 1.6 API.
+ */
+SVN_DEPRECATED
+svn_error_t *
+svn_repos_get_fs_build_parser2(const svn_repos_parse_fns2_t **parser,
+ void **parse_baton,
+ svn_repos_t *repos,
+ svn_boolean_t use_history,
+ enum svn_repos_load_uuid uuid_action,
+ svn_stream_t *outstream,
+ const char *parent_dir,
+ apr_pool_t *pool);
/**
* Similar to svn_repos_get_fs_build_parser2(), but yields the more
Modified: subversion/branches/javahl-ra/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/svn_wc.h?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/svn_wc.h (original)
+++ subversion/branches/javahl-ra/subversion/include/svn_wc.h Thu Jun 21 05:54:42 2012
@@ -1227,7 +1227,14 @@ typedef enum svn_wc_notify_action_t
/** Operation failed because a node is obstructed.
* @since New in 1.8. */
- svn_wc_notify_failed_obstruction
+ svn_wc_notify_failed_obstruction,
+
+ /** Conflict resolver is starting or done.
+ * This can be used by clients to detect when to display conflict summary
+ * information, for example.
+ * @since New in 1.8. */
+ svn_wc_notify_conflict_resolver_starting,
+ svn_wc_notify_conflict_resolver_done
} svn_wc_notify_action_t;
@@ -1697,9 +1704,9 @@ svn_wc_conflict_version_dup(const svn_wc
* @note Fields may be added to the end of this structure in future
* versions. Therefore, to preserve binary compatibility, users
* should not directly allocate structures of this type but should use
- * svn_wc_create_conflict_description_text2() or
- * svn_wc_create_conflict_description_prop2() or
- * svn_wc_create_conflict_description_tree2() instead.
+ * svn_wc_conflict_description_create_text2() or
+ * svn_wc_conflict_description_create_prop2() or
+ * svn_wc_conflict_description_create_tree2() instead.
*
* @since New in 1.7.
*/
Modified: subversion/branches/javahl-ra/subversion/libsvn_client/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_client/deprecated.c?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_client/deprecated.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_client/deprecated.c Thu Jun 21 05:54:42 2012
@@ -1643,7 +1643,10 @@ svn_client_propset3(svn_commit_info_t **
{
if (svn_path_is_url(target))
{
- struct capture_baton_t cb = { commit_info_p, pool };
+ struct capture_baton_t cb;
+
+ cb.info = commit_info_p;
+ cb.pool = pool;
SVN_ERR(svn_client_propset_remote(propname, propval, target, skip_checks,
base_revision_for_url, revprop_table,
@@ -1956,8 +1959,11 @@ svn_client_status4(svn_revnum_t *result_
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
- struct status4_wrapper_baton swb = { ctx->wc_ctx, status_func,
- status_baton };
+ struct status4_wrapper_baton swb;
+
+ swb.wc_ctx = ctx->wc_ctx;
+ swb.old_func = status_func;
+ swb.old_baton = status_baton;
return svn_client_status5(result_rev, ctx, path, revision, depth, get_all,
update, no_ignore, ignore_externals, TRUE,
Modified: subversion/branches/javahl-ra/subversion/libsvn_client/info.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_client/info.c?rev=1352418&r1=1352417&r2=1352418&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_client/info.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_client/info.c Thu Jun 21 05:54:42 2012
@@ -348,7 +348,10 @@ svn_client_info3(const char *abspath_or_
|| peg_revision->kind == svn_opt_revision_unspecified))
{
/* Do all digging in the working copy. */
- wc_info_receiver_baton_t b = { receiver, receiver_baton };
+ wc_info_receiver_baton_t b;
+
+ b.client_receiver_func = receiver;
+ b.client_receiver_baton = receiver_baton;
return svn_error_trace(
svn_wc__get_info(ctx->wc_ctx, abspath_or_url, depth,
fetch_excluded, fetch_actual_only, changelists,