[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1368662 - in /subversion/trunk: configure.ac subversion/libsvn_subr/opt.c subversion/svn_private_config.hw

From: Greg Stein <gstein_at_gmail.com>
Date: Thu, 2 Aug 2012 16:18:10 -0400

I like the general idea here, but would suggest details like this could
fall under --version --verbose. Apache httpd has a similar feature which
also prints other #define values. For example, maybe we could print version
info for the libs we compiled against (and maybe the version loaded at run
time).

Cheers,
-g
On Aug 2, 2012 3:46 PM, <brane_at_apache.org> wrote:

> Author: brane
> Date: Thu Aug 2 19:45:42 2012
> New Revision: 1368662
>
> URL: http://svn.apache.org/viewvc?rev=1368662&view=rev
> Log:
> Add information about the build system to "svn --version" output.
> This should make solving user problems a little bit easier.
>
> * configure.ac (SVN_BUILD_HOST): Define to ${host}.
> * subversion/libsvn_subr/opt.c (svn_opt__print_version_info):
> Add SVN_BUILD_HOST to the version info.
> * subversion/svn_private_config.hw (SVN_BUILD_HOST): Define
> to make the Windows build hopefully still work.
>
> Modified:
> subversion/trunk/configure.ac
> subversion/trunk/subversion/libsvn_subr/opt.c
> subversion/trunk/subversion/svn_private_config.hw
>
> Modified: subversion/trunk/configure.ac
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1368662&r1=1368661&r2=1368662&view=diff
>
> ==============================================================================
> --- subversion/trunk/configure.ac (original)
> +++ subversion/trunk/configure.ac Thu Aug 2 19:45:42 2012
> @@ -1389,6 +1389,10 @@ AC_SUBST(SVN_CONFIG_SCRIPT_FILES)
> # Ensure that SWIG is checked after reconfiguration.
> rm -f .swig_checked
>
> +dnl Provide ${host} for use in compiled code (for svn --version)
> +AC_DEFINE_UNQUOTED([SVN_BUILD_HOST], "${host}",
> + [Defined to the config.guess name of the build system])
> +
> AC_OUTPUT
>
> # ==== Print final messages to user
> ==========================================
>
> Modified: subversion/trunk/subversion/libsvn_subr/opt.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/opt.c?rev=1368662&r1=1368661&r2=1368662&view=diff
>
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_subr/opt.c (original)
> +++ subversion/trunk/subversion/libsvn_subr/opt.c Thu Aug 2 19:45:42 2012
> @@ -1111,8 +1111,9 @@ svn_opt__print_version_info(const char *
> return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
>
> SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n"
> - " compiled %s, %s\n\n"), pgm_name,
> - SVN_VERSION, __DATE__, __TIME__));
> + " compiled %s, %s on %s\n\n"),
> + pgm_name, SVN_VERSION, __DATE__, __TIME__,
> + SVN_BUILD_HOST));
> SVN_ERR(svn_cmdline_fputs(
> _("Copyright (C) 2012 The Apache Software Foundation.\n"
> "This software consists of contributions made by many "
>
> Modified: subversion/trunk/subversion/svn_private_config.hw
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/svn_private_config.hw?rev=1368662&r1=1368661&r2=1368662&view=diff
>
> ==============================================================================
> --- subversion/trunk/subversion/svn_private_config.hw (original)
> +++ subversion/trunk/subversion/svn_private_config.hw Thu Aug 2 19:45:42
> 2012
> @@ -29,6 +29,11 @@
> #ifndef SVN_PRIVATE_CONFIG_HW
> #define SVN_PRIVATE_CONFIG_HW
>
> +
> +/* Define to a Windows-specific equivalent of config.guess output */
> +/* ### Replace CPU type and Windows version during build script
> generation */
> +#define SVN_BUILD_HOST "x86-microsoft-windows"
> +
> /* The minimal version of Berkeley DB we want */
> #define SVN_FS_WANT_DB_MAJOR 4
> #define SVN_FS_WANT_DB_MINOR 0
>
>
>
Received on 2012-08-02 22:18:43 CEST

This is an archived mail posted to the Subversion Dev mailing list.