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

Re: r1368662 - Add information about the build system to "svn --version" output - for Windows

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 7 Aug 2012 17:19:48 +0100 (BST)

Brane wrote:[...]

> Modified: subversion/trunk/subversion/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"

For Windows, would the following be an improvement?

Index: subversion/svn_private_config.hw
===================================================================
--- subversion/svn_private_config.hw    (revision 1370255)
+++ subversion/svn_private_config.hw    (working copy)
@@ -33,3 +33,23 @@
-/* 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"
+/* Name of the build target CPU type. */
+#if defined(_M_X64) || defined(_M_AMD64)  /* synonyms */
+#define SVN_BUILD__CPU "x86_64"
+#elif defined(_M_IA64)
+#define SVN_BUILD__CPU "ia64"
+#elif defined(_M_IX86)
+#define SVN_BUILD__CPU "x86"
+#elif defined(_M_ALPHA)
+#define SVN_BUILD__CPU "alpha"
+#elif defined(_M_MPPC) || defined(_M_PPC)
+#define SVN_BUILD__CPU "powerpc"
+#else
+#define SVN_BUILD__CPU "unknown"
+#endif
+
+/* Name of the build system. Windows equivalent of config.guess output. */
+#if defined(_WIN64)
+#define SVN_BUILD_HOST SVN_BUILD__CPU "-microsoft-win64"
+#elif defined(_WIN32)
+#define SVN_BUILD_HOST SVN_BUILD__CPU "-microsoft-win32"
+#else
+#define SVN_BUILD_HOST SVN_BUILD__CPU "-microsoft-unknown"
+#endif

This patch is based on info I found on the web.  I don't have a Windows build system to test this on.

- Julian
Received on 2012-08-07 18:20:36 CEST

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