Author: danielsh
Date: Fri Sep 18 01:38:47 2015
New Revision: 1703735
URL: http://svn.apache.org/viewvc?rev=1703735&view=rev
Log:
On the patch-exec branch, sync with trunk@r1703734.
The merge was performed by a trunk client, due to the merge_delete_crlf_file()
issue (see r1703689 on trunk).
Added:
subversion/branches/patch-exec/subversion/libsvn_fs_base/fs_init.h
- copied unchanged from r1703734,
subversion/trunk/subversion/libsvn_fs_base/fs_init.h
subversion/branches/patch-exec/subversion/libsvn_fs_fs/fs_init.h
- copied unchanged from r1703734,
subversion/trunk/subversion/libsvn_fs_fs/fs_init.h
subversion/branches/patch-exec/subversion/libsvn_fs_x/fs_init.h
- copied unchanged from r1703734,
subversion/trunk/subversion/libsvn_fs_x/fs_init.h
subversion/branches/patch-exec/subversion/tests/cmdline/svnfsfs_tests.py
- copied unchanged from r1703734,
subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py
subversion/branches/patch-exec/subversion/tests/cmdline/upgrade_tests_data/upgrade_1_0_with_externals.tar.bz2
- copied unchanged from r1703734,
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_1_0_with_externals.tar.bz2
Removed:
subversion/branches/patch-exec/build/generator/gen_msvc_dsp.py
subversion/branches/patch-exec/build/generator/templates/msvc_dsp.ezt
subversion/branches/patch-exec/build/generator/templates/msvc_dsw.ezt
subversion/branches/patch-exec/build/generator/templates/svn_config.dsp.ezt
subversion/branches/patch-exec/build/generator/templates/svn_locale.dsp.ezt
subversion/branches/patch-exec/build/generator/templates/vcnet_vc7_sln.ezt
subversion/branches/patch-exec/tools/client-side/detach.py
Modified:
subversion/branches/patch-exec/ (props changed)
subversion/branches/patch-exec/CHANGES
subversion/branches/patch-exec/COMMITTERS
subversion/branches/patch-exec/INSTALL
subversion/branches/patch-exec/build.conf
subversion/branches/patch-exec/build/ac-macros/swig.m4
subversion/branches/patch-exec/build/generator/gen_base.py
subversion/branches/patch-exec/build/generator/gen_vcnet_vcproj.py
subversion/branches/patch-exec/build/generator/gen_win.py
subversion/branches/patch-exec/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/patch-exec/build/run_tests.py
subversion/branches/patch-exec/configure.ac
subversion/branches/patch-exec/contrib/hook-scripts/check-mime-type.pl
subversion/branches/patch-exec/gen-make.py
subversion/branches/patch-exec/notes/svnsync.txt
subversion/branches/patch-exec/subversion/bindings/swig/include/svn_types.swg
subversion/branches/patch-exec/subversion/include/private/svn_atomic.h
subversion/branches/patch-exec/subversion/include/private/svn_io_private.h
subversion/branches/patch-exec/subversion/include/private/svn_ra_svn_private.h
subversion/branches/patch-exec/subversion/include/private/svn_utf_private.h
subversion/branches/patch-exec/subversion/include/svn_client.h
subversion/branches/patch-exec/subversion/include/svn_io.h
subversion/branches/patch-exec/subversion/include/svn_ra_svn.h
subversion/branches/patch-exec/subversion/include/svn_repos.h
subversion/branches/patch-exec/subversion/libsvn_auth_kwallet/kwallet.cpp
subversion/branches/patch-exec/subversion/libsvn_client/copy.c
subversion/branches/patch-exec/subversion/libsvn_client/export.c
subversion/branches/patch-exec/subversion/libsvn_client/externals.c
subversion/branches/patch-exec/subversion/libsvn_client/merge.c
subversion/branches/patch-exec/subversion/libsvn_client/mtcc.c
subversion/branches/patch-exec/subversion/libsvn_client/resolved.c
subversion/branches/patch-exec/subversion/libsvn_client/upgrade.c
subversion/branches/patch-exec/subversion/libsvn_delta/xdelta.c
subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c
subversion/branches/patch-exec/subversion/libsvn_fs/fs-loader.c
subversion/branches/patch-exec/subversion/libsvn_fs/fs-loader.h
subversion/branches/patch-exec/subversion/libsvn_fs_fs/cached_data.c
subversion/branches/patch-exec/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/patch-exec/subversion/libsvn_fs_fs/index.c
subversion/branches/patch-exec/subversion/libsvn_fs_fs/load-index.c
subversion/branches/patch-exec/subversion/libsvn_fs_fs/lock.c
subversion/branches/patch-exec/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/patch-exec/subversion/libsvn_fs_fs/transaction.c
subversion/branches/patch-exec/subversion/libsvn_fs_fs/tree.c
subversion/branches/patch-exec/subversion/libsvn_fs_fs/util.c
subversion/branches/patch-exec/subversion/libsvn_fs_x/ (props changed)
subversion/branches/patch-exec/subversion/libsvn_fs_x/fs_id.c
subversion/branches/patch-exec/subversion/libsvn_fs_x/fs_x.c
subversion/branches/patch-exec/subversion/libsvn_fs_x/index.c
subversion/branches/patch-exec/subversion/libsvn_fs_x/lock.c
subversion/branches/patch-exec/subversion/libsvn_fs_x/revprops.c
subversion/branches/patch-exec/subversion/libsvn_fs_x/transaction.c
subversion/branches/patch-exec/subversion/libsvn_fs_x/util.c
subversion/branches/patch-exec/subversion/libsvn_ra_serf/serf.c
subversion/branches/patch-exec/subversion/libsvn_ra_serf/update.c
subversion/branches/patch-exec/subversion/libsvn_ra_serf/util.c
subversion/branches/patch-exec/subversion/libsvn_ra_svn/client.c
subversion/branches/patch-exec/subversion/libsvn_ra_svn/cram.c
subversion/branches/patch-exec/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/patch-exec/subversion/libsvn_ra_svn/deprecated.c
subversion/branches/patch-exec/subversion/libsvn_ra_svn/editorp.c
subversion/branches/patch-exec/subversion/libsvn_ra_svn/internal_auth.c
subversion/branches/patch-exec/subversion/libsvn_ra_svn/marshal.c
subversion/branches/patch-exec/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/patch-exec/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/patch-exec/subversion/libsvn_repos/load.c
subversion/branches/patch-exec/subversion/libsvn_repos/log.c
subversion/branches/patch-exec/subversion/libsvn_repos/repos.c
subversion/branches/patch-exec/subversion/libsvn_repos/rev_hunt.c
subversion/branches/patch-exec/subversion/libsvn_subr/atomic.c
subversion/branches/patch-exec/subversion/libsvn_subr/auth.c
subversion/branches/patch-exec/subversion/libsvn_subr/auth.h
subversion/branches/patch-exec/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/patch-exec/subversion/libsvn_subr/checksum.c
subversion/branches/patch-exec/subversion/libsvn_subr/config_auth.c
subversion/branches/patch-exec/subversion/libsvn_subr/deprecated.c
subversion/branches/patch-exec/subversion/libsvn_subr/io.c
subversion/branches/patch-exec/subversion/libsvn_subr/stream.c
subversion/branches/patch-exec/subversion/libsvn_subr/subst.c
subversion/branches/patch-exec/subversion/libsvn_subr/sysinfo.c
subversion/branches/patch-exec/subversion/libsvn_subr/utf.c
subversion/branches/patch-exec/subversion/libsvn_subr/utf8proc.c
subversion/branches/patch-exec/subversion/libsvn_subr/utf8proc/utf8proc.h
subversion/branches/patch-exec/subversion/libsvn_subr/x509parse.c
subversion/branches/patch-exec/subversion/libsvn_subr/xml.c
subversion/branches/patch-exec/subversion/libsvn_wc/adm_crawler.c
subversion/branches/patch-exec/subversion/libsvn_wc/copy.c
subversion/branches/patch-exec/subversion/libsvn_wc/entries.c
subversion/branches/patch-exec/subversion/libsvn_wc/node.c
subversion/branches/patch-exec/subversion/libsvn_wc/update_editor.c
subversion/branches/patch-exec/subversion/libsvn_wc/upgrade.c
subversion/branches/patch-exec/subversion/libsvn_wc/wc_db.c
subversion/branches/patch-exec/subversion/libsvn_wc/wc_db.h
subversion/branches/patch-exec/subversion/libsvn_wc/wc_db_pristine.c
subversion/branches/patch-exec/subversion/libsvn_wc/wc_db_util.c
subversion/branches/patch-exec/subversion/libsvn_wc/workqueue.c
subversion/branches/patch-exec/subversion/mod_dav_svn/activity.c
subversion/branches/patch-exec/subversion/po/it.po
subversion/branches/patch-exec/subversion/svn/cl.h
subversion/branches/patch-exec/subversion/svn/conflict-callbacks.c
subversion/branches/patch-exec/subversion/svn/lock-cmd.c
subversion/branches/patch-exec/subversion/svn/resolve-cmd.c
subversion/branches/patch-exec/subversion/svn/svn.c
subversion/branches/patch-exec/subversion/svn/unlock-cmd.c
subversion/branches/patch-exec/subversion/svn_private_config.hw
subversion/branches/patch-exec/subversion/svnadmin/svnadmin.c
subversion/branches/patch-exec/subversion/svnbench/null-export-cmd.c
subversion/branches/patch-exec/subversion/svnbench/svnbench.c
subversion/branches/patch-exec/subversion/svndumpfilter/svndumpfilter.c
subversion/branches/patch-exec/subversion/svnfsfs/load-index-cmd.c
subversion/branches/patch-exec/subversion/svnfsfs/stats-cmd.c
subversion/branches/patch-exec/subversion/svnmucc/svnmucc.c
subversion/branches/patch-exec/subversion/svnrdump/svnrdump.c
subversion/branches/patch-exec/subversion/svnserve/cyrus_auth.c
subversion/branches/patch-exec/subversion/svnserve/serve.c
subversion/branches/patch-exec/subversion/svnserve/svnserve.c
subversion/branches/patch-exec/subversion/tests/cmdline/authz_tests.py
subversion/branches/patch-exec/subversion/tests/cmdline/lock_tests.py
subversion/branches/patch-exec/subversion/tests/cmdline/merge_automatic_tests.py
subversion/branches/patch-exec/subversion/tests/cmdline/revert_tests.py
subversion/branches/patch-exec/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/patch-exec/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/patch-exec/subversion/tests/cmdline/svntest/actions.py
subversion/branches/patch-exec/subversion/tests/cmdline/svntest/main.py
subversion/branches/patch-exec/subversion/tests/cmdline/update_tests.py
subversion/branches/patch-exec/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/patch-exec/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/patch-exec/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
subversion/branches/patch-exec/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
subversion/branches/patch-exec/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
subversion/branches/patch-exec/subversion/tests/libsvn_ra/ra-test.c
subversion/branches/patch-exec/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/patch-exec/subversion/tests/libsvn_subr/checksum-test.c
subversion/branches/patch-exec/subversion/tests/libsvn_subr/io-test.c
subversion/branches/patch-exec/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/patch-exec/subversion/tests/libsvn_wc/wc-queries-test.c
subversion/branches/patch-exec/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
subversion/branches/patch-exec/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
subversion/branches/patch-exec/tools/buildbot/slaves/svn-x64-macosx/
(props changed)
subversion/branches/patch-exec/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
subversion/branches/patch-exec/tools/client-side/bash_completion
subversion/branches/patch-exec/tools/client-side/svn-mergeinfo-normalizer/
(props changed)
subversion/branches/patch-exec/tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c
subversion/branches/patch-exec/tools/client-side/svn-mergeinfo-normalizer/logic.c
subversion/branches/patch-exec/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
subversion/branches/patch-exec/tools/client-side/svn-mergeinfo-normalizer/missing-branches.c
subversion/branches/patch-exec/tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c
subversion/branches/patch-exec/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
subversion/branches/patch-exec/tools/dev/unix-build/Makefile.svn
subversion/branches/patch-exec/tools/dev/x509-parser.c
subversion/branches/patch-exec/tools/dist/backport.pl
subversion/branches/patch-exec/tools/dist/templates/rc-news.ezt
subversion/branches/patch-exec/tools/dist/templates/rc-release-ann.ezt
subversion/branches/patch-exec/tools/dist/templates/stable-news.ezt
subversion/branches/patch-exec/tools/dist/templates/stable-release-ann.ezt
subversion/branches/patch-exec/win-tests.py
Propchange: subversion/branches/patch-exec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 18 01:38:47 2015
@@ -94,4 +94,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1692717-1696512
+/subversion/trunk:1692717-1703734
Propchange: subversion/branches/patch-exec/
------------------------------------------------------------------------------
tsvn:projectlanguage = 1033
Modified: subversion/branches/patch-exec/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/patch-exec/CHANGES?rev=1703735&r1=1703734&r2=1703735&view=diff
==============================================================================
--- subversion/branches/patch-exec/CHANGES (original)
+++ subversion/branches/patch-exec/CHANGES Fri Sep 18 01:38:47 2015
@@ -1,3 +1,61 @@
+Version 1.9.2
+(30 Sep 2015, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.2
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * svn: fix crash when saving credentials in kwallet (r1700740, r1700951)
+ * checkout/update: fix "access denied" error on Windows (r1701064 et al)
+ * update: fix crash when updating a conflicted tree (r1702198, r1702200)
+ * commit: fix possible crash (r1702231)
+ * ra_serf: do not crash on unexpected 'X-SVN-VR-Base' headers (r1702288)
+ * merge: fix crash when merging to a local add (r1702299 et al)
+ * svnmucc: fix error during propset+put for existing file (r1702467 et al)
+ * update: fix crash without .svn/tmp folder (r1701838, r1702203)
+ * checkout: remove unnecessary I/O operation (r1701638)
+ * merge: fix possible crash (r1701997)
+ * update: fix crash with some of the incoming deletes (r1702247)
+ * upgrade: fix crash for pre-1.3 wc with externals (r1702218 et al)
+ * revert: fix crash when reverting the root of a move (r1702237 et al)
+ * svn: do not crash upon specific database corruptions (r1702974, r1702991)
+
+ - Server-side bugfixes:
+ * fix reporting for empty representations in svnfsfs stats (r1698312 et al)
+
+ Developer-visible changes:
+ - API changes:
+ * disable unsupported operations for standard streams (r1701633 et al)
+
+Version 1.9.1
+(02 Sep 2015, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.1
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * Fix crash with GPG-agent with non-canonical $HOME (r1691928, issue #4584)
+ * Fix checkout errors with svn+ssh:// on Windows (r1696222, r1696225)
+ * svn: expose expat and zlib versions in svn --version --verbose
(r1696387, r1697664)
+ * svn: improve help text for 'svn info --show-item' (r1698106)
+
+ - Server-side bugfixes:
+ * svnserve: fixed minor typo in help text (r1694023)
+ * Enable caching with memcached on Windows (1674626, r1674785)
+ * Fix an error leak in FSFS verification (r1693886)
+ * Fix incomplete membuffer cache initialization (r1695022)
+ * svnfsfs: fix some bugs and inconsistencies in load-index (r1697381 et
al.)
+
+ - Client-side and server-side bugfixes:
+ * Fix alignment fault in ra_svn on 32 bit SPARC machines (r1697914)
+
+ - Bindings bugfixes:
+ * Fix memory corruption in copy source SWIG bindings (r1694929)
+
+ Developer-visible changes:
+ * Better configure-time detection of httpd version and authz fix (r1687304
et al.)
+ * Correct a parameter name in svn_repos_get_fs_build_parser5 (r1694194)
+ * Resolve circular library reference in libsvn_fs_x (r1696695)
+ * Fix Unix build on systems without GPG agent (r1694481, r1697824)
+
Version 1.9.0
(5 Aug 2015, from /branches/1.9.x)
http://svn.apache.org/repos/asf/subversion/tags/1.9.0
Modified: subversion/branches/patch-exec/COMMITTERS
URL:
http://svn.apache.org/viewvc/subversion/branches/patch-exec/COMMITTERS?rev=1703735&r1=1703734&r2=1703735&view=diff
==============================================================================
--- subversion/branches/patch-exec/COMMITTERS [UTF-8] (original)
+++ subversion/branches/patch-exec/COMMITTERS [UTF-8] Fri Sep 18 01:38:47 2015
@@ -164,7 +164,8 @@ Commit access for specific areas:
humbedooh Daniel Gruno <humbed...@apache.org> (svnpubsub)
prabhugs Prabhu Gnana Sundar <pprabh...@gmail.com>
(verify-keep-going)
schabi Markus Schaber <sch...@apache.org> (testsuite)
- gbg Gabriela Gibson <gabriela.gib...@gmail.com> (gtest)
+ gbg Gabriela Gibson <gabriela.gib...@gmail.com> (gtest)
+ luke1410 Stefan Hett <luke1...@gmx.de> (doc)
Translation of message files:
Modified: subversion/branches/patch-exec/INSTALL
URL:
http://svn.apache.org/viewvc/subversion/branches/patch-exec/INSTALL?rev=1703735&r1=1703734&r2=1703735&view=diff
==============================================================================
--- subversion/branches/patch-exec/INSTALL (original)
+++ subversion/branches/patch-exec/INSTALL Fri Sep 18 01:38:47 2015
@@ -22,7 +22,7 @@ Contents:
E. Building the Latest Source under Windows
III. BUILDING A SUBVERSION SERVER
- A. Setting Up Apache
+ A. Setting Up Apache Httpd
B. Making and Installing the Subversion Server
C. Configuring Apache for Subversion
D. Running and Testing
@@ -96,9 +96,9 @@ I. INTRODUCTION
These diff streams are used everywhere -- over the network,
in the repository, and in the client's working copy.
- * libserf (OPTIONAL for client)
+ * Apache Serf (OPTIONAL for client)
- The Serf library allows the Subversion client to send HTTP
+ The Apache Serf library allows the Subversion client to send HTTP
requests. This is necessary if you want your client to access
a repository served by the Apache HTTP server. There is an
alternate 'svnserve' server as well, though, and clients
@@ -110,7 +110,7 @@ I. INTRODUCTION
* OpenSSL (OPTIONAL for client and server)
OpenSSL enables your client to access SSL-encrypted https://
- URLs (using libserf) in addition to unencrypted http:// URLs.
+ URLs (using Apache Serf) in addition to unencrypted http:// URLs.
To use SSL with Subversion's WebDAV server, Apache needs to be
compiled with OpenSSL as well.
@@ -199,48 +199,6 @@ I. INTRODUCTION
Apache Portable Runtime (APR) and the APR Utility (APR-util)
libraries.
-
- ****************************************************************
- ** IMPORTANT ISSUE ABOUT APR VERSIONS: READ THIS **
- ** IF UPGRADING FROM MUCH OLDER SUBVERSION **
- ****************************************************************
- | |
- | APR 0.9.X and 1.X are binary-incompatible. |
- | |
- | This means: |
- | |
- | - if you are already using Subversion with APR 0.9.X, and |
- | then upgrade your libapr to 1.X without rebuilding |
- | Subversion, things will break and segfault. |
- | |
- | - if your Subversion server libraries are linked to one |
- | version of APR, but your Apache server is linked to a |
- | different version, things will break and segfault. |
- | |
- | Subversion distribution dependencies: |
- | ------------------------------------- |
- | |
- | For a long time, Subversion's main distribution contained |
- | APR and APR-UTIL (both 0.9.x), plus a few other things that |
- | we couldn't count on the installation system having. But |
- | nowadays, Subversion's requirements are no longer exotic, |
- | and so our main distribution contains just the Subversion |
- | source code itself -- people compiling Subversion are |
- | expected to either have the APR libraries already installed |
- | on their system, or to be capable of fetching them easily. |
- | |
- | Note that it's *perfectly* safe to use APR 1.X from the |
- | beginning. In fact, we recommend it. If you're building |
- | Subversion for the first time, there's no compatibility |
- | issue to worry about, so grab the latest version of APR. |
- | |
- | If you already have a Subversion installation using APR |
- | 0.9.x, it's still possible to move to APR 1.X safely. Just |
- | be sure to recompile Subversion (and Apache httpd if |
- | necessary) after upgrading APR! |
- |______________________________________________________________|
-
-
If you do not have a pre-installed APR and APR-util, you will need
to get these yourself:
@@ -313,11 +271,11 @@ I. INTRODUCTION
newer. The autogen.sh script knows about that.
- 5. Serf library 1.3.4 or newer (OPTIONAL)
+ 5. Apache Serf library 1.3.4 or newer (OPTIONAL)
If you want your client to be able to speak to an Apache
server (via a http:// or https:// URL), you must link against
- serf. Though optional, we strongly recommend this.
+ Apache Serf. Though optional, we strongly recommend this.
In order to use ra_serf, you must install serf, and run Subversion's
./configure with the argument --with-serf. If serf is installed in a
@@ -327,31 +285,31 @@ I. INTRODUCTION
instead.
- Serf can be obtained via your system's package distribution
+ Apache Serf can be obtained via your system's package distribution
system or directly from http://code.google.com/p/serf/.
- For more information on serf and Subversion's ra_serf, see the file
- subversion/libsvn_ra_serf/README.
+ For more information on Apache Serf and Subversion's ra_serf, see the
+ file subversion/libsvn_ra_serf/README.
6. OpenSSL (OPTIONAL)
- ### needs some updates. I think serf automagically handles
+ ### needs some updates. I think Apache Serf automagically handles
### finding OpenSSL, but we may need more docco here. and w.r.t
### zlib.
- The Serf library has support for SSL encryption by relying on the
+ The Apache Serf library has support for SSL encryption by relying on the
OpenSSL library.
- a. Using OpenSSL on the client through Serf
+ a. Using OpenSSL on the client through Apache Serf
- On Unix systems, to build Serf with OpenSSL, you need OpenSSL
+ On Unix systems, to build Apache Serf with OpenSSL, you need OpenSSL
installed on your system, and you must add "--with-ssl" as a
"./configure" parameter. If your OpenSSL installation is hard
- for Serf to find, you may need to use "--with-libs=/path/to/lib"
- in addition. In particular, on Red Hat (but not Fedora Core) it
- is necessary to specify "--with-libs=/usr/kerberos" for OpenSSL
- to be found. You can also specify a path to the zlib library
- using "--with-libs".
+ for Apache Serf to find, you may need to use
+ "--with-libs=/path/to/lib" in addition. In particular, on Red Hat
+ (but not Fedora Core) it is necessary to specify
+ "--with-libs=/usr/kerberos" for OpenSSL to be found. You can also
+ specify a path to the zlib library using "--with-libs".
Under Windows, you can specify the paths to these libraries by
passing the options --with-zlib and --with-openssl to gen-make.py.
@@ -716,27 +674,21 @@ II. INSTALLATION
D. Installing from a Zip or Installer File under Windows
- --------------------------------------------------------
+ -----------------------------------------------------
Of all the ways of getting a Subversion client, this is the
- easiest. Download a Zip (*.zip) or self-extracting installer
- (*-setup.exe) file from:
+ easiest. Download a Zip or self-extracting installer via:
- http://subversion.apache.org/packages#windows
+ http://subversion.apache.org/packages.html#windows
- For a Zip file, run your unzipping utility (WinZIP, ZipGenius,
- UltimateZIP, FreeZIP, whatever) and extract the DLLs and EXEs to
- a directory of your choice. Included in the download is the SVN
- client, the SVNADMIN administration tool, and the SVNLOOK
- reporting tool.
-
- Note that if you need support for non-English locales you'll have
- to set the APR_ICONV_PATH environment variable to the path of the
- iconv directory in the folder that contains the Subversion install.
-
- You may also want to add the bin directory in the Subversion folder
- to your PATH environment variable so as to not have to use the full
- path when running Subversion commands.
+ For a Zip file extract the DLLs and EXEs to a directory of your
+ choice. Included in the download are among other tools the SVN
+ client, the SVNADMIN administration tool and the SVNLOOK reporting
+ tool.
+
+ You may want to add the bin directory in the Subversion folder to your
+ PATH environment variable so as to not have to use the full path when
+ running Subversion commands.
To test the installation, open a DOS box (run either "cmd" or
"command" from the Start menu's "Run..." menu option), change to
@@ -755,58 +707,41 @@ II. INSTALLATION
E.1 Prerequisites
- * Visual Studio 6 and service pack. It can be built with later versions
- of Visual Studio (Visual Studio.NET 2005-2015, Visual C++ Express
- 2005-2010, Visual Studio Express 2012-2013 and Visual Studio Community
- 2013-2015) but these instructions assume VS6.
- * A recent Windows SDK. (Not needed with Visual Studio 2005 and later)
- If you are using Visual Studio 6, you need the latest SDK which
- is compatible with VC6, which is the one from February 2003.
- You can get it from MSDN:
-
https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/e1147034-9b0b-4494-a5bc-6dfebb6b7eb1/download-and-install-microsoft-platform-sdk-febuary-2003-last-version-with-vc6-support?forum=windowssdk
+ * Microsoft Visual Studio. Any recent (2005+) version containing the
+ Visual C++ component will work (E.g. Professional, Express, Community
+ Edition). Make sure you enable C++ support during setup.
* Python 2.7 or higher, downloaded from http://www.python.org/ which is
used to generate the project files.
Note that Python 3.x is not supported (yet).
- * Perl 5.8 or higher from http://www.activestate.com/
+ * Perl 5.8 or higher from http://www.perl.org/get.html
* Awk (from http://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe) is
- needed to compile Apache or APR. Note that this is the actual awk
- program, not an installer - just rename it to awk.exe and it is
- ready to use.
+ needed to compile Apache or APR without using CMake. Note that this
+ is the actual awk program, not an installer - just rename it to
+ awk.exe and it is ready to use.
* Apache apr, apr-util, and optionally apr-iconv libraries, version
- 1.3 or later. Included in both the Subversion dependencies ZIP file
- and the Apache 2 source zip. If you are building from a Subversion
+ 1.3 or later (1.2 for apr-iconv). If you are building from a Subversion
checkout and have not downloaded Apache 2, then get these 3 libraries
from http://www.apache.org/dist/apr/.
* SQLite 3.7.12 or higher from http://www.sqlite.org/download.html
- * ZLib 1.2 or higher is required and is included in the Subversion
- dependencies zip file or can be obtained from http://www.zlib.net/
- * Either a Subversion client binary from http://subversion.apache.org/ to
- do the initial checkout of the Subversion source or the zip file
- source distribution. See the section "Bootstrapping from a Zip or
- Installer File under Windows" above for more.
- * A means of unpacking the files, e.g., WinZIP or similar.
+ (3.8.0 or higher recommended)
+ * ZLib 1.2 or higher is required and can be obtained from
+ http://www.zlib.net/
+ * Either a Subversion client binary from
+ http://subversion.apache.org/packages.html to do the initial checkout
+ of the Subversion source or the zip file source distribution.
Additional Options
- * [Optional] Apache 2 source, downloaded from
+ * [Optional] Apache Httpd 2 source, downloaded from
http://httpd.apache.org/download.cgi, these instructions assume
version 2.0.58. This is only needed for building the Subversion
server Apache modules. ### FIXME Apache 2.2 or greater required.
- * [Optional] Apache 2 msi install file, also from
- http://httpd.apache.org/download.cgi (required for running the
- tests). Only needed for testing the server dso modules and if
- you are using Visual Studio 6.
- Note that if you are not using Visual Studio 6 (and you want to
- run and test the server modules) then you must rebuild Apache
- from source -- do not use the stock MSI since mixing C runtime
- libraries is not supported.
- * [Optional] Berkeley DB for backend support of the server
- components -- versions 4.3.27 and 4.4.20 are available from
- http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=688
- as db-4.3.27-win32.zip and db-4.4.20-win32.zip.
+ * [Optional] Berkeley DB for backend support of the server components
+ are available from
+
http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index-082944.html
+ (Version 4.4.20 or in specific cases some higher version recommended)
For more information see Section I.C.7.
- * [Optional] Openssl 0.9.7f or higher can be obtained from
- http://www.openssl.org/source/openssl-0.9.7f.tar.gz
+ * [Optional] Openssl can be obtained from http://www.openssl.org/source/
* [Optional] A modified version of GNU libintl, called
svn-win32-libintl.zip, can be used for displaying localized
messages. Available at:
@@ -816,14 +751,11 @@ II. INSTALLATION
binaries from http://gnuwin32.sourceforge.net/. You'll need the
binaries (gettext-0.14.1-bin.zip) and dependencies
(gettext-0.14.1-dep.zip).
- * [Optional] An assembler, e.g., MASM32 from http://www.masm32.com/
- or nasm which is available from
- http://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D
E.2 Notes
- The Serf library supports secure connections with OpenSSL and
- on-the-wire compression with zlib. If you want to use the
+ The Apache Serf library supports secure connections with OpenSSL
+ and on-the-wire compression with zlib. If you want to use the
secure connections feature, you should pass the option
"--with-openssl" to the gen-make.py script. See Section I.C.6 for
more details.
@@ -844,35 +776,17 @@ II. INSTALLATION
installer to register environment variables or run VCVARS32.BAT
before building anything. If you are using a newer Visual Studio,
use the 'Visual Studio 20xx Command Prompt' on the Start menu.
- * Install and register a recent Windows Core SDK if you are using
- Visual Studio 6. This is a quote from the Microsoft February 2003
- SDK documentation:
-
- "To register the SDK bin, include, and library directories with
- Microsoft Visual Studio® version 6.0 and Visual Studio .NET,
- click Start, point to All Programs, point to Microsoft Platform
- SDK February 2003, point to Visual Studio Registration, and then
- click Register PSDK Directories with Visual Studio. This
- registration process places the SDK bin, include, and library
- directories at the beginning of the search paths, which ensures
- that the latest headers and libraries are used when building
- applications in the IDE. Note that for Visual Studio 6.0
- integration to succeed, Visual Studio 6.0 must run at least once
- before you select Register PSDK Directories with Visual
- Studio. Also note that when this option is run, the IDEs should
- not be running."
-
- * Install Python and add it to your path
+ * Install Python and add it to your path
* Install Perl (it should add itself to the path)
+ ### Subversion doesn't need perl. Only some dependencies need it
+ (openssl and some apr scripts)
* Copy AWK (awk95.exe) to awk.exe (e.g. SVN\awk\awk.exe) and add
the directory containing it (e.g. SVN\awk) to the path.
- * [Optional] Install Apache 2 using the msi file if you are going to test
- the server dso modules and are using Visual Studio 6. You must build
- and install it from source if you are not using Visual Studio 6 and
- want to build and/or test the server modules.
+ ### Subversion doesn't need awk. Only some dependencies need it
+ (some apr scripts)
* [Optional] If you checked out Subversion from the repository and want
to build Subversion with http/https access support then install the
- serf sources into SVN\src-trunk\serf.
+ Apache Serf sources into SVN\src-trunk\serf.
* [Optional] If you want BDB backend support, extract the Berkeley DB
files into SVN\src-trunk\db4-win32. It's a good idea to add
SVN\src-trunk\db4-win32\bin to your PATH, so that Subversion can find
@@ -888,6 +802,7 @@ II. INSTALLATION
SVN\src-trunk\db4-win32\include, and all the import libraries to
SVN\src-trunk\db4-win32\lib. Again, the DLLs should be somewhere in
your path.
+ ### Just use --with-serf instead of the hardcoded path
* [Optional] If you want to build the server modules, extract Apache
source into SVN\httpd-2.x.x.
@@ -900,22 +815,22 @@ II. INSTALLATION
- Extract the apr, apr-util and apr-iconv directories from the
srclib folder in the Apache httpd source into SVN\apr,
SVN\apr-util, and SVN\apr-iconv respectively.
+ ### Just use --with-apr, etc. instead of the hardcoded paths
* Extract the ZLib sources into SVN\zlib if you are not using the zlib
included in the dependencies zip file.
- * [Optional] If you want secure connection (https) client support, or if
- you are building with enabled support for serf extract openssl into
- SVN\openssl-x.x.x
+ ### Just use --with-zlib instead of the hardcoded path
+ * [Optional] If you want secure connection (https) client support extract
+ openssl into SVN\openssl-x.x.x
+ ### And pass the path to both serf and gen-make.py
* [Optional] If you want localized message support, extract
svn-win32-libintl.zip into SVN\svn-win32-libintl and extract
gettext-x.x.x-bin.zip and gettext-x.x.x-dep.zip into
SVN\gettext-x.x.x-bin.
- Add SVN\gettext-x.x.x-bin\bin to your path.
- * [Optional] Extract MASM32 (only the ML.EXE and ML.ERR files) into
- SVN\asm (or extract nasm into SVN\asm) and put it in your path.
- * Download the SQLite amalgemation from
+ Add SVN\gettext-x.x.x-bin\bin to your path.
+ * Download the SQLite amalgamation from
http://www.sqlite.org/download.html
- and extract it into SVN\sqlite-amalgemation.
- See I.C.12 for alternatives to using the amalgemation package.
+ and extract it into SVN\sqlite-amalgamation.
+ See I.C.12 for alternatives to using the amalgamation package.
E.4 Building the Binaries
@@ -962,14 +877,8 @@ II. INSTALLATION
This step is only required for building the server dso modules.
- The Subversion gen-make.py script must be run before building Apache or
- Apache and Subversion will be running incompatible versions of apr.
+ ### FIXME Apache 2.2 or greater required. Old build instructions for VC6.
- C:>cd src-%DIR%
- C:>python gen-make.py -t dsp --with-httpd=..\httpd-2.0.58
- --with-berkeley-db=db4-win32 --with-openssl=..\openssl-0.9.7f
- --with-zlib=..\zlib --with-libintl=..\svn-win32-libintl
- C:>cd ..
C:>set APACHEDIR=C:\Program Files\Apache Group\Apache2
C:>msdev httpd-2.0.58\apache.dsw /MAKE "BuildBin - Win32 Release"
@@ -998,11 +907,11 @@ II. INSTALLATION
Note that you'd make sure to define ZLIB_WINAPI in the ZLib config
header and move the lib-file into the zlib root-directory.
- Serf
+ Apache Serf
- ### Section about serf might be required/useful to add.
- ### scons is required too and serf needs to be configured prior to be
- ### able to build Subversion using:
+ ### Section about Apache Serf might be required/useful to add.
+ ### scons is required too and Apache Serf needs to be configured prior to
+ ### be able to build Subversion using:
### scons APR=[PATH_TO_APR] APU=[PATH_TO_APU] OPENSSL=[PATH_TO_OPENSSL]
### ZLIB=[PATH_TO_ZLIB] PREFIX=[PATH_TO_SERF_DEST]
### scons check
@@ -1019,32 +928,19 @@ II. INSTALLATION
the APR libraries; the options are --with-apr, --with-apr-util and
--with-apr-iconv.
* If you would like a debug build substitute Debug for Release in
- the msdev/msbuild commands.
+ the devenv/msbuild commands.
* There have been rumors that Subversion on Win32 can be built
using the latest cygwin, you probably don't want the zip file source
distribution though. ymmv.
- * The /USEENV switch to msdev makes it take notice of the INCLUDE and
- LIB environment variables, it also makes it ignore its own lib and
- include settings so you need to have the Windows SDK lib and include
- directories in the LIB and INCLUDE environment variables. Do *not*
- use this switch when starting up the msdev Visual environment. If you
- wish to build in the Visual environment the SDK lib and include
- directories must be in the Tools/Options/Directories settings (if you
- followed the 'Register the SDK with Visual Studio 6' instructions
- above this has been done for you).
- * If you are using Visual Studio later than VC6 change -t dsw into
- -t vcproj and add the --vsnet-version=20xx option on the gen-make.py
- command.
- In this case you will also have to distribute the C runtime dll with
- the binaries. Also, since Apache/APR do not provide .vcproj files,
- you will need to convert the Apache/APR .dsp files to .vcproj files
- with Visual Studio before building -- just open the Apache .dsw file
- and answer 'Yes To All' when the conversion dialog pops up, or you
- can open the individual .dsp files and convert them one at a time.
+ * You will also have to distribute the C runtime dll with the binaries.
+ Also, since Apache/APR do not provide .vcproj files, you will need to
+ convert the Apache/APR .dsp files to .vcproj files with Visual Studio
+ before building -- just open the Apache .dsw file and answer 'Yes To
+ All' when the conversion dialog pops up, or you can open the individual
+ .dsp files and convert them one at a time.
The Apache/APR projects required by Subversion are:
apr-util\libaprutil.dsp, apr\libapr.dsp,
apr-iconv\libapriconv.dsp, apr-util\xml\expat\lib\xml.dsp,
- apr-util\uri\gen_uri_delims.dsp (for APR 0.9.x),
apr-iconv\ccs\libapriconv_ccs_modules.dsp, and
apr-iconv\ces\libapriconv_ces_modules.dsp.
* If the server dso modules are being built and tested Apache must not
@@ -1056,23 +952,12 @@ II. INSTALLATION
gen-make.py will already have been run. If the source is from the zip
file, Apache 2 has not been built so gen-make.py must be run:
- C:>python gen-make.py -t dsp --with-berkeley-db=db4-win32
- --with-openssl=..\openssl-0.9.7f --with-zlib=..\zlib
+ C:>python gen-make.py --vsnet-version=20xx --with-berkeley-db=db4-win32
+ --with-openssl=..\openssl --with-zlib=..\zlib
--with-libintl=..\svn-win32-libintl
Then build subversion:
- C:>msdev subversion_msvc.dsw /USEENV /MAKE "__ALL_TESTS__ - Win32
Release"
- C:>cd ..
-
- Or, with Visual C++.NET 2005 or C++ Express 2005:
-
- C:>devenv subversion_vcnet.sln /build "Release" /project "__ALL_TESTS__"
- C:>cd ..
-
- Or, with Visual C++.NET 2008+, C++ Express 2008+, Studio Express 2012+ or
- Studio Community 2013+:
-
C:>msbuild subversion_vcnet.sln /t:__ALL_TESTS__ /p:Configuration=Release
C:>cd ..
@@ -1164,39 +1049,19 @@ III. BUILDING A SUBVERSION SERVER
svnserve instead, jump right to section E for a quick explanation.
- A. Setting Up Apache
- -----------------
+ A. Setting Up Apache Httpd
+ -----------------------
- 1. Obtaining and Installing Apache 2
+ 1. Obtaining and Installing Apache Httpd 2
Subversion tries to compile against the latest released version
- of Apache httpd 2.X. The easiest thing for you to do is download
+ of Apache httpd 2.2+. The easiest thing for you to do is download
a source tarball of the latest release and unpack that.
-
- ****************************************************************
- ** IMPORTANT ISSUE ABOUT APACHE VERSIONS: READ THIS. **
- ** **
- ****************************************************************
- | |
- | First, be sure to read the APR version warning box, back in |
- | section I.C.1, which explains that APR 0.9.x and 1.X are |
- | binary-incompatible. |
- | |
- | Apache HTTPD 2.0 uses APR 0.9.x. |
- | Apache HTTPD 2.2 uses APR 1.2.x. |
- | |
- | We recommend using the latest Apache. However, whatever |
- | version you choose, you *must* ensure that Subversion |
- | and Apache are using the same version of APR. If you don't, |
- | things will segfault and break. |
- |______________________________________________________________|
-
-
- If you have questions about the Apache httpd 2.0 build, please consult
+ If you have questions about the Apache httpd 2.2 build, please consult
the httpd install documentation:
- http://httpd.apache.org/docs-2.0/install.html
+ http://httpd.apache.org/docs-2.2/install.html
At the top of the httpd tree:
@@ -1242,7 +1107,7 @@ III. BUILDING A SUBVERSION SERVER
---------------------------------------------------------
Go back into your subversion working copy and run ./autogen.sh if
- you need to. Then, assuming Apache httpd 2.0 is installed in the
+ you need to. Then, assuming Apache httpd 2.2 is installed in the
standard location, run:
$ ./configure
@@ -1252,7 +1117,7 @@ III. BUILDING A SUBVERSION SERVER
look for other libsvn_*.so libraries on your system.
If you see a warning message that the build of mod_dav_svn is
- being skipped, this may be because you have Apache httpd 2.X
+ being skipped, this may be because you have Apache httpd 2.x
installed in a non-standard location. You can use the
"--with-apxs=" option to locate the apxs script:
@@ -1279,8 +1144,8 @@ III. BUILDING A SUBVERSION SERVER
Section II.E explains how to build the server on Windows.
- C. Configuring Apache for Subversion
- ---------------------------------
+ C. Configuring Apache Httpd for Subversion
+ ---------------------------------------
The following section is an abbreviated version of the
information in the Subversion Book
@@ -1294,7 +1159,7 @@ III. BUILDING A SUBVERSION SERVER
/usr/local/apache2/conf/httpd.conf to reflect your setup.
At a minimum you should look at the User, Group and ServerName
directives. Full details on setting up apache can be found at:
- http://httpd.apache.org/docs-2.0/
+ http://httpd.apache.org/docs-2.2/
First, your httpd.conf needs to load the mod_dav_svn module.
If you pass --enable-mod-activation to Subversion's configure,
@@ -1348,6 +1213,7 @@ III. BUILDING A SUBVERSION SERVER
Require group svn_readers
</Limit>
+ ### FIXME Tutorials section refers to old 2.0 docs
These are only a few simple examples. For a complete tutorial
on Apache access control, please consider taking a look at the
tutorials found under "Security" on the following page:
@@ -1374,7 +1240,7 @@ III. BUILDING A SUBVERSION SERVER
NOTE: If you are unfamiliar with an Apache directive, or not exactly
sure about what it does, don't hesitate to look it up in the
- documentation: http://httpd.apache.org/docs-2.0/mod/directives.html.
+ documentation: http://httpd.apache.org/docs-2.2/mod/directives.html.
NOTE: Make sure that the user 'nobody' (or whatever UID the
httpd process runs as) has permission to read and write the
Modified: subversion/branches/patch-exec/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/patch-exec/build.conf?rev=1703735&r1=1703734&r2=1703735&view=diff
==============================================================================
--- subversion/branches/patch-exec/build.conf (original)
+++ subversion/branches/patch-exec/build.conf Fri Sep 18 01:38:47 2015
@@ -282,7 +282,8 @@ path = subversion/libsvn_fs_base
sources = *.c bdb/*.c util/*.c
install = bdb-lib
libs = libsvn_delta libsvn_subr aprutil apriconv apr bdb libsvn_fs_util
-msvc-static = yes
+msvc-export = ../libsvn_fs_base/fs_init.h
+msvc-delayload = yes
[libsvn_fs_fs]
description = Subversion FSFS Repository Filesystem Library
@@ -290,7 +291,8 @@ type = fs-module
path = subversion/libsvn_fs_fs
install = fsmod-lib
libs = libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs_util
-msvc-static = yes
+msvc-export = private/svn_fs_fs_private.h ../libsvn_fs_fs/fs_init.h
+msvc-delayload = yes
[libsvn_fs_x]
description = Subversion FSX Repository Filesystem Library
@@ -298,7 +300,8 @@ type = fs-module
path = subversion/libsvn_fs_x
install = fsmod-lib
libs = libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs_util
-msvc-static = yes
+msvc-export = ../libsvn_fs_x/fs_init.h
+msvc-delayload = yes
# Low-level grab bag of utilities
[libsvn_fs_util]
@@ -308,7 +311,7 @@ install = fsmod-lib
path = subversion/libsvn_fs_util
libs = libsvn_subr aprutil apriconv apr
msvc-libs = advapi32.lib shfolder.lib
-msvc-static = yes
+msvc-export = private/svn_fs_util.h
# General API for accessing repositories
[libsvn_ra]
@@ -321,6 +324,7 @@ add-deps = $(SVN_RA_LIB_DEPS)
add-install-deps = $(SVN_RA_LIB_INSTALL_DEPS)
install = lib
msvc-export = svn_ra.h private\svn_ra_private.h
+msvc-delayload = yes
# Accessing repositories via DAV through serf
[libsvn_ra_serf]
@@ -787,6 +791,7 @@ sources = fs-base-test.c
install = bdb-test
libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta
libsvn_fs_util libsvn_subr apriconv apr
+msvc-force-static = yes
[strings-reps-test]
description = Test strings/reps in libsvn_fs_base
@@ -796,6 +801,7 @@ sources = strings-reps-test.c
install = bdb-test
libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta
libsvn_subr apriconv apr
+msvc-force-static = yes
[changes-test]
description = Test changes in libsvn_fs_base
@@ -805,6 +811,7 @@ sources = changes-test.c
install = bdb-test
libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta
libsvn_subr apriconv apr
+msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_fs_fs
@@ -816,6 +823,7 @@ sources = fs-fs-pack-test.c
install = test
libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_subr apriconv apr
+msvc-force-static = yes
[fs-fs-fuzzy-test]
description = Use fuzzying to test FSFS corruption resilience
@@ -825,6 +833,7 @@ sources = fs-fs-fuzzy-test.c
install = sub-test
libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_repos libsvn_subr apriconv apr
+msvc-force-static = yes
[fs-fs-private-test]
description = Test FSSF private API
@@ -834,6 +843,7 @@ sources = fs-fs-private-test.c
install = test
libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_repos libsvn_subr apriconv apr
+msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_fs_x
@@ -845,6 +855,7 @@ sources = fs-x-pack-test.c
install = test
libs = libsvn_test libsvn_fs libsvn_fs_x libsvn_delta
libsvn_subr apriconv apr
+msvc-force-static = yes
[string-table-test]
description = Test fsfs string tables
@@ -853,6 +864,7 @@ path = subversion/tests/libsvn_fs_x
sources = string-table-test.c
install = test
libs = libsvn_test libsvn_fs_x libsvn_subr apr
+msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_fs
Modified: subversion/branches/patch-exec/build/ac-macros/swig.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/patch-exec/build/ac-macros/swig.m4?rev=1703735&r1=1703734&r2=1703735&view=diff
==============================================================================
--- subversion/branches/patch-exec/build/ac-macros/swig.m4 (original)
+++ subversion/branches/patch-exec/build/ac-macros/swig.m4 Fri Sep 18 01:38:47
2015
@@ -38,7 +38,7 @@ AC_DEFUN(SVN_CHECK_SWIG,
SVN_FIND_SWIG(no)
;;
"yes")
- SVN_FIND_SWIG(check)
+ SVN_FIND_SWIG(required)
;;
*)
SVN_FIND_SWIG($withval)
@@ -56,8 +56,11 @@ AC_DEFUN(SVN_FIND_SWIG,
if test $where = no; then
SWIG=none
- elif test $where = check; then
+ elif test $where = required || test $where = check; then
AC_PATH_PROG(SWIG, swig, none)
+ if test "$SWIG" = "none" && test $where = required; then
+ AC_MSG_ERROR([SWIG required, but not found])
+ fi
else
if test -f "$where"; then
SWIG="$where"
Modified: subversion/branches/patch-exec/build/generator/gen_base.py
URL:
http://svn.apache.org/viewvc/subversion/branches/patch-exec/build/generator/gen_base.py?rev=1703735&r1=1703734&r2=1703735&view=diff
==============================================================================
--- subversion/branches/patch-exec/build/generator/gen_base.py (original)
+++ subversion/branches/patch-exec/build/generator/gen_base.py Fri Sep 18
01:38:47 2015
@@ -590,6 +590,7 @@ class TargetLinked(Target):
self.external_lib = options.get('external-lib')
self.external_project = options.get('external-project')
self.msvc_libs = options.get('msvc-libs', '').split()
+ self.msvc_delayload_targets = []
def add_dependencies(self):
if self.external_lib or self.external_project:
@@ -690,6 +691,7 @@ class TargetLib(TargetLinked):
self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
self.msvc_static = options.get('msvc-static') == 'yes' # is a static lib
+ self.msvc_delayload = options.get('msvc-delayload') == 'yes' # Delay dll
load
self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
self.msvc_export = options.get('msvc-export', '').split()
Modified: subversion/branches/patch-exec/build/generator/gen_vcnet_vcproj.py
URL:
http://svn.apache.org/viewvc/subversion/branches/patch-exec/build/generator/gen_vcnet_vcproj.py?rev=1703735&r1=1703734&r2=1703735&view=diff
==============================================================================
--- subversion/branches/patch-exec/build/generator/gen_vcnet_vcproj.py
(original)
+++ subversion/branches/patch-exec/build/generator/gen_vcnet_vcproj.py Fri Sep
18 01:38:47 2015
@@ -55,18 +55,6 @@ class Generator(gen_win.WinGeneratorBase
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,
- proj_ext)
- if vcproj and not os.path.exists(vcproj):
- dspproj = gen_win.WinGeneratorBase.get_external_project(self, target,
- 'dsp')
- if os.path.exists(dspproj):
- return dspproj
-
- return vcproj
-
def write_project(self, target, fname, depends):
"Write a Project (.vcproj/.vcxproj)"
@@ -209,14 +197,23 @@ class Generator(gen_win.WinGeneratorBase
deplist = [ ]
for i in range(len(depends)):
- if depends[i].fname.startswith(self.projfilesdir):
- path = depends[i].fname[len(self.projfilesdir) + 1:]
+ dp = depends[i]
+ if dp.fname.startswith(self.projfilesdir):
+ path = dp.fname[len(self.projfilesdir) + 1:]
else:
path = os.path.join(os.path.relpath('.', self.projfilesdir),
- depends[i].fname)
+ dp.fname)
+
+ if isinstance(dp, gen_base.TargetLib) and dp.msvc_delayload \
+ and isinstance(target, gen_base.TargetLinked) \
+ and not self.disable_shared:
+ delayload = self.get_output_name(dp)
+ else:
+ delayload = None
deplist.append(gen_win.ProjectItem(guid=guids[depends[i].name],
index=i,
path=path,
+ delayload=delayload
))
fname = self.get_external_project(target, self.vcproj_extension[1:])
@@ -285,7 +282,4 @@ class Generator(gen_win.WinGeneratorBase
'guids' : guidvals,
}
- if self.vs_version == '2002' or self.vs_version == '2003':
- self.write_with_template('subversion_vcnet.sln',
'templates/vcnet_vc7_sln.ezt', data)
- else:
- self.write_with_template('subversion_vcnet.sln',
'templates/vcnet_sln.ezt', data)
+ self.write_with_template('subversion_vcnet.sln',
'templates/vcnet_sln.ezt', data)
Modified: subversion/branches/patch-exec/build/generator/gen_win.py
URL:
http://svn.apache.org/viewvc/subversion/branches/patch-exec/build/generator/gen_win.py?rev=1703735&r1=1703734&r2=1703735&view=diff
==============================================================================
--- subversion/branches/patch-exec/build/generator/gen_win.py (original)
+++ subversion/branches/patch-exec/build/generator/gen_win.py Fri Sep 18
01:38:47 2015
@@ -271,6 +271,7 @@ class WinGeneratorBase(gen_win_dependenc
'msvc-name' : dep.name + "_dll" },
self)
target.msvc_export = dep.msvc_export
+ target.msvc_delayload = dep.msvc_delayload
# move the description from the static library target to the dll.
target.desc = dep.desc
@@ -279,6 +280,7 @@ class WinGeneratorBase(gen_win_dependenc
# The dependency should now be static.
dep.msvc_export = None
dep.msvc_static = True
+ dep.msvc_delayload = False
# Remove the 'lib' prefix, so that the static library will be called
# svn_foo.lib
@@ -545,9 +547,7 @@ class WinGeneratorBase(gen_win_dependenc
and target.external_project):
return None
- if target.external_project[:5] == 'serf/' and 'serf' in self._libraries:
- path = self.serf_path + target.external_project[4:]
- elif target.external_project.find('/') != -1:
+ if target.external_project.find('/') != -1:
path = target.external_project
else:
path = os.path.join(self.projfilesdir, target.external_project)
Modified:
subversion/branches/patch-exec/build/generator/templates/vcnet_vcxproj.ezt
URL:
http://svn.apache.org/viewvc/subversion/branches/patch-exec/build/generator/templates/vcnet_vcxproj.ezt?rev=1703735&r1=1703734&r2=1703735&view=diff
==============================================================================
--- subversion/branches/patch-exec/build/generator/templates/vcnet_vcxproj.ezt
(original)
+++ subversion/branches/patch-exec/build/generator/templates/vcnet_vcxproj.ezt
Fri Sep 18 01:38:47 2015
@@ -75,6 +75,7 @@
<AdditionalDependencies>[for
configs.libs][configs.libs];[end]%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>[for
configs.libdirs][configs.libdirs];[end]%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
+ <DelayLoadDLLs>[for depends][if-any
depends.delayload][depends.delayload];[end][end]</DelayLoadDLLs>
<SubSystem>Console</SubSystem>
<EnableUAC>true</EnableUAC>
<OptimizeReferences>true</OptimizeReferences>
@@ -85,6 +86,7 @@
<AdditionalDependencies>[for
configs.libs][configs.libs];[end]%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>[for
configs.libdirs][configs.libdirs];[end]%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
+ <DelayLoadDLLs>[for depends][if-any
depends.delayload][depends.delayload];[end][end]</DelayLoadDLLs>
<IgnoreSpecificDefaultLibraries>[is configs.name
"Debug"]msvcrt.lib[end][is configs.name
"Release"]msvcrtd.lib[end]</IgnoreSpecificDefaultLibraries>
[if-any def_file] <ModuleDefinitionFile>[def_file]</ModuleDefinitionFile>
[end] </Link>
