You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2018/11/28 21:25:35 UTC
svn commit: r1847678 [1/25] - in /subversion/branches/swig-py3: ./ build/
build/ac-macros/ build/generator/ build/generator/templates/ build/win32/
contrib/client-side/ contrib/client-side/svn_load_dirs/
contrib/client-side/svnmerge/ contrib/hook-scrip...
Author: cmpilato
Date: Wed Nov 28 21:25:32 2018
New Revision: 1847678
URL: http://svn.apache.org/viewvc?rev=1847678&view=rev
Log:
On branch swig-py3: Catchup to trunk @r1847674.
Added:
subversion/branches/swig-py3/notes/logo/subversion_logo.svg
- copied unchanged from r1847674, subversion/trunk/notes/logo/subversion_logo.svg
subversion/branches/swig-py3/notes/shelving/
- copied from r1847674, subversion/trunk/notes/shelving/
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/fs.py
- copied unchanged from r1847674, subversion/trunk/subversion/bindings/swig/python/tests/fs.py
subversion/branches/swig-py3/subversion/libsvn_client/layout.c
- copied unchanged from r1847674, subversion/trunk/subversion/libsvn_client/layout.c
subversion/branches/swig-py3/subversion/libsvn_client/wc_editor.c
- copied unchanged from r1847674, subversion/trunk/subversion/libsvn_client/wc_editor.c
subversion/branches/swig-py3/subversion/libsvn_repos/dump_editor.c
- copied unchanged from r1847674, subversion/trunk/subversion/libsvn_repos/dump_editor.c
subversion/branches/swig-py3/subversion/svn/filesize.c
- copied unchanged from r1847674, subversion/trunk/subversion/svn/filesize.c
subversion/branches/swig-py3/subversion/tests/afl/afl-svndiff-testcase/
- copied from r1847674, subversion/trunk/subversion/tests/afl/afl-svndiff-testcase/
subversion/branches/swig-py3/subversion/tests/afl/afl-svndiff.c
- copied unchanged from r1847674, subversion/trunk/subversion/tests/afl/afl-svndiff.c
subversion/branches/swig-py3/subversion/tests/afl/afl-x509-testcase/test2
- copied unchanged from r1847674, subversion/trunk/subversion/tests/afl/afl-x509-testcase/test2
subversion/branches/swig-py3/subversion/tests/afl/afl-x509-testcase/test3
- copied unchanged from r1847674, subversion/trunk/subversion/tests/afl/afl-x509-testcase/test3
subversion/branches/swig-py3/subversion/tests/cmdline/dav_tests.py
- copied unchanged from r1847674, subversion/trunk/subversion/tests/cmdline/dav_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/pegrev_parse_tests.py
- copied unchanged from r1847674, subversion/trunk/subversion/tests/cmdline/pegrev_parse_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnrdump_tests_data/bad-date-r0.dump
- copied unchanged from r1847674, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/bad-date-r0.dump
subversion/branches/swig-py3/subversion/tests/cmdline/svnrdump_tests_data/bad-date-r1.dump
- copied unchanged from r1847674, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/bad-date-r1.dump
subversion/branches/swig-py3/subversion/tests/libsvn_delta/svndiff-stream-test.c
- copied unchanged from r1847674, subversion/trunk/subversion/tests/libsvn_delta/svndiff-stream-test.c
subversion/branches/swig-py3/tools/buildbot/slaves/svn-arm64-gentoo/
- copied from r1847674, subversion/trunk/tools/buildbot/slaves/svn-arm64-gentoo/
subversion/branches/swig-py3/tools/buildbot/slaves/svnbot-common/
- copied from r1847674, subversion/trunk/tools/buildbot/slaves/svnbot-common/
subversion/branches/swig-py3/tools/client-side/svnviewspec_test.py
- copied unchanged from r1847674, subversion/trunk/tools/client-side/svnviewspec_test.py
subversion/branches/swig-py3/tools/dist/backport_tests_data/backport_logsummary_colon.dump
- copied unchanged from r1847674, subversion/trunk/tools/dist/backport_tests_data/backport_logsummary_colon.dump
subversion/branches/swig-py3/tools/dist/changes-to-html.py
- copied unchanged from r1847674, subversion/trunk/tools/dist/changes-to-html.py
Removed:
subversion/branches/swig-py3/build/win32/vc6-build.bat.in
subversion/branches/swig-py3/subversion/libsvn_client/shelve.c
subversion/branches/swig-py3/subversion/svn/shelve-cmd.c
subversion/branches/swig-py3/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/
subversion/branches/swig-py3/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/
subversion/branches/swig-py3/tools/buildbot/slaves/xp-vc60-ia32/
Modified:
subversion/branches/swig-py3/ (props changed)
subversion/branches/swig-py3/CHANGES
subversion/branches/swig-py3/COMMITTERS
subversion/branches/swig-py3/INSTALL
subversion/branches/swig-py3/Makefile.in
subversion/branches/swig-py3/build.conf
subversion/branches/swig-py3/build/PrintPath
subversion/branches/swig-py3/build/ac-macros/find_apr.m4
subversion/branches/swig-py3/build/ac-macros/find_apu.m4
subversion/branches/swig-py3/build/ac-macros/java.m4
subversion/branches/swig-py3/build/ac-macros/libsecret.m4
subversion/branches/swig-py3/build/ac-macros/lz4.m4
subversion/branches/swig-py3/build/ac-macros/macosx.m4
subversion/branches/swig-py3/build/ac-macros/serf.m4
subversion/branches/swig-py3/build/ac-macros/swig.m4
subversion/branches/swig-py3/build/ac-macros/utf8proc.m4
subversion/branches/swig-py3/build/buildcheck.sh
subversion/branches/swig-py3/build/generator/extractor.py
subversion/branches/swig-py3/build/generator/gen_base.py
subversion/branches/swig-py3/build/generator/gen_make.py
subversion/branches/swig-py3/build/generator/gen_win.py
subversion/branches/swig-py3/build/generator/gen_win_dependencies.py
subversion/branches/swig-py3/build/generator/templates/build-outputs.mk.ezt
subversion/branches/swig-py3/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/swig-py3/build/run_tests.py
subversion/branches/swig-py3/build/transform_sql.py
subversion/branches/swig-py3/configure.ac
subversion/branches/swig-py3/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
subversion/branches/swig-py3/contrib/client-side/svn_update.pl
subversion/branches/swig-py3/contrib/client-side/svnmerge/svnmerge-migrate-history.py
subversion/branches/swig-py3/contrib/client-side/svnmerge/svnmerge.py
subversion/branches/swig-py3/contrib/hook-scripts/remove-zombie-locks.py
subversion/branches/swig-py3/doc/user/svn-best-practices.html
subversion/branches/swig-py3/gen-make.py
subversion/branches/swig-py3/notes/EuroOSCON-2005-vc-bof.txt
subversion/branches/swig-py3/notes/client-configuration
subversion/branches/swig-py3/notes/diff-optimizations.txt
subversion/branches/swig-py3/notes/dump-load-format.txt
subversion/branches/swig-py3/notes/http-and-webdav/webdav-protocol
subversion/branches/swig-py3/notes/merge-tracking/func-spec.html
subversion/branches/swig-py3/notes/merge-tracking/requirements.html
subversion/branches/swig-py3/notes/merge-tracking/summit.html
subversion/branches/swig-py3/notes/obliterate/obliterate-functional-spec.txt
subversion/branches/swig-py3/notes/tree-conflicts/design-overview.txt
subversion/branches/swig-py3/notes/tree-conflicts/detection.txt
subversion/branches/swig-py3/notes/tree-conflicts/use-cases.txt
subversion/branches/swig-py3/subversion/bindings/javahl/README
subversion/branches/swig-py3/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/SVNRepos.h
subversion/branches/swig-py3/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
subversion/branches/swig-py3/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/swig-py3/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
subversion/branches/swig-py3/subversion/bindings/swig/include/svn_types.swg
subversion/branches/swig-py3/subversion/bindings/swig/perl/native/Core.pm
subversion/branches/swig-py3/subversion/bindings/swig/python/svn/fs.py
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/run_all.py
subversion/branches/swig-py3/subversion/bindings/swig/ruby/svn/util.rb
subversion/branches/swig-py3/subversion/bindings/swig/ruby/test/test_client.rb
subversion/branches/swig-py3/subversion/bindings/swig/ruby/test/test_util.rb
subversion/branches/swig-py3/subversion/include/private/svn_client_private.h
subversion/branches/swig-py3/subversion/include/private/svn_diff_tree.h
subversion/branches/swig-py3/subversion/include/private/svn_repos_private.h
subversion/branches/swig-py3/subversion/include/private/svn_sorts_private.h
subversion/branches/swig-py3/subversion/include/private/svn_subr_private.h
subversion/branches/swig-py3/subversion/include/private/svn_wc_private.h
subversion/branches/swig-py3/subversion/include/svn_client.h
subversion/branches/swig-py3/subversion/include/svn_fs.h
subversion/branches/swig-py3/subversion/include/svn_opt.h
subversion/branches/swig-py3/subversion/include/svn_props.h
subversion/branches/swig-py3/subversion/include/svn_ra.h
subversion/branches/swig-py3/subversion/include/svn_ra_svn.h
subversion/branches/swig-py3/subversion/include/svn_repos.h
subversion/branches/swig-py3/subversion/include/svn_time.h
subversion/branches/swig-py3/subversion/include/svn_utf.h
subversion/branches/swig-py3/subversion/include/svn_version.h
subversion/branches/swig-py3/subversion/include/svn_wc.h
subversion/branches/swig-py3/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
subversion/branches/swig-py3/subversion/libsvn_client/client.h
subversion/branches/swig-py3/subversion/libsvn_client/commit.c
subversion/branches/swig-py3/subversion/libsvn_client/conflicts.c
subversion/branches/swig-py3/subversion/libsvn_client/copy.c
subversion/branches/swig-py3/subversion/libsvn_client/copy_foreign.c
subversion/branches/swig-py3/subversion/libsvn_client/deprecated.c
subversion/branches/swig-py3/subversion/libsvn_client/diff.c (contents, props changed)
subversion/branches/swig-py3/subversion/libsvn_client/diff_local.c
subversion/branches/swig-py3/subversion/libsvn_client/diff_summarize.c
subversion/branches/swig-py3/subversion/libsvn_client/export.c
subversion/branches/swig-py3/subversion/libsvn_client/info.c
subversion/branches/swig-py3/subversion/libsvn_client/list.c
subversion/branches/swig-py3/subversion/libsvn_client/merge.c
subversion/branches/swig-py3/subversion/libsvn_client/patch.c
subversion/branches/swig-py3/subversion/libsvn_client/repos_diff.c
subversion/branches/swig-py3/subversion/libsvn_client/revisions.c
subversion/branches/swig-py3/subversion/libsvn_client/shelf.c
subversion/branches/swig-py3/subversion/libsvn_client/status.c
subversion/branches/swig-py3/subversion/libsvn_client/update.c
subversion/branches/swig-py3/subversion/libsvn_delta/debug_editor.c
subversion/branches/swig-py3/subversion/libsvn_delta/svndiff.c
subversion/branches/swig-py3/subversion/libsvn_diff/diff_tree.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/cached_data.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/cached_data.h
subversion/branches/swig-py3/subversion/libsvn_fs_fs/dag.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/id.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/index.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/load-index.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/recovery.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/temp_serializer.h
subversion/branches/swig-py3/subversion/libsvn_fs_fs/tree.c
subversion/branches/swig-py3/subversion/libsvn_fs_x/ (props changed)
subversion/branches/swig-py3/subversion/libsvn_fs_x/dag_cache.c
subversion/branches/swig-py3/subversion/libsvn_fs_x/dag_cache.h
subversion/branches/swig-py3/subversion/libsvn_fs_x/tree.c
subversion/branches/swig-py3/subversion/libsvn_ra_serf/commit.c
subversion/branches/swig-py3/subversion/libsvn_ra_serf/options.c
subversion/branches/swig-py3/subversion/libsvn_ra_serf/replay.c
subversion/branches/swig-py3/subversion/libsvn_ra_serf/update.c
subversion/branches/swig-py3/subversion/libsvn_ra_serf/util.c
subversion/branches/swig-py3/subversion/libsvn_repos/authz_parse.c
subversion/branches/swig-py3/subversion/libsvn_repos/dump.c
subversion/branches/swig-py3/subversion/libsvn_repos/list.c
subversion/branches/swig-py3/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/swig-py3/subversion/libsvn_repos/log.c
subversion/branches/swig-py3/subversion/libsvn_repos/repos.c
subversion/branches/swig-py3/subversion/libsvn_subr/compress_lz4.c
subversion/branches/swig-py3/subversion/libsvn_subr/config_file.c
subversion/branches/swig-py3/subversion/libsvn_subr/config_win.c
subversion/branches/swig-py3/subversion/libsvn_subr/deprecated.c
subversion/branches/swig-py3/subversion/libsvn_subr/io.c
subversion/branches/swig-py3/subversion/libsvn_subr/lz4/lz4.c
subversion/branches/swig-py3/subversion/libsvn_subr/lz4/lz4internal.h
subversion/branches/swig-py3/subversion/libsvn_subr/mergeinfo.c
subversion/branches/swig-py3/subversion/libsvn_subr/opt.c
subversion/branches/swig-py3/subversion/libsvn_subr/sqlite3wrapper.c
subversion/branches/swig-py3/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
subversion/branches/swig-py3/subversion/libsvn_subr/sysinfo.c
subversion/branches/swig-py3/subversion/libsvn_subr/utf.c
subversion/branches/swig-py3/subversion/libsvn_subr/x509info.c
subversion/branches/swig-py3/subversion/libsvn_subr/x509parse.c
subversion/branches/swig-py3/subversion/libsvn_wc/README
subversion/branches/swig-py3/subversion/libsvn_wc/conflicts.c
subversion/branches/swig-py3/subversion/libsvn_wc/conflicts.h
subversion/branches/swig-py3/subversion/libsvn_wc/deprecated.c
subversion/branches/swig-py3/subversion/libsvn_wc/diff_local.c
subversion/branches/swig-py3/subversion/libsvn_wc/node.c
subversion/branches/swig-py3/subversion/libsvn_wc/props.c
subversion/branches/swig-py3/subversion/libsvn_wc/questions.c
subversion/branches/swig-py3/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/swig-py3/subversion/libsvn_wc/update_editor.c
subversion/branches/swig-py3/subversion/libsvn_wc/upgrade.c
subversion/branches/swig-py3/subversion/libsvn_wc/wc-queries.sql
subversion/branches/swig-py3/subversion/libsvn_wc/wc.h
subversion/branches/swig-py3/subversion/libsvn_wc/wc_db.c
subversion/branches/swig-py3/subversion/libsvn_wc/wc_db.h
subversion/branches/swig-py3/subversion/libsvn_wc/wc_db_update_move.c
subversion/branches/swig-py3/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/swig-py3/subversion/libsvn_wc/wcroot_anchor.c
subversion/branches/swig-py3/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/swig-py3/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/swig-py3/subversion/mod_dav_svn/reports/file-revs.c
subversion/branches/swig-py3/subversion/mod_dav_svn/reports/replay.c
subversion/branches/swig-py3/subversion/mod_dav_svn/repos.c
subversion/branches/swig-py3/subversion/po/de.po
subversion/branches/swig-py3/subversion/po/sv.po
subversion/branches/swig-py3/subversion/svn/auth-cmd.c
subversion/branches/swig-py3/subversion/svn/cl.h
subversion/branches/swig-py3/subversion/svn/conflict-callbacks.c
subversion/branches/swig-py3/subversion/svn/diff-cmd.c
subversion/branches/swig-py3/subversion/svn/help-cmd.c
subversion/branches/swig-py3/subversion/svn/info-cmd.c
subversion/branches/swig-py3/subversion/svn/list-cmd.c
subversion/branches/swig-py3/subversion/svn/log-cmd.c
subversion/branches/swig-py3/subversion/svn/merge-cmd.c
subversion/branches/swig-py3/subversion/svn/propset-cmd.c
subversion/branches/swig-py3/subversion/svn/shelf-cmd.c
subversion/branches/swig-py3/subversion/svn/svn.c
subversion/branches/swig-py3/subversion/svnadmin/svnadmin.c
subversion/branches/swig-py3/subversion/svnbench/cl.h
subversion/branches/swig-py3/subversion/svnbench/help-cmd.c
subversion/branches/swig-py3/subversion/svnbench/svnbench.c
subversion/branches/swig-py3/subversion/svndumpfilter/svndumpfilter.c
subversion/branches/swig-py3/subversion/svnfsfs/svnfsfs.c
subversion/branches/swig-py3/subversion/svnlook/svnlook.c
subversion/branches/swig-py3/subversion/svnmucc/svnmucc.c
subversion/branches/swig-py3/subversion/svnrdump/dump_editor.c
subversion/branches/swig-py3/subversion/svnrdump/load_editor.c
subversion/branches/swig-py3/subversion/svnrdump/svnrdump.c
subversion/branches/swig-py3/subversion/svnrdump/svnrdump.h
subversion/branches/swig-py3/subversion/svnserve/serve.c
subversion/branches/swig-py3/subversion/svnserve/svnserve.c
subversion/branches/swig-py3/subversion/svnsync/svnsync.c
subversion/branches/swig-py3/subversion/svnversion/svnversion.c
subversion/branches/swig-py3/subversion/tests/afl/ (props changed)
subversion/branches/swig-py3/subversion/tests/cmdline/authz_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/basic_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/blame_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/commit_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/copy_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/dav-mirror-autocheck.sh
subversion/branches/swig-py3/subversion/tests/cmdline/davautocheck.sh
subversion/branches/swig-py3/subversion/tests/cmdline/depth_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/diff_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/entries_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/export_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/externals_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
subversion/branches/swig-py3/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/swig-py3/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
subversion/branches/swig-py3/subversion/tests/cmdline/info_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/iprop_authz_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/lock_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/log_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/merge_automatic_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/merge_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/mod_dav_svn_tests.py (props changed)
subversion/branches/swig-py3/subversion/tests/cmdline/move_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/patch_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/prop_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/revert_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/shelf_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/special_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/stat_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnauthz_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnfsfs_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnmover_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnrdump_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnserveautocheck.sh
subversion/branches/swig-py3/subversion/tests/cmdline/svnsync_authz_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svntest/actions.py
subversion/branches/swig-py3/subversion/tests/cmdline/svntest/main.py
subversion/branches/swig-py3/subversion/tests/cmdline/svntest/mergetrees.py (contents, props changed)
subversion/branches/swig-py3/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/swig-py3/subversion/tests/cmdline/svntest/testcase.py
subversion/branches/swig-py3/subversion/tests/cmdline/svntest/tree.py
subversion/branches/swig-py3/subversion/tests/cmdline/svntest/verify.py
subversion/branches/swig-py3/subversion/tests/cmdline/svntest/wc.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnversion_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/switch_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/trans_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/update_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/swig-py3/subversion/tests/libsvn_client/client-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_client/conflicts-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_delta/ (props changed)
subversion/branches/swig-py3/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_repos/authz-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_subr/utf-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_subr/x509-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_wc/utils.c
subversion/branches/swig-py3/subversion/tests/libsvn_wc/wc-queries-test.c
subversion/branches/swig-py3/subversion/tests/svn_test_main.c
subversion/branches/swig-py3/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
subversion/branches/swig-py3/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
subversion/branches/swig-py3/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh
subversion/branches/swig-py3/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
subversion/branches/swig-py3/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh
subversion/branches/swig-py3/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh
subversion/branches/swig-py3/tools/client-side/bash_completion
subversion/branches/swig-py3/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
subversion/branches/swig-py3/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
subversion/branches/swig-py3/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
subversion/branches/swig-py3/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c
subversion/branches/swig-py3/tools/client-side/svn-viewspec.py
subversion/branches/swig-py3/tools/client-side/svnconflict/svnconflict.c
subversion/branches/swig-py3/tools/dev/svnmover/svnmover.c
subversion/branches/swig-py3/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
subversion/branches/swig-py3/tools/dev/unix-build/Makefile.svn
subversion/branches/swig-py3/tools/dev/wc-ng/svn-wc-db-tester.c
subversion/branches/swig-py3/tools/dist/README.backport
subversion/branches/swig-py3/tools/dist/backport.pl
subversion/branches/swig-py3/tools/dist/backport/status.py
subversion/branches/swig-py3/tools/dist/backport_tests.py
subversion/branches/swig-py3/tools/dist/create-minor-release-branch.py
subversion/branches/swig-py3/tools/dist/release.py
subversion/branches/swig-py3/tools/dist/security/parser.py
subversion/branches/swig-py3/tools/dist/templates/download.ezt
subversion/branches/swig-py3/tools/dist/templates/rc-news.ezt
subversion/branches/swig-py3/tools/dist/templates/rc-release-ann.ezt
subversion/branches/swig-py3/tools/dist/templates/stable-news.ezt
subversion/branches/swig-py3/tools/dist/templates/stable-release-ann.ezt
subversion/branches/swig-py3/tools/hook-scripts/mailer/mailer.py
subversion/branches/swig-py3/tools/server-side/svnauthz.c
subversion/branches/swig-py3/tools/server-side/svnpubsub/svnwcsub.py
Propchange: subversion/branches/swig-py3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 28 21:25:32 2018
@@ -1,4 +1,5 @@
/subversion/branches/1.10-cache-improvements:1669168-1694487
+/subversion/branches/1.11.x:1841316,1841548
/subversion/branches/1.5.x-r30215:870312
/subversion/branches/1.7.x-fs-verify:1146708,1161180
/subversion/branches/1.9-cache-improvements:1678948-1679863
@@ -54,6 +55,7 @@
/subversion/branches/issue-3975:1152931-1160746
/subversion/branches/issue-4116-dev:1424719-1425040
/subversion/branches/issue-4194-dev:1410507-1414880
+/subversion/branches/java10-compat:1840620-1841179
/subversion/branches/javahl-ra:991978-1494640
/subversion/branches/kwallet:870785-871314
/subversion/branches/log-addressing:1509279-1546844
@@ -76,7 +78,7 @@
/subversion/branches/revprop-caching-ng:1620597,1620599
/subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
/subversion/branches/shelve:1802592-1815226
-/subversion/branches/shelve-checkpoint:1801593-1801923,1801970,1817320
+/subversion/branches/shelve-checkpoint:1801593-1801923,1801970,1817320,1828508,1828521
/subversion/branches/subtree-mergeinfo:876734-878766
/subversion/branches/svn-auth-x509:1603509-1655900
/subversion/branches/svn-info-detail:1660035-1662618
@@ -99,4 +101,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1813660-1822734
+/subversion/trunk:1813660-1847674
Modified: subversion/branches/swig-py3/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/CHANGES?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/CHANGES (original)
+++ subversion/branches/swig-py3/CHANGES Wed Nov 28 21:25:32 2018
@@ -1,10 +1,154 @@
+# To view a revision listed as (rXXXXXXX), visit:
+# https://svn.apache.org/rXXXXXXX
+#
+# To view an issue listed as (issue #XXXX), visit:
+# https://issues.apache.org/jira/browse/SVN-XXXX
+
+Version 1.12.0
+(?? ??? 20XX, from /branches/1.12.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.12.0
+
+ User-visible changes:
+ - Major new features:
+
+ - Minor new features and improvements:
+ * 'svn --version --verbose' shows loaded libraries on Linux (r1843774)
+ * 'svnrdump' can read/write a file instead of stdin/stdout (r1844906)
+ * 'svn list' tries to not truncate the authior's name (r1847384 et al.)
+ * 'svn list' can show sizes in base-2 unit suffixes (r1847384 et al.)
+ * 'svn info' shows the size of files in the repository (r1847441 et al.)
+
+ - Client-side bugfixes:
+ * Repos-to-WC copy with --parents works with absent target (r1843888)
+ * Repos-to-WC copy from foreign repo with peg/operative revs (#4785)
+
+ - Server-side bugfixes:
+
+ - Client-side and server-side bugfixes:
+
+ - Other tool improvements and bugfixes:
+
+ Developer-visible changes:
+ - General:
+ * Storing passwords in plain text on disk is disabled by default (r1845377)
+ * Updated the required libtool version to 2.x (r1845716)
+
+ - Bindings:
+ * Fixed potential core dump in JavaHL's ISVNClient.diff (r1845408)
+
+
Version 1.11.0
-(?? ??? 20XX, from /branches/1.11.x)
+(30 Oct 2018, from /branches/1.11.x)
http://svn.apache.org/repos/asf/subversion/tags/1.11.0
+ User-visible changes:
+ - Major new features:
+ * Shelving is no longer based on patch files (experimental) (issue #3625)
+ * Checkpointing (experimental) (issue #3626)
+ * Viewspec output command (experimental) (issue #4753)
+
+ - Minor new features and improvements:
+ * Improvements to tree conflict resolution (issue #4694 #4766 ...)
+ * 'patch' can now read non-pretty-printed svn:mergeinfo diffs (r1822151)
+ * Better error when http:// URL is not a Subversion repository (r1825302)
+ * Add 'schedule' and 'depth' items to 'svn info --show-item' (r1827032)
+ * Allow the client cert password to be saved (r1836762)
+
+ - Client-side bugfixes:
+ * Fix a crash in a repo:WC summary diff of a local copy (r1835218)
+ * Fix double diff headers (r1836746)
+ * Tree conflict resolver: avoid endless scan in some cases (r1839662)
+
+ - Server-side bugfixes:
+ * svnadmin dump shouldn't canonicalize svn:date (issue #4767)
+ * 'svnadmin verify --keep-going --quiet' shows an error summary (r1837790)
+ * Let 'svnadmin recover' prune the rep-cache even if disabled (r1838813)
+
+ - Client-side and server-side bugfixes:
+ * Fix pattern-matching of top level path in listing with search (r1830599)
+ * Allow commands like 'svn ci --file X' to work when X is a FIFO (r1836306)
+
+ - Other tool improvements and bugfixes:
+ * tools/client-side/bash_completion: Add '--password-from-stdin' (r1820045)
+
+ Developer-visible changes:
+ - General:
+ * new tool: tools/dist/edit-N-log-messages (r1819207)
+ * tools/dev/unix-build/Makefile.svn: various fixes
+ * Expose the diff option 'pretty_print_mergeinfo' in APIs (r1822014)
+ * In 'revert' APIs, choose whether to delete schedule-add nodes (r1822534)
+
+ - Bindings:
+ * Fix Python binding fs.FileDiff behaviour with python-future (r1823802)
+ * Fix Python unit test, fs.SubversionFSTestCase, on Windows (r1824410)
+ * Bump minimum JDK version required for JavaHL to 1.8 (r1831895)
+ * Enable building against Java 10 (r1841180 et al)
+ * Fix a potential crash in JavaHL (issue #4764)
+
+
+Version 1.10.3
+(10 Oct 2018, from /branches/1.10.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.10.3
+
+ User-visible changes:
+ - Minor new features and improvements:
+ * Store the HTTPS client cert password (r1842578)
+
+ - Client-side bugfixes:
+ * Fix shelving when custom diff command is configured (issue #4758)
+ * Fix conflict resolver crashes (issue #4744, r1842581, r1842582, r1842583)
+ * Fix conflict resolver endless scan in some cases (r1842586)
+ * Fix "Accept incoming deletion" on locally deleted file (issue #4739)
+ * Fix "resolver adds unrelated moves to move target list" (issue #4766)
+
+ - Server-side bugfixes:
+ * Reject bad PUT before CHECKOUT in v1 HTTP protocol (r1841281)
+ * Let 'svnadmin recover' prune the rep-cache even if disabled (r1842585)
+
+ - Client-side and server-side bugfixes:
+ * Allow commands like 'svn ci --file X' to work when X is a FIFO (r1841282)
+
+ - Other tool improvements and bugfixes:
+ * 'svnadmin verify --keep-going --quiet' shows an error summary (r1842584)
+ * Fix error in german translation for 'svn help merge' (r1837038)
+
+ Developer-visible changes:
+ - General:
+ * Python tests use the current python executable (r1842626)
+
+
+Version 1.10.2
+(20 Jul 2018, from /branches/1.10.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.10.2
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * Correctly claim to offer Gnome Keyring support with libsecret (r1831142)
+ * Fix segfault using Gnome Keyring with libsecret (r1835782)
+ * Fix JavaHL local refs capacity warning when unparsing externals (r1831143)
+ * Since on Windows Subversion does not handle symlinks, never check for reparse points (r1835701)
+ * Prune externals after 'update --set-depth=exclude' (r1835702)
+ * Fix issue #4740, "conflict resolver searches too far back ..." (r1835703)
+ - Server-side bugfixes:
+ * Fix regression issue #4741: authz group refers to multiple groups (r1831220)
+
+ Developer-visible changes:
+ - General:
+ * Regression test and FSFS checksum test, part of issue #4722 (r1828043)
+ * Explicit error on configure --without-lz4 or --without-utf8proc (r1831604)
+ * configure.ac: Fix regression relating to path to 'rdoc' (r1833486)
+ * Ensure consistent use of $PYTHON during build and test (r1833487)
+ * Fix libsvn_auth_gnome_keyring.pc when built using libsecret (r1835781)
+ - Bindings:
+ * Fix regression in use of pre-generated Swig bindings in release builds (r1833488)
+
+
+Version 1.10.1
+(Not released; see changes for 1.10.2.)
+
Version 1.10.0
-(?? ??? 2017, from /branches/1.10.x)
+(13 Apr 2018, from /branches/1.10.x)
http://svn.apache.org/repos/asf/subversion/tags/1.10.0
See the 1.10 release notes for a more verbose overview of the changes since
@@ -100,6 +244,7 @@ the 1.9 release: https://subversion.apa
* Add 'http-compression=auto' client config option as default (r1803899 et al)
* Speed up processing of mergeinfo (r1802470 et al)
* Check for invalid 'xt' fields in x509 certs (r1809290)
+ * New '--password-from-stdin' option for 'svn' (r1819093)
- Client-side bugfixes:
* svnbench: Honour the '--with-no-revprops' option (r1709593)
* ra_serf: Fix segfault when running over HTTP v1 (r1766089)
@@ -290,6 +435,41 @@ the 1.9 release: https://subversion.apa
* Ruby: Detect versions up to 2.4 (r1806570)
+Version 1.9.9
+(20 Jul 2018, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.9
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * Fix SEGV for 'svn export -rN WC' with relative externals (r1803755)
+ * Fix issue #4677: 'svn up' after a directory replaced a file (r1814248)
+ * Fix segfault when no home directory is available (r1819199)
+ * Performance: Make 'svn info' fast on old repository revisions (r1827690)
+ * Fix RA-serf problem with proxy username and password (r1833571)
+
+ - Server-side bugfixes:
+ * svnadmin: Fix false errors on some valid LOCK_PATH arguments (r1803754)
+ * Fix crash when exiting 'svnserve --config-file' (r1824405)
+ * Fix issue #4722: false "filesystem is corrupt" error on commit (r1827688)
+ * Reword confusing "nested" wording in an httpd.conf warning (r1835700)
+
+ - Bindings bugfixes:
+ * swig-py: svn.core.Stream supports raw binary file-like objects (r1820620)
+ * swig-rb: Don't crash if svn_md5_digest_to_cstring returns NULL (r1823805)
+
+ Developer-visible changes:
+ - General:
+ * Fix CVE-2017-9800: Malicious server can execute arbitrary command on client (r1804698)
+ * Fix test failure if compile- and run-time HTTPD versions differ (r1820523)
+
+ - API changes:
+ (none)
+
+
+Version 1.9.8
+(Not released; see changes for 1.9.9.)
+
+
Version 1.9.7
(10 Aug 2017, from /branches/1.9.x)
http://svn.apache.org/repos/asf/subversion/tags/1.9.7
@@ -5724,7 +5904,7 @@ http://svn.apache.org/repos/asf/subversi
twice as slow and lose all concurrent-client scalability.
This is a temporary fix for a larger design problem. See issue
- http://subversion.tigris.org/issues/show_bug.cgi?id=1499
+ https://issues.apache.org/jira/browse/SVN-1499
Version 0.28.1
Modified: subversion/branches/swig-py3/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/COMMITTERS?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/COMMITTERS [UTF-8] (original)
+++ subversion/branches/swig-py3/COMMITTERS [UTF-8] Wed Nov 28 21:25:32 2018
@@ -27,7 +27,7 @@ Blanket commit access:
dlr Daniel Rall <dl...@finemaltcoding.com>
mbk Mark Benedetto King <mb...@lowlatency.com>
jaa Jani Averbach <ja...@iki.fi>
- julianfoad Julian Foad <ju...@foad.me.uk>
+ julianfoad Julian Foad <ju...@apache.org>
jszakmeister John Szakmeister <jo...@szakmeister.net>
ehu Erik Hülsmann <eh...@gmail.com>
breser Ben Reser <be...@reser.org>
@@ -87,6 +87,7 @@ Partial committers who have asked to be
rassilon Bill Tutt <bi...@tutts.org> (Win32, COM, issue-1003-dev br.)
pll Paul lussier <p....@comcast.net> (releases)
rdonch Роман Донченко <dp...@corrigendum.ru> (Swig-Python b.)
+ karolszk Karol Szkudlarek <ka...@mikronika.com.pl> (po: pl)
Commit access for specific areas:
@@ -179,7 +180,6 @@ Commit access for specific areas:
oyvindmo Øyvind Møll <sv...@moll.no> (po: nb)
sunny256 Øyvind A. Holm <su...@sunbase.org> (po: nb)
jzgoda Jaroslaw Zgoda <jz...@o2.pl> (po: pl)
- karolszk Karol Szkudlarek <ka...@mikronika.com.pl> (po: pl)
plasma Wei-Hon Chen <pl...@ms9.hinet.net> (po: zh_TW)
jihuang June-Yen Huang <ji...@iis.sinica.edu.tw> (po: zh_TW) [EMAIL
IS BOUNCING]
Modified: subversion/branches/swig-py3/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/INSTALL?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/INSTALL (original)
+++ subversion/branches/swig-py3/INSTALL Wed Nov 28 21:25:32 2018
@@ -152,10 +152,11 @@ I. INTRODUCTION
The Python 3 Compatibility layer for C extensions is required to build
the python language bindings.
- * KDELibs, GNOME Keyring (OPTIONAL for client)
+ * KDE Framework 5, libsecret, GNOME Keyring (OPTIONAL for client)
Subversion contains optional support for storing passwords in
- KWallet (KDE 4) or GNOME Keyring.
+ KWallet via KDE Framework 5 libraries (preferred) or kdelibs4,
+ and GNOME Keyring via libsecret (preferred) or GNOME APIs.
* libmagic (OPTIONAL)
@@ -459,19 +460,22 @@ I. INTRODUCTION
and GNOME Keyring. pkg-config is needed to find D-Bus headers and library.
- 15. Qt 4 (Unix only, OPTIONAL)
+ 15. Qt 5 or Qt 4 (Unix only, OPTIONAL)
Qt is a cross-platform application framework. QtCore, QtDBus and QtGui
modules are required for support for KWallet. pkg-config is needed
to find Qt headers and libraries.
- 16. KDELibs 4 (Unix only, OPTIONAL)
+ 16. KDE 5 Framework libraries or KDELibs 4 (Unix only, OPTIONAL)
Subversion contains optional support for storing passwords in KWallet.
+ Subversion will look for KF5Wallet, KF5CoreAddons, KF5I18n APIs by default,
+ and needs kf5-config to find them. The KDELibs 4 api is also supported.
KDELibs contains core KDE libraries. Subversion uses libkdecore and libkdeui
libraries when support for KWallet is enabled. kde4-config is used to get
some necessary options. pkg-config, D-Bus and Qt 4 are also required.
+
If you want to build support for KWallet, then pass the '--with-kwallet'
option to `configure`. If KDE is installed in a non-standard prefix, then
use:
@@ -869,11 +873,7 @@ II. INSTALLATION
E.4 Building the Binaries
- To build the binaries either follow the instructions here or use
- build\win32\vc6-build.bat.in after editing its default paths to match
- yours and saving it as vc6-build.bat. The vc6-build.bat does a full build
- using all options so it requires Apache 2 source and the other optional
- components.
+ To build the binaries either follow these instructions.
Start in the SVN directory you created.
Modified: subversion/branches/swig-py3/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/Makefile.in?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/Makefile.in (original)
+++ subversion/branches/swig-py3/Makefile.in Wed Nov 28 21:25:32 2018
@@ -56,6 +56,8 @@ SVN_XML_LIBS = @SVN_XML_LIBS@
SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
SVN_LZ4_LIBS = @SVN_LZ4_LIBS@
SVN_UTF8PROC_LIBS = @SVN_UTF8PROC_LIBS@
+SVN_MACOS_PLIST_LIBS = @SVN_MACOS_PLIST_LIBS@
+SVN_MACOS_KEYCHAIN_LIBS = @SVN_MACOS_KEYCHAIN_LIBS@
LIBS = @LIBS@
@@ -219,7 +221,6 @@ COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS)
# special compilation for files destined for javahl (i.e. C++)
COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(JAVAHL_INCLUDES) -o $@ -c
COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
-COMPILE_JAVAHL_JAVAH = $(JAVAH)
COMPILE_JAVAHL_COMPAT_JAVAC = $(JAVAC) $(JAVAC_COMPAT_FLAGS)
# On Mac OS X, export an env variable so that the tests can run without
@@ -394,7 +395,6 @@ JAVAC = @JAVAC@
JAVADOC = @JAVADOC@
JAVAC_FLAGS = @JAVAC_FLAGS@
JAVAC_COMPAT_FLAGS = @JAVAC_COMPAT_FLAGS@
-JAVAH = @JAVAH@
JAR = @JAR@
JAVA_CLASSPATH=$(abs_srcdir)/subversion/bindings/javahl/src:@JAVA_CLASSPATH@
@@ -495,8 +495,8 @@ revision-install:
install-static: @INSTALL_STATIC_RULES@
# JavaHL target aliases
-javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-remote-javah javahl-types-javah javahl-util-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
-install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib
+javahl: mkdir-init javahl-java javahl-callback-java javahl-remote-java javahl-types-java javahl-util-java javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
+install-javahl: javahl install-javahl-java install-javahl-lib
javahl-compat: javahl-compat-java @JAVAHL_COMPAT_TESTS_TARGET@
clean-javahl:
@@ -602,6 +602,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
if test "$(FSFS_DIR_DELTIFICATION)" != ""; then \
flags="--fsfs-dir-deltification $(FSFS_DIR_DELTIFICATION) $$flags";\
fi; \
+ if test "$(ALLOW_REMOTE_HTTP_CONNECTION)" != ""; then \
+ flags="--allow-remote-http-connection $$flags"; \
+ fi; \
if test "$(SVN_BIN_DIR)" != ""; then \
flags="--bin $(SVN_BIN_DIR) $$flags"; \
fi; \
@@ -864,7 +867,7 @@ extraclean-swig-headers: clean-swig-head
$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in
./config.status subversion/bindings/swig/perl/native/Makefile.PL
-$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+$(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile.PL
cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
# There is a "readlink -f" command on some systems for the same purpose,
@@ -873,9 +876,7 @@ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_P
READLINK_PY=$(PYTHON) -c 'import sys,os; print(os.path.realpath(sys.argv[1]))'
READLINK_PL=$(PERL) -e 'use Cwd; print Cwd::realpath(shift)'
-swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
- $(SWIG_PL_DIR)/native/Makefile
-swig-pl: $(swig-pl_DEPS)
+swig-pl: autogen-swig-pl $(SWIG_PL_DIR)/native/Makefile
if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL) $(SWIG_PL_SRC_DIR)`"; then \
for f in $(SWIG_PL_SRC_DIR)/native/*.c ; do \
if [ -e "$$f" ] ; then \
Modified: subversion/branches/swig-py3/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build.conf?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/build.conf (original)
+++ subversion/branches/swig-py3/build.conf Wed Nov 28 21:25:32 2018
@@ -371,7 +371,8 @@ type = lib
install = fsmod-lib
path = subversion/libsvn_subr
sources = *.c lz4/*.c
-libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl lz4 utf8proc
+libs = aprutil apriconv apr xml zlib apr_memcache
+ sqlite magic intl lz4 utf8proc macos-plist macos-keychain
msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
crypt32.lib version.lib
msvc-export =
@@ -608,16 +609,14 @@ msvc-export = ../bindings/swig/ruby/libs
[javahl-java]
type = java
path = subversion/bindings/javahl/src/org/apache/subversion/javahl
- subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
- subversion/bindings/javahl/src/org/apache/subversion/javahl/remote
- subversion/bindings/javahl/src/org/apache/subversion/javahl/types
- subversion/bindings/javahl/src/org/apache/subversion/javahl/util
-src-root = subversion/bindings/javahl/src
sources = *.java
+native = CommitItemStateFlags.java NativeResources.java SVNClient.java
+ SVNRepos.java
install = javahl-java
link-cmd = $(COMPILE_JAVAHL_JAVAC)
classes = subversion/bindings/javahl/classes
-package-roots = org
+headers = subversion/bindings/javahl/include
+package = org.apache.subversion.javahl
[javahl-compat-java]
type = java
@@ -626,10 +625,12 @@ sources = *.java
install = javahl-java
link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC)
classes = subversion/bindings/javahl/classes
-add-deps = $(javahl_java_DEPS)
+add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS)
+ $(javahl_types_java_DEPS) $(javahl_util_java_DEPS)
+ $(javahl_java_DEPS)
### Replace JAR call in INSTALL_EXTRA_JAVAHL_JAVA macro Makefile.in.
#jar = svn-javahl.jar
-package-roots = org
+package = org.tigris.subversion.javahl
[javahl-tests]
type = java
@@ -638,10 +639,12 @@ sources = *.java
install = javahl-java
link-cmd = $(COMPILE_JAVAHL_JAVAC)
classes = subversion/bindings/javahl/classes
-package-roots = org
+package = org.apache.subversion.javahl
### Java targets don't do up-to-date checks yet.
#add-deps = javahl-java
-add-deps = $(javahl_java_DEPS)
+add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS)
+ $(javahl_types_java_DEPS) $(javahl_util_java_DEPS)
+ $(javahl_java_DEPS)
[javahl-compat-tests]
type = java
@@ -650,65 +653,59 @@ sources = *.java
install = javahl-java
link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC)
classes = subversion/bindings/javahl/classes
-package-roots = org
+package = org.tigris.subversion.javahl
### Java targets don't do up-to-date checks yet.
#add-deps = javahl-compat-java
add-deps = $(javahl_compat_java_DEPS)
-[javahl-callback-javah]
-type = javah
+[javahl-callback-java]
+type = java
path = subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
classes = subversion/bindings/javahl/classes
headers = subversion/bindings/javahl/include
package = org.apache.subversion.javahl.callback
sources = *.java
-add-deps = $(javahl_java_DEPS)
-install = javahl-javah
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+native = UserPasswordCallback.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
-[javahl-remote-javah]
-type = javah
+[javahl-remote-java]
+type = java
path = subversion/bindings/javahl/src/org/apache/subversion/javahl/remote
classes = subversion/bindings/javahl/classes
headers = subversion/bindings/javahl/include
package = org.apache.subversion.javahl.remote
sources = *.java
-add-deps = $(javahl_java_DEPS)
-install = javahl-javah
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+native = CommitEditor.java RemoteFactory.java RemoteSession.java
+ StateReporter.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
-[javahl-types-javah]
-type = javah
+[javahl-types-java]
+type = java
path = subversion/bindings/javahl/src/org/apache/subversion/javahl/types
classes = subversion/bindings/javahl/classes
headers = subversion/bindings/javahl/include
package = org.apache.subversion.javahl.types
sources = *.java
-add-deps = $(javahl_java_DEPS)
-install = javahl-javah
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+native = NativeInputStream.java NativeOutputStream.java Revision.java
+ RevisionRangeList.java RuntimeVersion.java VersionExtended.java
+ Version.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
-[javahl-util-javah]
-type = javah
+[javahl-util-java]
+type = java
path = subversion/bindings/javahl/src/org/apache/subversion/javahl/util
classes = subversion/bindings/javahl/classes
headers = subversion/bindings/javahl/include
package = org.apache.subversion.javahl.util
sources = *.java
-add-deps = $(javahl_java_DEPS)
-install = javahl-javah
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
-
-[javahl-javah]
-type = javah
-path = subversion/bindings/javahl/src/org/apache/subversion/javahl
-classes = subversion/bindings/javahl/classes
-headers = subversion/bindings/javahl/include
-package = org.apache.subversion.javahl
-sources = *.java
-add-deps = $(javahl_java_DEPS)
-install = javahl-javah
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+native = ConfigImpl.java ConfigLib.java DiffLib.java PropLib.java
+ RequestChannel.java ResponseChannel.java SubstLib.java
+ TunnelChannel.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
[libsvnjavahl]
description = Subversion Java HighLevel binding
@@ -717,9 +714,9 @@ 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 java-sdk
sources = *.cpp jniwrapper/*.cpp
-add-deps = $(javahl_java_DEPS) $(javahl_callback_javah_DEPS)
- $(javahl_remote_javah_DEPS) $(javahl_types_javah_DEPS)
- $(javahl_util_javah_DEPS) $(javahl_javah_DEPS)
+add-deps = $(javahl_java_DEPS) $(javahl_callback_java_DEPS)
+ $(javahl_remote_java_DEPS) $(javahl_types_java_DEPS)
+ $(javahl_util_java_DEPS) $(javahl_java_DEPS)
install = javahl-lib
# need special build rule to include -I$(JDK)/include/jni.h
compile-cmd = $(COMPILE_JAVAHL_CXX)
@@ -1207,6 +1204,14 @@ sources = window-test.c
install = test
libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
+[svndiff-stream-test]
+description = Test svndiff streams
+type = exe
+path = subversion/tests/libsvn_delta
+sources = svndiff-stream-test.c
+install = test
+libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
+
# ----------------------------------------------------------------------------
# Tests for libsvn_client
@@ -1455,7 +1460,8 @@ external-lib = $(SVN_DB_LIBS)
[gnome-keyring]
type = lib
external-lib = $(SVN_GNOME_KEYRING_LIBS)
-pkg-config = gnome-keyring-1
+pkg-config = @SVN_GNOME_KEYRING_PCLIBS@
+pkg-config-private = yes
[kwallet]
type = lib
@@ -1465,6 +1471,14 @@ external-lib = $(SVN_KWALLET_LIBS)
type = lib
external-lib = $(SVN_MAGIC_LIBS)
+[macos-plist]
+type = lib
+external-lib = $(SVN_MACOS_PLIST_LIBS)
+
+[macos-keychain]
+type = lib
+external-lib = $(SVN_MACOS_KEYCHAIN_LIBS)
+
[sasl]
type = lib
external-lib = $(SVN_SASL_LIBS)
@@ -1579,7 +1593,8 @@ libs = __ALL__
conflict-data-test db-test pristine-store-test entries-compat-test
op-depth-test dirent_uri-test wc-queries-test wc-test
auth-test
- parse-diff-test x509-test xml-test afl-x509 compress-test
+ parse-diff-test x509-test xml-test afl-x509 afl-svndiff compress-test
+ svndiff-stream-test
[__MORE__]
type = project
@@ -1620,7 +1635,7 @@ lang = ruby
[__JAVAHL__]
type = project
path = build/win32
-libs = javahl-java javahl-javah libsvnjavahl
+libs = javahl-java libsvnjavahl
[__JAVAHL_TESTS__]
type = project
@@ -1739,3 +1754,12 @@ sources = afl-x509.c
install = test
libs = libsvn_subr apr
testing = skip
+
+[afl-svndiff]
+description = AFL fuzzer for svndiff to txdelta parser
+type = exe
+path = subversion/tests/afl
+sources = afl-svndiff.c
+install = test
+libs = libsvn_delta libsvn_subr apr
+testing = skip
Modified: subversion/branches/swig-py3/build/PrintPath
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/PrintPath?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/PrintPath (original)
+++ subversion/branches/swig-py3/build/PrintPath Wed Nov 28 21:25:32 2018
@@ -1,22 +1,19 @@
#!/bin/sh
#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
#
# Look for program[s] somewhere in $PATH.
@@ -32,9 +29,6 @@
#
# Initially written by Jim Jagielski for the Apache configuration mechanism
# (with kudos to Kernighan/Pike)
-#
-# This script falls under the Apache License.
-# See http://www.apache.org/docs/LICENSE
##
# Some "constants"
@@ -69,7 +63,7 @@ done
# Finally, we try to determine the best flag to use for
# test/[] to look for an executable file. OS/2 just has '-r'
# but with other OSs, we do some funny stuff to check to see
-# if test/[] knows about -x, which is the preferred flag.
+# if test/[] knows about -x, which is the prefered flag.
##
if [ "x$os" = "xOS/2" ]
Modified: subversion/branches/swig-py3/build/ac-macros/find_apr.m4
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/ac-macros/find_apr.m4?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/ac-macros/find_apr.m4 (original)
+++ subversion/branches/swig-py3/build/ac-macros/find_apr.m4 Wed Nov 28 21:25:32 2018
@@ -1,21 +1,19 @@
-dnl ===================================================================
-dnl Licensed to the Apache Software Foundation (ASF) under one
-dnl or more contributor license agreements. See the NOTICE file
-dnl distributed with this work for additional information
-dnl regarding copyright ownership. The ASF licenses this file
-dnl to you under the Apache License, Version 2.0 (the
-dnl "License"); you may not use this file except in compliance
-dnl with the License. You may obtain a copy of the License at
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements. See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License. You may obtain a copy of the License at
dnl
dnl http://www.apache.org/licenses/LICENSE-2.0
dnl
-dnl Unless required by applicable law or agreed to in writing,
-dnl software distributed under the License is distributed on an
-dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-dnl KIND, either express or implied. See the License for the
-dnl specific language governing permissions and limitations
-dnl under the License.
-dnl ===================================================================
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
dnl
dnl find_apr.m4 : locate the APR include files and libraries
dnl
@@ -24,7 +22,8 @@ dnl library. It provides a standardized
dnl embedding APR into the application source, or locating an installed
dnl copy of APR.
dnl
-dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors,
+dnl detailed-check)
dnl
dnl where srcdir is the location of the bundled APR source directory, or
dnl empty if source is not bundled.
@@ -41,6 +40,14 @@ dnl If multiple versions are specified
dnl implicit installed search are used, then the first (leftmost) version
dnl in the list that is found will be used. Currently defaults to [0 1].
dnl
+dnl where detailed-check is an M4 macro which sets the apr_acceptable to
+dnl either "yes" or "no". The macro will be invoked for each installed
+dnl copy of APR found, with the apr_config variable set appropriately.
+dnl Only installed copies of APR which are considered acceptable by
+dnl this macro will be considered found. If no installed copies are
+dnl considered acceptable by this macro, apr_found will be set to either
+dnl either "no" or "reconfig".
+dnl
dnl Sets the following variables on exit:
dnl
dnl apr_found : "yes", "no", "reconfig"
@@ -64,7 +71,7 @@ dnl
AC_DEFUN([APR_FIND_APR], [
apr_found="no"
- if test "$ac_cv_emxos2" = "yes"; then
+ if test "$target_os" = "os2-emx"; then
# Scripts don't pass test -x on OS/2
TEST_X="test -f"
else
@@ -91,8 +98,8 @@ AC_DEFUN([APR_FIND_APR], [
AC_MSG_CHECKING(for APR)
AC_ARG_WITH(apr,
- [ --with-apr=PATH prefix for installed APR, path to APR build tree,
- or the full path to apr-config],
+ [ --with-apr=PATH prefix for installed APR or the full path to
+ apr-config],
[
if test "$withval" = "no" || test "$withval" = "yes"; then
AC_MSG_ERROR([--with-apr requires a directory or file to be provided])
@@ -103,16 +110,28 @@ AC_DEFUN([APR_FIND_APR], [
for lookdir in "$withval/bin" "$withval"
do
if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
- apr_found="yes"
apr_config="$lookdir/$apr_temp_apr_config_file"
+ ifelse([$5], [], [], [
+ apr_acceptable="yes"
+ $5
+ if test "$apr_acceptable" != "yes"; then
+ AC_MSG_WARN([Found APR in $apr_config, but we think it is considered unacceptable])
+ continue
+ fi])
+ apr_found="yes"
break 2
fi
done
done
if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
- apr_found="yes"
apr_config="$withval"
+ ifelse([$5], [], [apr_found="yes"], [
+ apr_acceptable="yes"
+ $5
+ if test "$apr_acceptable" = "yes"; then
+ apr_found="yes"
+ fi])
fi
dnl if --with-apr is used, it is a fatal error for its argument
@@ -121,9 +140,43 @@ AC_DEFUN([APR_FIND_APR], [
AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file.])
fi
],[
- dnl if we have a bundled source directory, use it
- if test -d "$1"; then
- apr_temp_abs_srcdir="`cd $1 && pwd`"
+ dnl If we allow installed copies, check those before using bundled copy.
+ if test -n "$3" && test "$3" = "1"; then
+ for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
+ do
+ if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
+ apr_config="$apr_temp_apr_config_file"
+ ifelse([$5], [], [], [
+ apr_acceptable="yes"
+ $5
+ if test "$apr_acceptable" != "yes"; then
+ AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+ continue
+ fi])
+ apr_found="yes"
+ break
+ else
+ dnl look in some standard places
+ for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
+ if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
+ apr_config="$lookdir/bin/$apr_temp_apr_config_file"
+ ifelse([$5], [], [], [
+ apr_acceptable="yes"
+ $5
+ if test "$apr_acceptable" != "yes"; then
+ AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+ continue
+ fi])
+ apr_found="yes"
+ break 2
+ fi
+ done
+ fi
+ done
+ fi
+ dnl if we have not found anything yet and have bundled source, use that
+ if test "$apr_found" = "no" && test -d "$1"; then
+ apr_temp_abs_srcdir="`cd \"$1\" && pwd`"
apr_found="reconfig"
apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apr_version.h\"`"
case $apr_bundled_major in
@@ -143,25 +196,6 @@ AC_DEFUN([APR_FIND_APR], [
apr_config="$1/$apr_temp_apr_config_file"
fi
fi
- if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then
- for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
- do
- if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
- apr_found="yes"
- apr_config="$apr_temp_apr_config_file"
- break
- else
- dnl look in some standard places (apparently not in builtin/default)
- for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
- if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
- apr_found="yes"
- apr_config="$lookdir/bin/$apr_temp_apr_config_file"
- break 2
- fi
- done
- fi
- done
- fi
])
AC_MSG_RESULT($apr_found)
Modified: subversion/branches/swig-py3/build/ac-macros/find_apu.m4
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/ac-macros/find_apu.m4?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/ac-macros/find_apu.m4 (original)
+++ subversion/branches/swig-py3/build/ac-macros/find_apu.m4 Wed Nov 28 21:25:32 2018
@@ -1,21 +1,19 @@
-dnl ===================================================================
-dnl Licensed to the Apache Software Foundation (ASF) under one
-dnl or more contributor license agreements. See the NOTICE file
-dnl distributed with this work for additional information
-dnl regarding copyright ownership. The ASF licenses this file
-dnl to you under the Apache License, Version 2.0 (the
-dnl "License"); you may not use this file except in compliance
-dnl with the License. You may obtain a copy of the License at
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements. See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License. You may obtain a copy of the License at
dnl
dnl http://www.apache.org/licenses/LICENSE-2.0
dnl
-dnl Unless required by applicable law or agreed to in writing,
-dnl software distributed under the License is distributed on an
-dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-dnl KIND, either express or implied. See the License for the
-dnl specific language governing permissions and limitations
-dnl under the License.
-dnl ===================================================================
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
dnl
dnl find_apu.m4 : locate the APR-util (APU) include files and libraries
dnl
@@ -24,7 +22,8 @@ dnl library. It provides a standardized
dnl embedding APU into the application source, or locating an installed
dnl copy of APU.
dnl
-dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors,
+dnl detailed-check)
dnl
dnl where srcdir is the location of the bundled APU source directory, or
dnl empty if source is not bundled.
@@ -41,6 +40,14 @@ dnl If multiple versions are specified
dnl implicit installed search are used, then the first (leftmost) version
dnl in the list that is found will be used. Currently defaults to [0 1].
dnl
+dnl where detailed-check is an M4 macro which sets the apu_acceptable to
+dnl either "yes" or "no". The macro will be invoked for each installed
+dnl copy of APU found, with the apu_config variable set appropriately.
+dnl Only installed copies of APU which are considered acceptable by
+dnl this macro will be considered found. If no installed copies are
+dnl considered acceptable by this macro, apu_found will be set to either
+dnl either "no" or "reconfig".
+dnl
dnl Sets the following variables on exit:
dnl
dnl apu_found : "yes", "no", "reconfig"
@@ -73,7 +80,7 @@ dnl
AC_DEFUN([APR_FIND_APU], [
apu_found="no"
- if test "$ac_cv_emxos2" = "yes"; then
+ if test "$target_os" = "os2-emx"; then
# Scripts don't pass test -x on OS/2
TEST_X="test -f"
else
@@ -101,8 +108,8 @@ AC_DEFUN([APR_FIND_APU], [
AC_MSG_CHECKING(for APR-util)
AC_ARG_WITH(apr-util,
- [ --with-apr-util=PATH prefix for installed APU, path to APU build tree,
- or the full path to apu-config],
+ [ --with-apr-util=PATH prefix for installed APU or the full path to
+ apu-config],
[
if test "$withval" = "no" || test "$withval" = "yes"; then
AC_MSG_ERROR([--with-apr-util requires a directory or file to be provided])
@@ -113,16 +120,28 @@ AC_DEFUN([APR_FIND_APU], [
for lookdir in "$withval/bin" "$withval"
do
if $TEST_X "$lookdir/$apu_temp_apu_config_file"; then
- apu_found="yes"
apu_config="$lookdir/$apu_temp_apu_config_file"
+ ifelse([$5], [], [], [
+ apu_acceptable="yes"
+ $5
+ if test "$apu_acceptable" != "yes"; then
+ AC_MSG_WARN([Found APU in $apu_config, but it is considered unacceptable])
+ continue
+ fi])
+ apu_found="yes"
break 2
fi
done
done
if test "$apu_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
- apu_found="yes"
apu_config="$withval"
+ ifelse([$5], [], [apu_found="yes"], [
+ apu_acceptable="yes"
+ $5
+ if test "$apu_acceptable" = "yes"; then
+ apu_found="yes"
+ fi])
fi
dnl if --with-apr-util is used, it is a fatal error for its argument
@@ -131,9 +150,42 @@ AC_DEFUN([APR_FIND_APU], [
AC_MSG_ERROR([the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file.])
fi
],[
- dnl if we have a bundled source directory, use it
- if test -d "$1"; then
- apu_temp_abs_srcdir="`cd $1 && pwd`"
+ if test -n "$3" && test "$3" = "1"; then
+ for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
+ do
+ if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
+ apu_config="$apu_temp_apu_config_file"
+ ifelse([$5], [], [], [
+ apu_acceptable="yes"
+ $5
+ if test "$apu_acceptable" != "yes"; then
+ AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
+ continue
+ fi])
+ apu_found="yes"
+ break
+ else
+ dnl look in some standard places (apparently not in builtin/default)
+ for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
+ if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
+ apu_config="$lookdir/bin/$apu_temp_apu_config_file"
+ ifelse([$5], [], [], [
+ apu_acceptable="yes"
+ $5
+ if test "$apu_acceptable" != "yes"; then
+ AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
+ continue
+ fi])
+ apu_found="yes"
+ break 2
+ fi
+ done
+ fi
+ done
+ fi
+ dnl if we have not found anything yet and have bundled source, use that
+ if test "$apu_found" = "no" && test -d "$1"; then
+ apu_temp_abs_srcdir="`cd \"$1\" && pwd`"
apu_found="reconfig"
apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apu_version.h\"`"
case $apu_bundled_major in
@@ -153,25 +205,6 @@ AC_DEFUN([APR_FIND_APU], [
apu_config="$1/$apu_temp_apu_config_file"
fi
fi
- if test "$apu_found" = "no" && test -n "$3" && test "$3" = "1"; then
- for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
- do
- if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
- apu_found="yes"
- apu_config="$apu_temp_apu_config_file"
- break
- else
- dnl look in some standard places (apparently not in builtin/default)
- for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
- if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
- apu_found="yes"
- apu_config="$lookdir/bin/$apu_temp_apu_config_file"
- break 2
- fi
- done
- fi
- done
- fi
])
AC_MSG_RESULT($apu_found)
Modified: subversion/branches/swig-py3/build/ac-macros/java.m4
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/ac-macros/java.m4?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/ac-macros/java.m4 (original)
+++ subversion/branches/swig-py3/build/ac-macros/java.m4 Wed Nov 28 21:25:32 2018
@@ -166,7 +166,7 @@ AC_DEFUN(SVN_FIND_JDK,
# The release for "-source" could actually be greater than that
# of "-target", if we want to cross-compile for lesser JVMs.
if test -z "$JAVAC_FLAGS"; then
- JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.6"
+ JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.8"
if test "$enable_debugging" = "yes"; then
JAVAC_FLAGS="-g -Xlint -Xlint:unchecked -Xlint:serial -Xlint:path $JAVAC_FLAGS"
if test -z "$JAVAC_COMPAT_FLAGS"; then
Modified: subversion/branches/swig-py3/build/ac-macros/libsecret.m4
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/ac-macros/libsecret.m4?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/ac-macros/libsecret.m4 (original)
+++ subversion/branches/swig-py3/build/ac-macros/libsecret.m4 Wed Nov 28 21:25:32 2018
@@ -54,6 +54,7 @@ AC_DEFUN(SVN_LIB_SECRET,
[Is libsecret support enabled?])
SVN_GNOME_KEYRING_INCLUDES="`$PKG_CONFIG --cflags libsecret-1`"
SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs libsecret-1`"
+ SVN_GNOME_KEYRING_PCLIBS="libsecret-1"
found_gnome_keyring="yes"
else
if test "$with_gnome_keyring" = "yes"; then
@@ -90,4 +91,5 @@ AC_DEFUN(SVN_LIB_SECRET,
fi
AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
AC_SUBST(SVN_GNOME_KEYRING_LIBS)
+ AC_SUBST(SVN_GNOME_KEYRING_PCLIBS)
])
Modified: subversion/branches/swig-py3/build/ac-macros/lz4.m4
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/ac-macros/lz4.m4?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/ac-macros/lz4.m4 (original)
+++ subversion/branches/swig-py3/build/ac-macros/lz4.m4 Wed Nov 28 21:25:32 2018
@@ -39,6 +39,10 @@ AC_DEFUN(SVN_LZ4,
],
[lz4_prefix=std])
+ if test "$lz4_prefix" = "no"; then
+ dnl The user has tried to disable LZ4
+ AC_MSG_ERROR([Subversion requires LZ4])
+ fi
if test "$lz4_prefix" = "internal"; then
AC_MSG_NOTICE([using internal lz4])
AC_DEFINE([SVN_INTERNAL_LZ4], [1],
Modified: subversion/branches/swig-py3/build/ac-macros/macosx.m4
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/ac-macros/macosx.m4?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/ac-macros/macosx.m4 (original)
+++ subversion/branches/swig-py3/build/ac-macros/macosx.m4 Wed Nov 28 21:25:32 2018
@@ -55,19 +55,8 @@ AC_DEFUN(SVN_LIB_MACOS_PLIST,
#error ProperyList API unavailable.
#endif
]],[[]])],[
- dnl ### Hack. We should only need to pass the -framework options when
- dnl linking libsvn_subr, since it is the only library that uses Keychain.
- dnl
- dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for
- dnl OS X frameworks like it does for normal libraries, so we need to
- dnl explicitly pass the option to all the users of libsvn_subr to allow
- dnl static builds to link successfully.
- dnl
- dnl This does mean that all executables we link will be linked directly
- dnl to these frameworks - even when building shared libraries - but that
- dnl shouldn't cause any problems.
-
- LIBS="$LIBS -framework CoreFoundation"
+ SVN_MACOS_PLIST_LIBS="-framework CoreFoundation"
+ AC_SUBST(SVN_MACOS_PLIST_LIBS)
AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1],
[Is Mac OS property list API available?])
AC_MSG_RESULT([yes])
@@ -97,9 +86,8 @@ AC_DEFUN(SVN_LIB_MACOS_KEYCHAIN,
#error KeyChain API unavailable.
#endif
]],[[]])],[
- dnl ### Hack, see SVN_LIB_MACOS_PLIST
- LIBS="$LIBS -framework Security"
- LIBS="$LIBS -framework CoreServices"
+ SVN_MACOS_KEYCHAIN_LIBS="-framework Security -framework CoreServices"
+ AC_SUBST(SVN_MACOS_KEYCHAIN_LIBS)
AC_DEFINE([SVN_HAVE_KEYCHAIN_SERVICES], [1], [Is Mac OS KeyChain support enabled?])
AC_MSG_RESULT([yes])
],[
Modified: subversion/branches/swig-py3/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/ac-macros/serf.m4?rev=1847678&r1=1847677&r2=1847678&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/ac-macros/serf.m4 (original)
+++ subversion/branches/swig-py3/build/ac-macros/serf.m4 Wed Nov 28 21:25:32 2018
@@ -168,8 +168,8 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
if $PKG_CONFIG $serf_pc_arg --atleast-version=$serf_check_version; then
AC_MSG_RESULT([yes])
serf_found=yes
- SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
- SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l`
+ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags-only-I`]
+ SVN_SERF_LIBS=[`$PKG_CONFIG $serf_pc_arg --libs-only-l`]
dnl don't use --libs-only-L because then we might miss some options
LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"]
break