You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/07/25 17:29:53 UTC
svn commit: r1507012 [1/11] - in /subversion/branches/fsfs-format7: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ contrib/client-side/emacs/ doc/programmer/
notes/http-and-webdav/ subversion/ subversion/bi...
Author: stefan2
Date: Thu Jul 25 15:29:49 2013
New Revision: 1507012
URL: http://svn.apache.org/r1507012
Log:
On the fsfs-format7 branch: sync with /trunk up to r1507008.
A handfull of conflicts, caused by cherry-pick merges to /trunk
and the refactoring of fs_fs.*, had to be resolved.
Added:
subversion/branches/fsfs-format7/build/generator/gen_win_dependencies.py
- copied unchanged from r1506992, subversion/trunk/build/generator/gen_win_dependencies.py
subversion/branches/fsfs-format7/doc/programmer/gtest-guide.txt
- copied unchanged from r1506992, subversion/trunk/doc/programmer/gtest-guide.txt
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/src/aprwrap/
- copied from r1506992, subversion/trunk/subversion/bindings/cxxhl/src/aprwrap/
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/src/aprwrap.hpp
- copied unchanged from r1506992, subversion/trunk/subversion/bindings/cxxhl/src/aprwrap.hpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/src/aprwrap/array.hpp
- copied unchanged from r1506992, subversion/trunk/subversion/bindings/cxxhl/src/aprwrap/array.hpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/src/aprwrap/hash.hpp
- copied unchanged from r1506992, subversion/trunk/subversion/bindings/cxxhl/src/aprwrap/hash.hpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/src/aprwrap/impl.cpp
- copied unchanged from r1506992, subversion/trunk/subversion/bindings/cxxhl/src/aprwrap/impl.cpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/src/aprwrap/pool.hpp
- copied unchanged from r1506992, subversion/trunk/subversion/bindings/cxxhl/src/aprwrap/pool.hpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/tests/cxxhl-tests.cpp
- copied unchanged from r1506992, subversion/trunk/subversion/bindings/cxxhl/tests/cxxhl-tests.cpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/tests/test_aprwrap.cpp
- copied unchanged from r1506992, subversion/trunk/subversion/bindings/cxxhl/tests/test_aprwrap.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/PropertyTable.cpp
- copied unchanged from r1506992, subversion/trunk/subversion/bindings/javahl/native/PropertyTable.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/PropertyTable.h
- copied unchanged from r1506992, subversion/trunk/subversion/bindings/javahl/native/PropertyTable.h
subversion/branches/fsfs-format7/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h
- copied unchanged from r1506992, subversion/trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h
subversion/branches/fsfs-format7/subversion/svn/youngest-cmd.c
- copied unchanged from r1506992, subversion/trunk/subversion/svn/youngest-cmd.c
subversion/branches/fsfs-format7/subversion/svnauth/ (props changed)
- copied from r1506992, subversion/trunk/subversion/svnauth/
subversion/branches/fsfs-format7/subversion/svnauth/svnauth.1
- copied unchanged from r1506992, subversion/trunk/subversion/svnauth/svnauth.1
subversion/branches/fsfs-format7/subversion/svnauth/svnauth.c
- copied unchanged from r1506992, subversion/trunk/subversion/svnauth/svnauth.c
Removed:
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/RevpropTable.h
subversion/branches/fsfs-format7/tools/dist/make-deps-tarball.sh
Modified:
subversion/branches/fsfs-format7/ (props changed)
subversion/branches/fsfs-format7/CHANGES
subversion/branches/fsfs-format7/INSTALL
subversion/branches/fsfs-format7/Makefile.in
subversion/branches/fsfs-format7/build.conf
subversion/branches/fsfs-format7/build/ac-macros/berkeley-db.m4
subversion/branches/fsfs-format7/build/ac-macros/compiler.m4
subversion/branches/fsfs-format7/build/ac-macros/sqlite.m4
subversion/branches/fsfs-format7/build/generator/gen_base.py
subversion/branches/fsfs-format7/build/generator/gen_make.py
subversion/branches/fsfs-format7/build/generator/gen_msvc_dsp.py
subversion/branches/fsfs-format7/build/generator/gen_vcnet_vcproj.py
subversion/branches/fsfs-format7/build/generator/gen_win.py
subversion/branches/fsfs-format7/build/generator/swig/__init__.py
subversion/branches/fsfs-format7/build/generator/swig/external_runtime.py
subversion/branches/fsfs-format7/build/generator/templates/msvc_dsp.ezt
subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcproj.ezt
subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/fsfs-format7/build/run_tests.py
subversion/branches/fsfs-format7/configure.ac
subversion/branches/fsfs-format7/contrib/client-side/emacs/vc-svn.el
subversion/branches/fsfs-format7/gen-make.py
subversion/branches/fsfs-format7/get-deps.sh
subversion/branches/fsfs-format7/notes/http-and-webdav/webdav-protocol
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/src/exception.cpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/tests/test_exception.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/BlameCallback.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/CommitEditor.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/CommitEditor.h
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/CreateJ.h
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/EditorProxy.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/EnumMapper.h
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ProplistCallback.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/RemoteSession.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/RemoteSession.h
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteStatus.java
subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java
subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java
subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StatusEditor.java
subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
subversion/branches/fsfs-format7/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/fsfs-format7/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
subversion/branches/fsfs-format7/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/fsfs-format7/subversion/bindings/swig/INSTALL
subversion/branches/fsfs-format7/subversion/bindings/swig/core.i
subversion/branches/fsfs-format7/subversion/bindings/swig/include/svn_types.swg
subversion/branches/fsfs-format7/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
subversion/branches/fsfs-format7/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
subversion/branches/fsfs-format7/subversion/bindings/swig/perl/native/Client.pm
subversion/branches/fsfs-format7/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/fsfs-format7/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
subversion/branches/fsfs-format7/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
subversion/branches/fsfs-format7/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
subversion/branches/fsfs-format7/subversion/bindings/swig/svn_delta.i
subversion/branches/fsfs-format7/subversion/bindings/swig/svn_ra.i
subversion/branches/fsfs-format7/subversion/include/private/svn_client_private.h
subversion/branches/fsfs-format7/subversion/include/private/svn_ra_svn_private.h
subversion/branches/fsfs-format7/subversion/include/svn_config.h
subversion/branches/fsfs-format7/subversion/include/svn_fs.h
subversion/branches/fsfs-format7/subversion/include/svn_io.h
subversion/branches/fsfs-format7/subversion/include/svn_version.h
subversion/branches/fsfs-format7/subversion/include/svn_wc.h
subversion/branches/fsfs-format7/subversion/libsvn_client/checkout.c
subversion/branches/fsfs-format7/subversion/libsvn_client/commit.c
subversion/branches/fsfs-format7/subversion/libsvn_client/diff_local.c
subversion/branches/fsfs-format7/subversion/libsvn_client/merge.c
subversion/branches/fsfs-format7/subversion/libsvn_client/mergeinfo.c
subversion/branches/fsfs-format7/subversion/libsvn_client/switch.c
subversion/branches/fsfs-format7/subversion/libsvn_delta/compat.c
subversion/branches/fsfs-format7/subversion/libsvn_delta/svndiff.c
subversion/branches/fsfs-format7/subversion/libsvn_fs/fs-loader.c
subversion/branches/fsfs-format7/subversion/libsvn_fs/fs-loader.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_base/dag.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_base/dag.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_base/fs.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_base/tree.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_base/tree.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/blame.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/commit.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/get_deleted_rev.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/getdate.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/getlocations.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/getlocks.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/inherited_props.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/locks.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/log.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/merge.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/options.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/property.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/replay.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/serf.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/update.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/util.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/util_error.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/xml.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/client.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/marshal.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/protocol
subversion/branches/fsfs-format7/subversion/libsvn_repos/dump.c
subversion/branches/fsfs-format7/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/auth.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/cmdline.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/config_file.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/deprecated.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/error.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/gpg_agent.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/io.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/nls.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/ssl_server_trust_providers.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/subst.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/utf.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/version.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/win32_xlate.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/deprecated.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/diff_editor.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/diff_local.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/update_editor.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.h
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_private.h
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/fsfs-format7/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/fsfs-format7/subversion/mod_dav_svn/repos.c
subversion/branches/fsfs-format7/subversion/po/de.po
subversion/branches/fsfs-format7/subversion/po/sv.po
subversion/branches/fsfs-format7/subversion/svn/cl.h
subversion/branches/fsfs-format7/subversion/svn/status-cmd.c
subversion/branches/fsfs-format7/subversion/svn/status.c
subversion/branches/fsfs-format7/subversion/svn/svn.c
subversion/branches/fsfs-format7/subversion/svn_private_config.hw
subversion/branches/fsfs-format7/subversion/svnadmin/svnadmin.c
subversion/branches/fsfs-format7/subversion/svndumpfilter/svndumpfilter.c
subversion/branches/fsfs-format7/subversion/svnlook/svnlook.c
subversion/branches/fsfs-format7/subversion/svnmucc/svnmucc.c
subversion/branches/fsfs-format7/subversion/svnserve/serve.c
subversion/branches/fsfs-format7/subversion/svnserve/svnserve.c
subversion/branches/fsfs-format7/subversion/svnsync/svnsync.c
subversion/branches/fsfs-format7/subversion/svnversion/svnversion.c
subversion/branches/fsfs-format7/subversion/tests/cmdline/basic_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/davautocheck.sh
subversion/branches/fsfs-format7/subversion/tests/cmdline/diff_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
subversion/branches/fsfs-format7/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
subversion/branches/fsfs-format7/subversion/tests/cmdline/stat_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svntest/actions.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svntest/main.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/wc_tests.py
subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/config-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/io-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/string-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/wc-lock-tester.c
subversion/branches/fsfs-format7/subversion/tests/svn_test_fs.c
subversion/branches/fsfs-format7/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template
subversion/branches/fsfs-format7/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/fsfs-format7/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
subversion/branches/fsfs-format7/tools/dev/build-svn-deps-win.pl
subversion/branches/fsfs-format7/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
subversion/branches/fsfs-format7/tools/dev/unix-build/Makefile.svn
subversion/branches/fsfs-format7/tools/dist/backport.pl
subversion/branches/fsfs-format7/win-tests.py
Propchange: subversion/branches/fsfs-format7/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 25 15:29:49 2013
@@ -49,7 +49,9 @@ mkmf.log
zlib
sqlite-amalgamation
serf
-gtest
+gmock-fused
.git
.gitignore
compile_commands.json
+.kdev4
+*.kdev4
Propchange: subversion/branches/fsfs-format7/
------------------------------------------------------------------------------
Merged /subversion/branches/tristate-chunked-request:r1502394-1502681
Merged /subversion/branches/gtest_addition:r1452117-1502138
Merged /subversion/trunk:r1499144-1507008
Modified: subversion/branches/fsfs-format7/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/CHANGES?rev=1507012&r1=1507011&r2=1507012&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/CHANGES (original)
+++ subversion/branches/fsfs-format7/CHANGES Thu Jul 25 15:29:49 2013
@@ -25,47 +25,91 @@ http://svn.apache.org/repos/asf/subversi
Version 1.8.1
-(?? July 2013, from /branches/1.8.x)
+(23 July 2013, from /branches/1.8.x)
http://svn.apache.org/repos/asf/subversion/tags/1.8.1
User-visible changes:
+ - Client- and server-side bugfixes:
+ * translation updates for German and Simplified Chinese
+ * improve sqlite error message output (r1497804)
+ * support platforms lacking mmap (r1498136)
+ * allow configuration files to start with UTF-8 BOM (r1499100 et al)
+ * don't fail on UTF-8 data when encoding conversion not available (r1503009)
+ * improve error messages when encoding conversion fails (r1503010)
+
- Client-side bugfixes:
- * rename 'automatic merge' to 'complete merge' (r1491432)
- * resolve endless loop problem when files contain inproper data (r1492145)
- * remove revision property buffer limit in fsfs (r1491770)
- * reduce network usage for 'svn mergeinfo --show-revs' (r1492005)
- * resolve segfault in fsfs-stats when passing invalid path (r1492164)
- * fix 'svnadmin upgrade' error of non-shared fsfs repositories (r1494287)
- * fix data loss when cancelling 'svnadmin upgrade' in last stage (r1494298)
- * deny 'svnadmin create --fs-type=fsfs --compatible-version=1.0' (r1494223)
- * improve http status handling in ra_serf (r1495104)
- * avoid unneeded ra session in 'svn merge' (r1495279)
- * reduce network usage for 'svn merge' (r1478987)
- * remove duplicated ancestry check in 'svn merge' (r1493424)
- * fix the standard 'Accept-Encoding' header (r1497641)
+ * merge: rename 'automatic merge' to 'complete merge' (r1491432)
+ * mergeinfo: reduce network usage for '--show-revs' (r1492005)
+ * ra_serf: improve http status handling (r1495104)
+ * merge: avoid unneeded ra session (r1493475)
+ * merge: reduce network usage (r1478987)
+ * merge: remove duplicated ancestry check (r1493424, r1495597)
+ * ra_serf: fix 'Accept-Encoding' header for IIS interoperability (r1497551)
+ * svn status: improve documentation for lock columns (r1497318, r1497319)
+ * ra_serf: fix support for 'get-file-revs-reversed' capability (r1498456)
+ * log: reduce network usage on repository roots (r1496957)
+ * diff: avoid temporary files when calling external diff (issue #4382)
+ * upgrade: fix notification of 1.7.x working copies (r1493703, r1494171)
+ * fix crash during tree conflict resolution (issue #4388)
+ * interactive file merge: add two additional choices (r1491816, r1494089)
+ * diff: use local style paths in error messages (r1500680)
+ * resolve: improve the interactive conflict resolution menu (r1491739 et al)
+ * switch: use local style path in error message (r1500074)
+ * ra_serf: improve error output when receiving invalid XML (r1498851)
+ * svn cleanup: explain what the command does in help output (r1497310)
+ * blame: error on -r M:N where M>N unless server supports (r1498449 et al)
+ * gpg-agent auth: don't try to use agent when unavailable (r1500762 et al)
+ * gpg-agent auth: don't require GPG_TTY or TERM env vars (r1500801)
+ * update: fix some tree conflicts not triggering resolver (r1491868 et al)
+ * commit: remove stale entries from wc lock table when deleting (r1491756)
+ * merge: fix --record-only erroring out on renamed path (issue #4387)
+ * svnmucc: fix 'make install' symlink to work when DESTDIR is set (r1501072)
+ * wc: fix crash when target is symlink to a working copy root (issue #4383)
+ * ra_serf: change "internal malfunction" errors to normal errors (r1502577)
+ * ra_serf: handle proxies not supporting chunked requests (r1502401 et al)
- Server-side bugfixes:
- * provide better http status for anonymous user errors (r1495918)
- * provide better http status for commit failures (r1490684)
+ * fsfs: resolve endless loop problem when repos/db/uuid has \r\n (r1492145)
+ * fsfs: remove revision property buffer limit (r1491770)
+ * mod_dav_svn: better status codes for anonymous user errors (r1495918)
+ * mod_dav_svn: better status codes for commit failures (r1490684)
* fix performance regression in 'svn log' against root (r1494913)
- * allow deleting non-default 'svn:' properties (r1495432)
+ * allow deleting non-user-visible 'svn:' properties (r1495432)
+ * fsfs: fix crash on strict-alignment architectures (r1495806, r1495985)
+ * svnadmin upgrade: fix error of non-sharded fsfs repositories (r1494287)
+ * svnadmin create: deny '--fs-type=fsfs --compatible-version=1.0' (r1494223)
+ * svnadmin upgrade: fix data loss when cancelling in last stage (r1494298)
+ * mod_dav_svn: fix incorrect path canonicalization (r1503528)
+
+ - Other tool improvements and bugfixes:
+ * fsfs-stats (tool): resolve segfault when passing invalid path (r1492164)
+ * svn-bench: fix help output (r1493951)
+ * svnpubsub: add version header to server (r1491707)
Developer-visible changes
- General:
- * fix some ra_serf specific test runner issues on Windows (r1490679)
- * fix help output of 'svn-bench' (r1493951)
+ * ra_serf: fix some test runner issues on Windows (r1490679)
* fix two issues in reverse svn_ra_get_file_revs() (r1492148, et al)
* handle --compatible-version=1.8 in the C tests (r1494342)
- * improve clang compatibility (r1480080 et all)
- * add version header to svnpubsub server (r1491707)
+ * improve clang compatibility (r1480080 et al)
* use proper cancel baton when handling conflicts (r1495850)
- * tweak configure.ac documentation (r1495967)
- * provide proper error value from BDB (r1495428)
- * tweak ra_serf connection failed error value (r1496132, et al)
- * resolve possible segfault in 'svn log' (r1496110)
+ * fs: BDB: provide proper error value from BDB (r1495428)
+ * ra_serf: tweak connection failed error value (r1496132, et al)
+ * svn_client_log5: resolve possible segfault (r1496110)
+ * fix metadata_only move to work when target is unversioned node (r1498564)
+ * ra_svn: fix segfault with a NULL commit message (r1498550, r1499727)
+ * Ev2: correctly initialize node kind in shims' change table (r1501058)
+ * Ev2: fix copyfrom URL construction in shims (r1500226)
+ * fs: improve test against newlines in filenames (r1498483 et al)
+ * make building with BDB 6 an opt-in feature (r1499438)
+ * sqlite: allow placing amalgamation in build dir (r1499034, r1500175)
+ * ra_svn: make sessions usable after log callback early out (r1503554)
- Bindings:
- * fix swig-rb tests with out-of-tree-builds (r1492295)
+ * swig-rb: fix tests with out-of-tree-builds (r1492295)
+ * javahl: fix encoding of error messages produced by javahl (r1492264)
+ * swig-pl: silence compiler warnings (r1487094)
+ * swig-pl: improve documentation (r1488693, r1490721, r1500904)
Version 1.8.0
@@ -409,13 +453,23 @@ http://svn.apache.org/repos/asf/subversi
Version 1.7.11
-(?? ??? 2013, from /branches/1.7.x)
+(23 Jul 2013, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.11
User-visible changes:
+ - General
+ * translation updates for Simplified Chinese
+
+ - Server-side bugfixes:
+ * mod_dav_svn: fix incorrect path canonicalization (r1503528)
+
- Other tool improvements and bugfixes:
* fix argument processing in contrib hook scripts (r1485350)
+ Developer-visible changes:
+ - Bindings:
+ * javahl: fix bug in error constructing code (r1405922)
+
Version 1.7.10
(30 May 2013, from /branches/1.7.x)
Modified: subversion/branches/fsfs-format7/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/INSTALL?rev=1507012&r1=1507011&r2=1507012&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/INSTALL (original)
+++ subversion/branches/fsfs-format7/INSTALL Thu Jul 25 15:29:49 2013
@@ -153,6 +153,12 @@ I. INTRODUCTION
configured via auto-props or the mime-types-file option
take precedence.
+ * Googlemock aka Gmock (OPTIONAL)
+
+ This optional package is used by the tests for Subversions'
+ C++ bindings.
+
+
C. Dependencies in Detail
Subversion depends on a number of third party tools and libraries.
@@ -568,6 +574,12 @@ I. INTRODUCTION
--with-libmagic
+ 22. Googlemock (OPTIONAL)
+
+ Googlemock can be installed and built in-tree by invoking
+
+ $ ./get-dep.sh gmock
+
D. Documentation
The primary documentation for Subversion is the free book
Modified: subversion/branches/fsfs-format7/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/Makefile.in?rev=1507012&r1=1507011&r2=1507012&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/Makefile.in (original)
+++ subversion/branches/fsfs-format7/Makefile.in Thu Jul 25 15:29:49 2013
@@ -131,6 +131,9 @@ APACHE_INCLUDES = @APACHE_INCLUDES@
APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
APACHE_LDFLAGS = @APACHE_LDFLAGS@
+SVN_USE_GMOCK = @SVN_USE_GMOCK@
+GMOCK_INCLUDES = -I@GMOCK_SRCDIR@
+
SWIG = @SWIG@
SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
@@ -166,9 +169,11 @@ DOXYGEN = @DOXYGEN@
# The EXTRA_ parameters can be used to pass extra flags at 'make' time.
CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
CMODEFLAGS = @CMODEFLAGS@
+CNOWARNFLAGS = @CNOWARNFLAGS@
CMAINTAINERFLAGS = @CMAINTAINERFLAGS@
CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
CXXMODEFLAGS = @CXXMODEFLAGS@
+CXXNOWARNFLAGS = @CXXNOWARNFLAGS@
CXXMAINTAINERFLAGS = @CXXMAINTAINERFLAGS@
### A few of the CFLAGS (e.g. -Wmissing-prototypes, -Wstrict-prototypes,
### -Wmissing-declarations) are not valid for C++, and should be somehow
@@ -178,10 +183,12 @@ LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS) $(INCLUDES)
+COMPILE_NOWARN = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CNOWARNFLAGS) $(CFLAGS) $(INCLUDES)
COMPILE_CXX = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS) $(CXXFLAGS) $(INCLUDES)
+COMPILE_CXX_NOWARN = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXNOWARNFLAGS) $(CXXFLAGS) $(INCLUDES)
LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(LT_CFLAGS)
LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS)
-
+LT_COMPILE_CXX_NOWARN = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX_NOWARN) $(LT_CFLAGS)
# Execute a command that loads libraries from the build dir
LT_EXECUTE = $(LIBTOOL) $(LTFLAGS) --mode=execute `for f in $(abs_builddir)/subversion/*/*.la; do echo -dlopen $$f; done`
@@ -199,7 +206,9 @@ COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_
COMPILE_JAVAHL_JAVAH = $(JAVAH)
# special compilation for files destined for cxxhl
-COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(CXXHL_INCLUDES) -o $@ -c
+COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) -o $@ -c
+COMPILE_GMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GMOCK_INCLUDES) -o $@ -c
+COMPILE_CXXHL_GMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GMOCK_INCLUDES) -o $@ -c
LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
LINK_LIB = $(LINK) $(LT_SO_VERSION)
@@ -916,5 +925,5 @@ INSTALL_EXTRA_TOOLS=\
test -n "$$SVN_SVNMUCC_IS_SVNSYITF" && \
ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
if test "$(DESTDIR)$(bindir)" != "$(DESTDIR)$(toolsdir)"; then \
- ln -sf ../svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
+ ln -sf $(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
fi
Modified: subversion/branches/fsfs-format7/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build.conf?rev=1507012&r1=1507011&r2=1507012&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build.conf (original)
+++ subversion/branches/fsfs-format7/build.conf Thu Jul 25 15:29:49 2013
@@ -40,6 +40,8 @@ private-includes =
subversion/libsvn_delta/compose_delta.c
subversion/bindings/cxxhl/include/*.hpp
subversion/bindings/cxxhl/include/svncxxhl/*.hpp
+ subversion/bindings/cxxhl/src/*.hpp
+ subversion/bindings/cxxhl/src/aprwrap/*.hpp
subversion/libsvn_subr/utf8proc/utf8proc.h
subversion/libsvn_subr/utf8proc/utf8proc.c
subversion/libsvn_subr/utf8proc/utf8proc_data.c
@@ -199,6 +201,14 @@ libs = libsvn_client libsvn_ra libsvn_su
install = bin
manpages = subversion/svnmucc/svnmucc.1
+[svnauth]
+description = Subversion Authentication Credentials Management Tool
+type = exe
+path = subversion/svnauth
+libs = libsvn_subr apriconv apr serf
+install = bin
+manpages = subversion/svnauth/svnauth.1
+
# Support for GNOME Keyring
[libsvn_auth_gnome_keyring]
description = Subversion GNOME Keyring Library
@@ -303,7 +313,7 @@ msvc-export = svn_ra.h private\svn_ra_pr
type = ra-module
path = subversion/libsvn_ra_serf
install = serf-lib
-libs = libsvn_delta libsvn_subr aprutil apriconv apr serf xml
+libs = libsvn_delta libsvn_subr aprutil apriconv apr serf xml zlib
msvc-libs = secur32.lib
msvc-static = yes
@@ -338,7 +348,7 @@ description = Subversion General Utility
type = lib
install = fsmod-lib
path = subversion/libsvn_subr
-libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic
+libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl
msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
crypt32.lib version.lib psapi.lib
msvc-export =
@@ -428,7 +438,6 @@ type = sql-header
path = subversion/libsvn_subr
sources = internal_statements.sql
-
# ----------------------------------------------------------------------------
#
# TARGETS FOR I18N SUPPORT
@@ -451,7 +460,6 @@ sources = core.i
libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
libsvn_diff libsvn_subr apr
description = Subversion core library bindings
-include-runtime = yes
[swig_client]
type = swig
@@ -521,35 +529,39 @@ description = Subversion WC library bind
type = swig_lib
lang = python
path = subversion/bindings/swig/python/libsvn_swig_py
-libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
+ apriconv apr python swig
link-cmd = $(LINK)
install = swig-py-lib
# need special build rule to include -DSWIGPYTHON
compile-cmd = $(COMPILE_SWIG_PY)
msvc-static = no
+msvc-export = ../bindings/swig/python/libsvn_swig_py/swigutil_py.h
# SWIG utility library for Perl modules
[libsvn_swig_perl]
type = swig_lib
lang = perl
path = subversion/bindings/swig/perl/libsvn_swig_perl
-libs = libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_delta libsvn_subr apriconv apr perl swig
install = swig-pl-lib
# need special build rule to include
compile-cmd = $(COMPILE_SWIG_PL)
-msvc-static = yes
+msvc-static = no
+msvc-export = ../bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
# SWIG utility library for Ruby modules
[libsvn_swig_ruby]
type = swig_lib
lang = ruby
path = subversion/bindings/swig/ruby/libsvn_swig_ruby
-libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
link-cmd = $(LINK) $(SWIG_RB_LIBS)
install = swig-rb-lib
# need special build rule to include
compile-cmd = $(COMPILE_SWIG_RB)
msvc-static = no
+msvc-export = ../bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
# ----------------------------------------------------------------------------
#
@@ -653,7 +665,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
+ libsvn_subr libsvn_fs aprutil apriconv apr java-sdk
sources = *.cpp *.c
add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS) $(javahl_remote_javah_DEPS)
install = javahl-lib
@@ -672,7 +684,7 @@ type = lib
path = subversion/bindings/cxxhl
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
libsvn_subr libsvn_fs aprutil apriconv apr
-sources = src/*.cpp
+sources = src/*.cpp src/aprwrap/*.cpp
install = cxxhl-lib
msvc-static = yes
compile-cmd = $(COMPILE_CXXHL_CXX)
@@ -680,14 +692,31 @@ link-cmd = $(LINK_CXX_LIB)
[cxxhl-tests]
description = Unit tests for Subversion C++ HighLevel bindings
+when = SVN_USE_GMOCK
type = exe
path = subversion/bindings/cxxhl
-libs = libsvncxxhl libsvn_subr
+libs = libsvncxxhl libgmock libsvn_subr apr
sources = tests/*.cpp
install = tests
-compile-cmd = $(COMPILE_CXXHL_CXX)
+compile-cmd = $(COMPILE_CXXHL_GMOCK_CXX)
link-cmd = $(LINK_CXX)
+
+# ----------------------------------------------------------------------------
+#
+# Gmock targets
+#
+
+[libgmock]
+description = Googlemock Library
+when = SVN_USE_GMOCK
+type = lib
+path = gmock-fused
+sources = gmock-gtest-all.cc
+install = tests
+compile-cmd = $(COMPILE_GMOCK_CXX)
+link-cmd = $(LINK_CXX_LIB)
+
# ----------------------------------------------------------------------------
#
# TESTING TARGETS
@@ -1222,6 +1251,15 @@ external-lib = $(SVN_MAGIC_LIBS)
type = lib
external-lib = $(SVN_SASL_LIBS)
+[openssl]
+type = lib
+external-lib = $(SVN_OPENSSL_LIBS)
+msvc-libs = ssleay32.lib libeay32.lib
+
+[intl]
+type = lib
+external-lib = $(SVN_INTL_LIBS)
+
[zlib]
type = lib
external-lib = $(SVN_ZLIB_LIBS)
@@ -1236,7 +1274,7 @@ external-lib = $(SVN_APR_MEMCACHE_LIBS)
type = lib
external-lib = $(SVN_SERF_LIBS)
external-project = serf/serf
-libs = apr aprutil xml
+libs = apr aprutil xml openssl
msvc-static = yes
[sqlite]
@@ -1247,6 +1285,26 @@ external-lib = $(SVN_SQLITE_LIBS)
type = lib
external-lib = $(SVN_XML_LIBS)
+[swig]
+type = lib
+external-lib = $(SVN_SWIG_LIBS)
+
+[perl]
+type = lib
+external-lib = $(SVN_PERL_LIBS)
+
+[python]
+type = lib
+external-lib = $(SVN_PYTHON_LIBS)
+
+[ruby]
+type = lib
+external-lib = $(SVN_RUBY_LIBS)
+
+[java-sdk]
+type = lib
+external-lib = $(SVN_JAVA_SDK_LIBS)
+
[ra-libs]
type = lib
external-lib = $(SVN_RA_LIB_LINK)
@@ -1316,13 +1374,13 @@ lang = python
[__SWIG_PERL__]
type = swig_project
path = build/win32
-libs = swig_client swig_delta swig_fs swig_ra swig_repos swig_wc swig_core
+libs = swig_client swig_delta swig_diff swig_fs swig_ra swig_repos swig_wc swig_core
lang = perl
[__SWIG_RUBY__]
type = swig_project
path = build/win32
-libs = swig_client swig_delta swig_fs swig_ra swig_repos swig_wc swig_core
+libs = swig_client swig_delta swig_diff swig_fs swig_ra swig_repos swig_wc swig_core
lang = ruby
[__JAVAHL__]
Modified: subversion/branches/fsfs-format7/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/ac-macros/berkeley-db.m4?rev=1507012&r1=1507011&r2=1507012&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/fsfs-format7/build/ac-macros/berkeley-db.m4 Thu Jul 25 15:29:49 2013
@@ -48,7 +48,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
AC_ARG_WITH(berkeley-db, [AS_HELP_STRING(
[[--with-berkeley-db[=HEADER:INCLUDES:LIB_SEARCH_DIRS:LIBS]]], [
The Subversion Berkeley DB based filesystem library
- requires Berkeley DB $db_version or newer. If you
+ requires Berkeley DB $db_version or $db_alt_version. If you
specify `--without-berkeley-db', that library will
not be built. If you omit the argument of this option
completely, the configure script will use Berkeley DB
@@ -126,22 +126,35 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
svn_lib_berkeley_db=no
else
AC_MSG_CHECKING([for availability of Berkeley DB])
- SVN_LIB_BERKELEY_DB_TRY($1, $2, $3)
+ AC_ARG_ENABLE(bdb6,
+ AS_HELP_STRING([--enable-bdb6],
+ [Allow building against BDB 6+.
+ See --with-berkeley-db for specifying the location of
+ the Berkeley DB installation. Using BDB 6 will fail if
+ this option is not used.]),
+ [enable_bdb6=$enableval],[enable_bdb6=unspecified])
+
+ SVN_LIB_BERKELEY_DB_TRY($1, $2, $3, $enable_bdb6)
if test "$svn_have_berkeley_db" = "yes"; then
AC_MSG_RESULT([yes])
svn_lib_berkeley_db=yes
else
- AC_MSG_RESULT([no])
+ if test "$svn_have_berkeley_db" = "no6"; then
+ AC_MSG_RESULT([no (found version 6, but --enable-bdb6 not specified)])
+ # A warning will be printed at the end of configure.ac.
+ else
+ AC_MSG_RESULT([no])
+ fi
svn_lib_berkeley_db=no
if test "$bdb_status" = "required"; then
- AC_MSG_ERROR([Berkeley DB $db_version or newer wasn't found.])
+ AC_MSG_ERROR([Berkeley DB $db_version or $db_alt_version wasn't found.])
fi
fi
fi
])
-dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch)
+dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch, enable_bdb6)
dnl
dnl A subroutine of SVN_LIB_BERKELEY_DB.
dnl
@@ -174,6 +187,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
svn_check_berkeley_db_major=$1
svn_check_berkeley_db_minor=$2
svn_check_berkeley_db_patch=$3
+ enable_bdb6=$4
if test -z "$SVN_DB_LIBS"; then
# We pass --dbm-libs here since Debian has modified apu-config not
@@ -215,6 +229,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
)
AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <string.h>
#include <stdlib.h>
$svn_db_header
@@ -230,6 +245,12 @@ int main ()
|| patch != DB_VERSION_PATCH)
exit (1);
+ /* Block Berkeley DB 6, because (a) we haven't tested with it, (b) 6.0.20
+ and newer are under the AGPL, and we want use of AGPL dependencies to be
+ opt-in. */
+ if (major >= 6 && strcmp("$enable_bdb6", "yes"))
+ exit(2);
+
/* Run-time check: ensure the library claims to be the correct version. */
if (major < $svn_check_berkeley_db_major)
@@ -249,7 +270,11 @@ int main ()
}
]])],
[svn_have_berkeley_db=yes],
- [svn_have_berkeley_db=no],
+ [rc=$?
+ svn_have_berkeley_db=no
+ if test $rc = 2; then
+ svn_have_berkeley_db=no6
+ fi],
[svn_have_berkeley_db=yes]
)
Modified: subversion/branches/fsfs-format7/build/ac-macros/compiler.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/ac-macros/compiler.m4?rev=1507012&r1=1507011&r2=1507012&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/ac-macros/compiler.m4 (original)
+++ subversion/branches/fsfs-format7/build/ac-macros/compiler.m4 Thu Jul 25 15:29:49 2013
@@ -67,8 +67,16 @@ AC_DEFUN([SVN_CC_MODE_SETUP],
])
CMODEFLAGS="$CFLAGS"
+ CFLAGS=""
+
+ dnl Find flags to silence all warnings
+ SVN_CFLAGS_ADD_IFELSE([-w])
+
+ CNOWARNFLAGS="$CFLAGS"
CFLAGS="$CFLAGS_KEEP"
+
AC_SUBST(CMODEFLAGS)
+ AC_SUBST(CNOWARNFLAGS)
AC_SUBST(CMAINTAINERFLAGS)
dnl Tell clang to not accept unknown warning flags
@@ -85,9 +93,17 @@ AC_DEFUN([SVN_CXX_MODE_SETUP],
dnl g++ and clang++
SVN_CXXFLAGS_ADD_IFELSE([-std=c++98])
- CXXMODEFLAGS="$CXXFLAGS"
+ CXXMODEFLAGS="$CFLAGS"
+ CXXFLAGS=""
+
+ dnl Find flags to silence all warnings
+ SVN_CXXFLAGS_ADD_IFELSE([-w])
+
+ CXXNOWARNFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS_KEEP"
+
AC_SUBST(CXXMODEFLAGS)
+ AC_SUBST(CXXNOWARNFLAGS)
AC_SUBST(CXXMAINTAINERFLAGS)
dnl Tell clang++ to not accept unknown warning flags
Modified: subversion/branches/fsfs-format7/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/ac-macros/sqlite.m4?rev=1507012&r1=1507011&r2=1507012&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/fsfs-format7/build/ac-macros/sqlite.m4 Thu Jul 25 15:29:49 2013
@@ -250,8 +250,10 @@ AC_DEFUN(SVN_DOWNLOAD_SQLITE,
echo "unpack the archive using unzip and rename the resulting"
echo "directory to:"
echo "$abs_srcdir/sqlite-amalgamation"
- echo "or to:"
- echo "$abs_builddir/sqlite-amalgamation"
+ if test x"$abs_srcdir" != x"$abs_builddir"; then
+ echo "or to:"
+ echo "$abs_builddir/sqlite-amalgamation"
+ fi
echo ""
AC_MSG_ERROR([Subversion requires SQLite])
])
Modified: subversion/branches/fsfs-format7/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/generator/gen_base.py?rev=1507012&r1=1507011&r2=1507012&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/generator/gen_base.py (original)
+++ subversion/branches/fsfs-format7/build/generator/gen_base.py Thu Jul 25 15:29:49 2013
@@ -239,30 +239,58 @@ class GeneratorBase:
except: pass
os.rename(new_hdrfile, hdrfile)
+ def write_file_if_changed(self, fname, new_contents):
+ """Rewrite the file if new_contents are different than its current content.
+
+ If you have your windows projects open and generate the projects
+ it's not a small thing for windows to re-read all projects so
+ only update those that have changed.
+ """
+
+ try:
+ old_contents = open(fname, 'rb').read()
+ except IOError:
+ old_contents = None
+ if old_contents != new_contents:
+ open(fname, 'wb').write(new_contents)
+ print("Wrote: %s" % fname)
+
+
def write_errno_table(self):
# ### We generate errorcode.inc at autogen.sh time (here!).
# ###
# ### Currently it's only used by maintainer-mode builds. If this
# ### functionality ever moves to release builds, it will have to move
- # ### to configure-time. (But then you have to solve two problems:
- # ### what to do on windows, and what to do on unix when Python is not
- # ### available at configure-time.)
+ # ### to configure-time.
import errno
- fd = open('subversion/libsvn_subr/errorcode.inc', 'w')
- fd.write('/* This file was generated by build/generator/gen_base.py */\n\n')
+
+ lines = [
+ '/* This file was generated by build/generator/gen_base.py */',
+ ''
+ ]
def write_struct(name, codes):
- fd.write('static struct {\n'
- ' int errcode;\n'
- ' const char *errname;\n'
- '} %s[] = {\n' % name)
+ lines.extend([
+ 'static struct {',
+ ' int errcode;',
+ ' const char *errname;',
+ '} %s[] = {' % (name,),
+ ])
+
for num, val in sorted(codes):
- fd.write(' { %d, "%s" },\n' % (num, val))
- # fd.seek(-2, os.SEEK_CUR); fd.write('\n');
- fd.write('};\n')
+ lines.extend([
+ ' { %d, "%s" },' % (num, val),
+ ])
+
+ # Remove ',' for c89 compatibility
+ lines[-1] = lines[-1][0:-1]
+
+ lines.extend([
+ '};',
+ '',
+ ])
write_struct('svn__errno', errno.errorcode.items())
- fd.write('\n')
# Fetch and write apr_errno.h codes.
aprerr = []
@@ -280,6 +308,9 @@ class GeneratorBase:
if self.errno_filter(intersection):
print("WARNING: errno intersects APR error codes: %r" % intersection)
+ self.write_file_if_changed('subversion/libsvn_subr/errorcode.inc',
+ '\n'.join(lines))
+
def errno_filter(self, codes):
return codes
@@ -473,6 +504,8 @@ class TargetLinked(Target):
if glob.glob(src):
if src[-2:] == '.c':
objname = src[:-2] + self.objext
+ elif src[-3:] == '.cc':
+ objname = src[:-3] + self.objext
elif src[-4:] == '.cpp':
objname = src[:-4] + self.objext
else:
@@ -556,6 +589,12 @@ class TargetLib(TargetLinked):
self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
self.msvc_export = options.get('msvc-export', '').split()
+ def disable_shared(self):
+ "tries to disable building as a shared library,"
+
+ self.msvc_static = True
+ self.msvc_export = []
+
class TargetApacheMod(TargetLib):
def __init__(self, name, options, gen_obj):
@@ -617,7 +656,6 @@ class TargetSWIG(TargetLib):
TargetLib.__init__(self, name, options, gen_obj)
self.lang = lang
self.desc = self.desc + ' for ' + lang_full_name[lang]
- self.include_runtime = options.get('include-runtime') == 'yes'
### hmm. this is Makefile-specific
self.link_cmd = '$(LINK_%s_WRAPPER)' % lang_abbrev[lang].upper()
@@ -641,13 +679,16 @@ class TargetSWIG(TargetLib):
module_name = iname[:4] != 'svn_' and iname[:-2] or iname[4:-2]
lib_extension = self.gen_obj._extension_map['lib', 'target']
- if self.lang == "ruby":
+ if self.lang == "python":
+ lib_extension = self.gen_obj._extension_map['pyd', 'target']
+ lib_filename = '_' + module_name + lib_extension
+ elif self.lang == "ruby":
+ lib_extension = self.gen_obj._extension_map['so', 'target']
lib_filename = module_name + lib_extension
elif self.lang == "perl":
lib_filename = '_' + module_name.capitalize() + lib_extension
else:
- lib_extension = self.gen_obj._extension_map['pyd', 'target']
- lib_filename = '_' + module_name + lib_extension
+ lib_filename = module_name + lib_extension
self.name = self.lang + '_' + module_name
self.path = build_path_join(self.path, self.lang)
@@ -697,6 +738,12 @@ class TargetSWIGLib(TargetLib):
return [ self.target ]
return [ ]
+ def disable_shared(self):
+ "disables building shared libraries"
+
+ return # Explicit NO-OP
+
+
class TargetProject(Target):
def __init__(self, name, options, gen_obj):
Target.__init__(self, name, options, gen_obj)
Modified: subversion/branches/fsfs-format7/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/generator/gen_make.py?rev=1507012&r1=1507011&r2=1507012&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/generator/gen_make.py (original)
+++ subversion/branches/fsfs-format7/build/generator/gen_make.py Thu Jul 25 15:29:49 2013
@@ -62,6 +62,8 @@ class Generator(gen_base.GeneratorBase):
('lib', 'object'): '.lo',
('pyd', 'target'): '.la',
('pyd', 'object'): '.lo',
+ ('so', 'target'): '.la',
+ ('so', 'object'): '.lo',
}
def __init__(self, fname, verfname, options=None):
Modified: subversion/branches/fsfs-format7/build/generator/gen_msvc_dsp.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/generator/gen_msvc_dsp.py?rev=1507012&r1=1507011&r2=1507012&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/generator/gen_msvc_dsp.py (original)
+++ subversion/branches/fsfs-format7/build/generator/gen_msvc_dsp.py Thu Jul 25 15:29:49 2013
@@ -82,7 +82,6 @@ class Generator(gen_win.WinGeneratorBase
'rootpath' : self.rootpath,
'platforms' : self.platforms,
'configs' : configs,
- 'includes' : self.get_win_includes(target),
'sources' : sources,
'default_platform' : self.platforms[0],
'default_config' : configs[0].name,
Modified: subversion/branches/fsfs-format7/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/generator/gen_vcnet_vcproj.py?rev=1507012&r1=1507011&r2=1507012&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/fsfs-format7/build/generator/gen_vcnet_vcproj.py Thu Jul 25 15:29:49 2013
@@ -38,6 +38,23 @@ class Generator(gen_win.WinGeneratorBase
def quote(self, str):
return '"%s"' % str
+ def gen_proj_names(self, install_targets):
+ "Generate project file names for the targets"
+
+ if float(self.vcproj_version) < 11.0:
+ gen_win.WinGeneratorBase.gen_proj_names(self, install_targets)
+ return
+
+ # With VS2012 we can assume that even the light versions
+ # support proper project nesting in the UI
+
+ for target in install_targets:
+ if target.msvc_name:
+ target.proj_name = target.msvc_name
+ continue
+
+ target.proj_name = target.name
+
def get_external_project(self, target, proj_ext):
"Link project files: prefer vcproj's, but if don't exist, try dsp's."
vcproj = gen_win.WinGeneratorBase.get_external_project(self, target,
@@ -100,7 +117,6 @@ class Generator(gen_win.WinGeneratorBase
'platforms' : self.platforms,
'config_type' : config_type,
'configs' : configs,
- 'includes' : self.get_win_includes(target),
'sources' : sources,
'default_platform' : self.platforms[0],
'default_config' : configs[0].name,