Author: brane
Date: Mon Sep 10 17:19:31 2012
New Revision: 1382990
URL: http://svn.apache.org/viewvc?rev=1382990&view=rev
Log:
Make the extended version info retrieval a public API.
* subversion/include/svn_version.h: Include apr_tables.h.
(svn_version_extended_t): Move here, rename from svn_opt__version_info_t.
(svn_version_linked_lib_t): Move here, rename from svn_sysinfo__linked_lib_t.
(svn_version_loaded_lib_t): Move here, rename from svn_sysinfo__loaded_lib_t.
(svn_version_extended): Move here, rename from svn_opt__get_version_info.
* subversion/libsvn_subr/version.c: Include sysinfo.h.
(svn_version_extended): Move here, renamed and updated from
svn_opt__get_version_info.
* subversion/libsvn_subr/sysinfo.h
(svn_sysinfo__linked_lib_t, svn_sysinfo__loaded_lib_t): Moved and
renamed to subversion/include/svn_version.h.
(svn_sysinfo__linked_libs, svn_sysinfo__loaded_libs): Update docstring.
* subversion/libsvn_subr/sysinfo.c: Include svn_version.h.
(svn_sysinfo__linked_libs, svn_sysinfo__loaded_libs):
Update, using new type names.
* subversion/libsvn_subr/opt.h:
Include svn_version.h. Do not include apr_tables.h.
(svn_opt__version_info_t, svn_opt__get_version_info):
Moved and renamed to subversion/include/svn_version.h
(svn_opt__print_version_info): Update type name in prototype.
* subversion/libsvn_subr/opt.c: Do not include sysinfo.h.
(svn_opt__get_version_info): Moved and renamed to
subversion/libsvn_subr/version.c.
(svn_opt__print_version_info, svn_opt_print_help):
Update, use public svn_version_extended API.
* subversion/libsvn_subr/deprecated.c: Include svn_version.h.
(svn_opt_print_help): Update, use public svn_version_extended API.
* subversion/tests/cmdline/getopt_tests.py
(switch_res_line, switched_del_lines_res, switched_rep_lines_res):
New filters for extended version information.
(process_lines): Use the new filters.
(getopt__version__verbose): New test for "svn --version --verbose".
* subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout,
subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stderr: New.
Added:
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stderr
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
Modified:
subversion/trunk/subversion/include/svn_version.h
subversion/trunk/subversion/libsvn_subr/deprecated.c
subversion/trunk/subversion/libsvn_subr/opt.c
subversion/trunk/subversion/libsvn_subr/opt.h
subversion/trunk/subversion/libsvn_subr/sysinfo.c
subversion/trunk/subversion/libsvn_subr/sysinfo.h
subversion/trunk/subversion/libsvn_subr/version.c
subversion/trunk/subversion/tests/cmdline/getopt_tests.py
Modified: subversion/trunk/subversion/include/svn_version.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_version.h?rev=1382990&r1=1382989&r2=1382990&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_version.h (original)
+++ subversion/trunk/subversion/include/svn_version.h Mon Sep 10 17:19:31 2012
@@ -34,6 +34,7 @@
#ifndef APR_STRINGIFY
#include <apr_general.h>
#endif
+#include <apr_tables.h>
#include "svn_types.h"
@@ -256,6 +257,68 @@ const svn_version_t *
svn_subr_version(void);
+/**
+ * Extended version infomation, including info about the running system.
+ *
+ * @since New in 1.8.
+ */
+typedef struct svn_version_extended_t
+{
+ const char *version_number; /**< Version number */
+ const char *version_string; /**< Version string */
+ const char *build_date; /**< Compilation date */
+ const char *build_time; /**< Compilation time */
+ const char *build_host; /**< Build canonical host name */
+ const char *copyright; /**< Copyright notice (localized) */
+ const char *runtime_host; /**< Runtime canonical host name */
+ const char *runtime_osname; /**< Running OS release name */
+
+ /**
+ * Array svn_version_linked_lib_t describing dependent libraries.
+ */
+ const apr_array_header_t *linked_libs;
+
+ /**
+ * Array of svn_version_loaded_lib_t describing loaded shared libraries.
+ */
+ const apr_array_header_t *loaded_libs;
+} svn_version_extended_t;
+
+/**
+ * Dependent library information.
+ *
+ * @since New in 1.8.
+ */
+typedef struct svn_version_linked_lib_t
+{
+ const char *name; /**< Library name */
+ const char *compiled_version; /**< Compile-time version string */
+ const char *runtime_version; /**< Run-time version string (optional) */
+} svn_version_linked_lib_t;
+
+/**
+ * Loaded shared library information.
+ *
+ * @since New in 1.8.
+ */
+typedef struct svn_version_loaded_lib_t
+{
+ const char *name; /**< Library name */
+ const char *version; /**< Library version (optional) */
+} svn_version_loaded_lib_t;
+
+/**
+ * Return version information for the running program, If @a verbose
+ * is true, collect extra information about the runtime system (this
+ * can be an expensive operation). Use @a pool for all allocations.
+ *
+ * @since New in 1.8.
+ */
+const svn_version_extended_t *
+svn_version_extended(svn_boolean_t verbose,
+ apr_pool_t *pool);
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/libsvn_subr/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/deprecated.c?rev=1382990&r1=1382989&r2=1382990&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_subr/deprecated.c Mon Sep 10 17:19:31
2012
@@ -36,6 +36,7 @@
#include "svn_path.h"
#include "svn_opt.h"
#include "svn_cmdline.h"
+#include "svn_version.h"
#include "svn_pools.h"
#include "svn_dso.h"
#include "svn_mergeinfo.h"
@@ -606,8 +607,7 @@ svn_opt_print_help(apr_getopt_t *os,
else if (print_version) /* just --version */
{
SVN_ERR(svn_opt__print_version_info(pgm_name, version_footer,
- svn_opt__get_version_info(FALSE,
- pool),
+ svn_version_extended(FALSE, pool),
quiet, FALSE, pool));
}
else if (os && !targets->nelts) /* `-h', `--help', or `help' */
Modified: subversion/trunk/subversion/libsvn_subr/opt.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/opt.c?rev=1382990&r1=1382989&r2=1382990&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/opt.c (original)
+++ subversion/trunk/subversion/libsvn_subr/opt.c Mon Sep 10 17:19:31 2012
@@ -49,7 +49,6 @@
#include "private/svn_opt_private.h"
#include "opt.h"
-#include "sysinfo.h"
#include "svn_private_config.h"
@@ -1103,40 +1102,10 @@ svn_opt__arg_canonicalize_path(const cha
}
-const svn_opt__version_info_t *
-svn_opt__get_version_info(svn_boolean_t verbose,
- apr_pool_t *pool)
-{
- svn_opt__version_info_t *info = apr_pcalloc(pool, sizeof(*info));
-
- info->version_number = SVN_VER_NUMBER;
- info->version_string = SVN_VERSION;
- info->build_date = __DATE__;
- info->build_time = __TIME__;
- info->build_host = SVN_BUILD_HOST;
- info->copyright = apr_pstrdup
- (pool, _("Copyright (C) 2012 The Apache Software Foundation.\n"
- "This software consists of contributions made by many people;\n"
- "see the NOTICE file for more information.\n"
- "Subversion is open source software, see "
- "http://subversion.apache.org/\n";));
-
- if (verbose)
- {
- info->runtime_host = svn_sysinfo__canonical_host(pool);
- info->runtime_osname = svn_sysinfo__release_name(pool);
- info->linked_libs = svn_sysinfo__linked_libs(pool);
- info->loaded_libs = svn_sysinfo__loaded_libs(pool);
- }
-
- return info;
-}
-
-
svn_error_t *
svn_opt__print_version_info(const char *pgm_name,
const char *footer,
- const svn_opt__version_info_t *info,
+ const svn_version_extended_t *info,
svn_boolean_t quiet,
svn_boolean_t verbose,
apr_pool_t *pool)
@@ -1169,7 +1138,7 @@ svn_opt__print_version_info(const char *
if (info->linked_libs && info->linked_libs->nelts)
{
- const svn_sysinfo__linked_lib_t *lib;
+ const svn_version_linked_lib_t *lib;
int i;
SVN_ERR(svn_cmdline_fputs(_("* linked dependencies:\n"),
@@ -1177,7 +1146,7 @@ svn_opt__print_version_info(const char *
for (i = 0; i < info->linked_libs->nelts; ++i)
{
lib = &APR_ARRAY_IDX(info->linked_libs, i,
- svn_sysinfo__linked_lib_t);
+ svn_version_linked_lib_t);
if (lib->runtime_version)
SVN_ERR(svn_cmdline_printf(pool,
" - %s %s (compiled with %s)\n",
@@ -1194,7 +1163,7 @@ svn_opt__print_version_info(const char *
if (info->loaded_libs && info->loaded_libs->nelts)
{
- const svn_sysinfo__loaded_lib_t *lib;
+ const svn_version_loaded_lib_t *lib;
int i;
SVN_ERR(svn_cmdline_fputs(_("* loaded shared libraries:\n"),
@@ -1202,7 +1171,7 @@ svn_opt__print_version_info(const char *
for (i = 0; i < info->loaded_libs->nelts; ++i)
{
lib = &APR_ARRAY_IDX(info->loaded_libs, i,
- svn_sysinfo__loaded_lib_t);
+ svn_version_loaded_lib_t);
if (lib->version)
SVN_ERR(svn_cmdline_printf(pool,
" - %s (%s)\n",
@@ -1249,8 +1218,7 @@ svn_opt_print_help4(apr_getopt_t *os,
else if (print_version) /* just --version */
{
SVN_ERR(svn_opt__print_version_info(pgm_name, version_footer,
- svn_opt__get_version_info(verbose,
- pool),
+ svn_version_extended(verbose, pool),
quiet, verbose, pool));
}
else if (os && !targets->nelts) /* `-h', `--help', or `help' */
Modified: subversion/trunk/subversion/libsvn_subr/opt.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/opt.h?rev=1382990&r1=1382989&r2=1382990&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/opt.h (original)
+++ subversion/trunk/subversion/libsvn_subr/opt.h Mon Sep 10 17:19:31 2012
@@ -24,7 +24,7 @@
#ifndef SVN_LIBSVN_SUBR_OPT_H
#define SVN_LIBSVN_SUBR_OPT_H
-#include <apr_tables.h>
+#include "svn_version.h"
#include "svn_opt.h"
#ifdef __cplusplus
@@ -32,39 +32,6 @@ extern "C" {
#endif /* __cplusplus */
-/* This structure stores the available information about the version,
- * build and runtime environment of the Subversion client libraries.
- */
-typedef struct svn_opt__version_info_t svn_opt__version_info_t;
-struct svn_opt__version_info_t
-{
- const char *version_number; /* version number */
- const char *version_string; /* version string */
- const char *build_date; /* compilation date */
- const char *build_time; /* compilation time */
- const char *build_host; /* nuild canonical host name */
- const char *copyright; /* vopyright notice */
- const char *runtime_host; /* runtime canonical host name */
- const char *runtime_osname; /* running OS release name */
-
- /* Array svn_sysinfo__linked_lib_t describing dependent libraries */
- const apr_array_header_t *linked_libs;
-
- /* Array of svn_sysinfo__loaded_lib_t describing loaded shared libraries */
- const apr_array_header_t *loaded_libs;
-};
-
-
-/* Return version information for the running program, allocated from
- * POOL. If VERBOSE is true, collect extra information about the
- * runtime system. This can be expensive.
- *
- * Use POOL for temporary allocations.
- */
-const svn_opt__version_info_t *
-svn_opt__get_version_info(svn_boolean_t verbose,
- apr_pool_t *pool);
-
/* Print version version info for PGM_NAME to the console. If QUIET is
* true, print in brief. Else if QUIET is not true, print the version
* more verbosely, and if FOOTER is non-null, print it following the
@@ -75,7 +42,7 @@ svn_opt__get_version_info(svn_boolean_t
svn_error_t *
svn_opt__print_version_info(const char *pgm_name,
const char *footer,
- const svn_opt__version_info_t *info,
+ const svn_version_extended_t *info,
svn_boolean_t quiet,
svn_boolean_t verbose,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_subr/sysinfo.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sysinfo.c?rev=1382990&r1=1382989&r2=1382990&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sysinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sysinfo.c Mon Sep 10 17:19:31 2012
@@ -47,6 +47,7 @@
#include "svn_io.h"
#include "svn_string.h"
#include "svn_utf.h"
+#include "svn_version.h"
#include "private/svn_sqlite.h"
@@ -124,20 +125,20 @@ svn_sysinfo__release_name(apr_pool_t *po
const apr_array_header_t *
svn_sysinfo__linked_libs(apr_pool_t *pool)
{
- svn_sysinfo__linked_lib_t *lib;
+ svn_version_linked_lib_t *lib;
apr_array_header_t *array = apr_array_make(pool, 3, sizeof(*lib));
- lib = &APR_ARRAY_PUSH(array, svn_sysinfo__linked_lib_t);
+ lib = &APR_ARRAY_PUSH(array, svn_version_linked_lib_t);
lib->name = "APR";
lib->compiled_version = APR_VERSION_STRING;
lib->runtime_version = apr_pstrdup(pool, apr_version_string());
- lib = &APR_ARRAY_PUSH(array, svn_sysinfo__linked_lib_t);
+ lib = &APR_ARRAY_PUSH(array, svn_version_linked_lib_t);
lib->name = "APR-Util";
lib->compiled_version = APU_VERSION_STRING;
lib->runtime_version = apr_pstrdup(pool, apu_version_string());
- lib = &APR_ARRAY_PUSH(array, svn_sysinfo__linked_lib_t);
+ lib = &APR_ARRAY_PUSH(array, svn_version_linked_lib_t);
lib->name = "SQLite";
lib->compiled_version = apr_pstrdup(pool, svn_sqlite__compiled_version());
#ifdef SVN_SQLITE_INLINE
@@ -829,7 +830,7 @@ win32_shared_libs(apr_pool_t *pool)
filename = wcs_to_utf8(buffer, pool);
if (filename)
{
- svn_sysinfo__loaded_lib_t *lib;
+ svn_version_loaded_lib_t *lib;
char *truename;
if (0 == apr_filepath_merge(&truename, "", filename,
@@ -842,7 +843,7 @@ win32_shared_libs(apr_pool_t *pool)
{
array = apr_array_make(pool, 32, sizeof(*lib));
}
- lib = &APR_ARRAY_PUSH(array, svn_sysinfo__loaded_lib_t);
+ lib = &APR_ARRAY_PUSH(array, svn_version_loaded_lib_t);
lib->name = filename;
lib->version = version;
}
@@ -1062,7 +1063,7 @@ macos_shared_libs(apr_pool_t *pool)
const char *filename = _dyld_get_image_name(i);
const char *version;
char *truename;
- svn_sysinfo__loaded_lib_t *lib;
+ svn_version_loaded_lib_t *lib;
if (!(header && filename))
break;
@@ -1100,7 +1101,7 @@ macos_shared_libs(apr_pool_t *pool)
{
result = apr_array_make(pool, 32, sizeof(*lib));
}
- lib = &APR_ARRAY_PUSH(result, svn_sysinfo__loaded_lib_t);
+ lib = &APR_ARRAY_PUSH(result, svn_version_loaded_lib_t);
}
else
{
@@ -1108,7 +1109,7 @@ macos_shared_libs(apr_pool_t *pool)
{
dylibs = apr_array_make(pool, 32, sizeof(*lib));
}
- lib = &APR_ARRAY_PUSH(dylibs, svn_sysinfo__loaded_lib_t);
+ lib = &APR_ARRAY_PUSH(dylibs, svn_version_loaded_lib_t);
}
lib->name = filename;
Modified: subversion/trunk/subversion/libsvn_subr/sysinfo.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sysinfo.h?rev=1382990&r1=1382989&r2=1382990&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sysinfo.h (original)
+++ subversion/trunk/subversion/libsvn_subr/sysinfo.h Mon Sep 10 17:19:31 2012
@@ -31,7 +31,6 @@
extern "C" {
#endif /* __cplusplus */
-
/* Return a canonical name similar to the output of config.guess,
* identifying the running system.
*
@@ -46,16 +45,7 @@ const char *svn_sysinfo__canonical_host(
*/
const char *svn_sysinfo__release_name(apr_pool_t *pool);
-/* Describes a linked dependency library */
-typedef struct svn_sysinfo__linked_lib_t svn_sysinfo__linked_lib_t;
-struct svn_sysinfo__linked_lib_t
-{
- const char *name; /* library name */
- const char *compiled_version; /* compile-time version string */
- const char *runtime_version; /* run-time version string (optional) */
-};
-
-/* Return an array of svn_sysinfo__linked_lib_t of descriptions of the
+/* Return an array of svn_version_linked_lib_t of descriptions of the
* link-time and run-time versions of dependent libraries, or NULL of
* the info is not available.
*
@@ -63,15 +53,7 @@ struct svn_sysinfo__linked_lib_t
*/
const apr_array_header_t *svn_sysinfo__linked_libs(apr_pool_t *pool);
-/* Describes a loaded shared library */
-typedef struct svn_sysinfo__loaded_lib_t svn_sysinfo__loaded_lib_t;
-struct svn_sysinfo__loaded_lib_t
-{
- const char *name; /* library name */
- const char *version; /* library version (optional) */
-};
-
-/* Return an array of svn_sysinfo__loaded_lib_t of descriptions of
+/* Return an array of svn_version_loaded_lib_t of descriptions of
* shared libraries loaded by the running process, including their
* versions where applicable, or NULL if the information is not
* available.
Modified: subversion/trunk/subversion/libsvn_subr/version.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/version.c?rev=1382990&r1=1382989&r2=1382990&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/version.c (original)
+++ subversion/trunk/subversion/libsvn_subr/version.c Mon Sep 10 17:19:31 2012
@@ -26,6 +26,7 @@
#include "svn_error.h"
#include "svn_version.h"
+#include "sysinfo.h"
#include "svn_private_config.h"
const svn_version_t *
@@ -96,3 +97,33 @@ svn_ver_check_list(const svn_version_t *
return err;
}
+
+
+const svn_version_extended_t *
+svn_version_extended(svn_boolean_t verbose,
+ apr_pool_t *pool)
+{
+ svn_version_extended_t *info = apr_pcalloc(pool, sizeof(*info));
+
+ info->version_number = SVN_VER_NUMBER;
+ info->version_string = SVN_VERSION;
+ info->build_date = __DATE__;
+ info->build_time = __TIME__;
+ info->build_host = SVN_BUILD_HOST;
+ info->copyright = apr_pstrdup
+ (pool, _("Copyright (C) 2012 The Apache Software Foundation.\n"
+ "This software consists of contributions made by many people;\n"
+ "see the NOTICE file for more information.\n"
+ "Subversion is open source software, see "
+ "http://subversion.apache.org/\n";));
+
+ if (verbose)
+ {
+ info->runtime_host = svn_sysinfo__canonical_host(pool);
+ info->runtime_osname = svn_sysinfo__release_name(pool);
+ info->linked_libs = svn_sysinfo__linked_libs(pool);
+ info->loaded_libs = svn_sysinfo__loaded_libs(pool);
+ }
+
+ return info;
+}
Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests.py?rev=1382990&r1=1382989&r2=1382990&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests.py Mon Sep 10
17:19:31 2012
@@ -95,13 +95,42 @@ rep_lines_res = [
'Subversion command-line client, version X.Y.Z.'),
]
+# This is a trigger pattern that selects the secondary set of
+# delete/replace patterns
+switch_res_line = 'System information:'
+
+# This is a list of lines to delete after having seen switch_res_line.
+switched_del_lines_res = [
+ # In svn --version --verbose, dependent libs loaded
+ # shared libs are optional.
+ re.compile(r'^\* (loaded|linked)'),
+ # In svn --version --verbose, remove everything from
+ # the extended lists
+ re.compile(r'^ - '),
+ ]
+
+# This is a list of lines to search and replace text on after having
+# seen switch_res_line.
+switched_rep_lines_res = [
+ # We don't care about the actual canonical host
+ (re.compile('^\* running on'), '* running on'),
+ ]
+
def process_lines(lines):
"delete lines that should not be compared and search and replace the rest"
output = [ ]
+ del_res = del_lines_res
+ rep_res = rep_lines_res
+
for line in lines:
+ if line.startswith(switch_res_line):
+ del_res = switched_del_lines_res
+ rep_res = switched_rep_lines_res
+ continue
+
# Skip these lines from the output list.
delete_line = 0
- for delete_re in del_lines_res:
+ for delete_re in del_res:
if delete_re.match(line):
delete_line = 1
break
@@ -109,7 +138,7 @@ def process_lines(lines):
continue
# Search and replace text on the rest.
- for replace_re, replace_str in rep_lines_res:
+ for replace_re, replace_str in rep_res:
line = replace_re.sub(replace_str, line)
output.append(line)
@@ -179,6 +208,10 @@ def getopt__version__quiet(sbox):
"run svn --version --quiet"
run_one_test(sbox, 'svn--version--quiet', '--version', '--quiet')
+def getopt__version__verbose(sbox):
+ "run svn --version --verbose"
+ run_one_test(sbox, 'svn--version--verbose', '--version', '--verbose')
+
def getopt__help(sbox):
"run svn --help"
run_one_test(sbox, 'svn--help', '--help')
@@ -204,6 +237,7 @@ test_list = [ None,
getopt_no_args,
getopt__version,
getopt__version__quiet,
+ getopt__version__verbose,
getopt__help,
getopt_help,
getopt_help_bogus_cmd,
Added:
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stderr
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stderr?rev=1382990&view=auto
==============================================================================
(empty)
Added:
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout?rev=1382990&view=auto
==============================================================================
---
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
(added)
+++
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
Mon Sep 10 17:19:31 2012
@@ -0,0 +1,90 @@
+svn, version 1.8.0-dev (under development)
+ compiled Sep 10 2012, 14:00:24 on i386-apple-darwin11.4.0
+
+Copyright (C) 2012 The Apache Software Foundation.
+This software consists of contributions made by many people;
+see the NOTICE file for more information.
+Subversion is open source software, see http://subversion.apache.org/
+
+The following repository access (RA) modules are available:
+
+* ra_svn : Module for accessing a repository using the svn network protocol.
+ - with Cyrus SASL authentication
+ - handles 'svn' scheme
+* ra_local : Module for accessing a repository on local disk.
+ - handles 'file' scheme
+* ra_serf : Module for accessing a repository via WebDAV protocol using serf.
+ - handles 'http' scheme
+ - handles 'https' scheme
+
+System information:
+
+* running on x86_64-apple-darwin11.4.0
+ - Mac OS X 10.7.4 Lion, build 11E53
+* linked dependencies:
+ - APR 1.4.2 (compiled with 1.4.2)
+ - APR-Util 1.3.10 (compiled with 1.3.10)
+ - SQLite 3.7.13 (compiled with 3.7.13)
+* loaded shared libraries:
+ - /Users/brane/bin/zvn (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_client-1.0.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_wc-1.0.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_ra-1.0.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_diff-1.0.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_ra_local-1.0.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_repos-1.0.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_fs-1.0.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_fs_fs-1.0.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_fs_base-1.0.dylib (Intel 64-bit)
+ - /usr/local/lib/libdb-5.3.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_fs_util-1.0.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_ra_svn-1.0.dylib (Intel 64-bit)
+ - /usr/lib/libsasl2.2.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_ra_serf-1.0.dylib (Intel 64-bit)
+ - /usr/local/lib/libserf-1.0.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_delta-1.0.dylib (Intel 64-bit)
+ - /opt/mine/subversion/lib/libsvn_subr-1.0.dylib (Intel 64-bit)
+ - /usr/lib/libexpat.1.dylib (Intel 64-bit)
+ - /usr/lib/libz.1.dylib (Intel 64-bit)
+ - /usr/local/lib/libsqlite3.0.8.6.dylib (Intel 64-bit)
+ - /usr/local/lib/libmagic.1.dylib (Intel 64-bit)
+ - /usr/lib/libaprutil-1.0.dylib (Intel 64-bit)
+ - /usr/lib/libapr-1.0.dylib (Intel 64-bit)
+ - /usr/lib/libSystem.B.dylib (Intel 64-bit)
+ - /usr/lib/libiconv.2.dylib (Intel 64-bit)
+ - /usr/lib/libpq.5.dylib (Intel 64-bit)
+ - /usr/lib/libsqlite3.dylib (Intel 64-bit)
+ - /usr/lib/libresolv.9.dylib (Intel 64-bit)
+ - /usr/lib/libssl.0.9.8.dylib (Intel 64-bit)
+ - /usr/lib/libcrypto.0.9.8.dylib (Intel 64-bit)
+ - /usr/lib/libicucore.A.dylib (Intel 64-bit)
+ - /usr/lib/libauto.dylib (Intel 64-bit)
+ - /usr/lib/libobjc.A.dylib (Intel 64-bit)
+ - /usr/lib/libstdc++.6.dylib (Intel 64-bit)
+ - /usr/lib/libpam.2.dylib (Intel 64-bit)
+ - /usr/lib/libbsm.0.dylib (Intel 64-bit)
+ - /usr/lib/libxar-nossl.dylib (Intel 64-bit)
+ - /usr/lib/libc++.1.dylib (Intel 64-bit)
+ - /usr/lib/libc++abi.dylib (Intel 64-bit)
+ - /usr/lib/libDiagnosticMessagesClient.dylib (Intel 64-bit)
+ - /usr/lib/libbz2.1.0.dylib (Intel 64-bit)
+ - /usr/lib/libxml2.2.dylib (Intel 64-bit)
+ - /usr/lib/liblangid.dylib (Intel 64-bit)
+ - /usr/lib/libCRFSuite.dylib (Intel 64-bit)
+ - /usr/lib/libxslt.1.dylib (Intel 64-bit)
+ - /usr/lib/sasl2/apop.so (Intel 64-bit)
+ - /usr/lib/sasl2/dhx.so (Intel 64-bit)
+ - /usr/lib/sasl2/digestmd5WebDAV.so (Intel 64-bit)
+ - /usr/lib/sasl2/libanonymous.2.so (Intel 64-bit)
+ - /usr/lib/sasl2/libcrammd5.2.so (Intel 64-bit)
+ - /usr/lib/sasl2/libdigestmd5.2.so (Intel 64-bit)
+ - /usr/lib/sasl2/libgssapiv2.2.so (Intel 64-bit)
+ - /usr/lib/sasl2/login.so (Intel 64-bit)
+ - /usr/lib/sasl2/libntlm.so (Intel 64-bit)
+ - /usr/lib/sasl2/libotp.2.so (Intel 64-bit)
+ - /usr/lib/sasl2/libplain.2.so (Intel 64-bit)
+ - /usr/lib/sasl2/libpps.so (Intel 64-bit)
+ - /usr/lib/sasl2/mschapv2.so (Intel 64-bit)
+ - /usr/lib/sasl2/shadow_auxprop.so (Intel 64-bit)
+ - /usr/lib/sasl2/smb_nt.so (Intel 64-bit)
+ - /usr/lib/sasl2/smb_ntlmv2.so (Intel 64-bit)
