svn commit: r1532287 - in /subversion/trunk: build/win32/svn.rc subversion/include/svn_version.h

[rh...@apache.org]

Author: rhuijben
Date: Tue Oct 15 11:05:26 2013
New Revision: 1532287

URL: http://svn.apache.org/r1532287
Log:
In the Win32 resource compiler: stop including APR and several system headers
just to produce a nice version string. This slows down compilation and
generates several warnings per compiled library. (Too long macros, etc.)

* build/win32/svn.rc
  (SVN_WIN32_RESOURCE_COMPILATION): New explicit define.
  (APR_STRINGIFY): Define locally.

* subversion/include/svn_version.h
  (#ifdef SVN_WIN32_RESOURCE_COMPILATION): Use this check to skip including
    all headers instead of just ignoring once based on an APR define.

Modified:
    subversion/trunk/build/win32/svn.rc
    subversion/trunk/subversion/include/svn_version.h

Modified: subversion/trunk/build/win32/svn.rc
URL: http://svn.apache.org/viewvc/subversion/trunk/build/win32/svn.rc?rev=1532287&r1=1532286&r2=1532287&view=diff
==============================================================================
--- subversion/trunk/build/win32/svn.rc (original)
+++ subversion/trunk/build/win32/svn.rc Tue Oct 15 11:05:26 2013
@@ -25,9 +25,17 @@
 #endif
 
 #include <winresrc.h>
-#include <apr_general.h>
+
+#define SVN_WIN32_RESOURCE_COMPILATION
 #include "../../subversion/include/svn_version.h"
 
+#ifndef APR_STRINGIFY
+/** Properly quote a value as a string in the C preprocessor */
+#define APR_STRINGIFY(n) APR_STRINGIFY_HELPER(n)
+/** Helper macro for APR_STRINGIFY */
+#define APR_STRINGIFY_HELPER(n) #n
+#endif
+
 #ifndef _DEBUG
 # if SVN_VER_REVISION == 0
 #  define SVN_FILEFLAGS VS_FF_PRERELEASE

Modified: subversion/trunk/subversion/include/svn_version.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_version.h?rev=1532287&r1=1532286&r2=1532287&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_version.h (original)
+++ subversion/trunk/subversion/include/svn_version.h Tue Oct 15 11:05:26 2013
@@ -28,15 +28,13 @@
 #define SVN_VERSION_H
 
 /* Hack to prevent the resource compiler from including
-   apr_general.h.  It doesn't resolve the include paths
-   correctly and blows up without this.
- */
-#ifndef APR_STRINGIFY
+   apr and other headers. */
+#ifndef SVN_WIN32_RESOURCE_COMPILATION
 #include <apr_general.h>
-#endif
 #include <apr_tables.h>
 
 #include "svn_types.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {