subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1803264 - in /subversion/trunk: build/generator/gen_win_dependencies.py subversion/svn_private_config.hw
Date Fri, 28 Jul 2017 11:00:08 GMT
Author: rhuijben
Date: Fri Jul 28 11:00:07 2017
New Revision: 1803264

URL: http://svn.apache.org/viewvc?rev=1803264&view=rev
Log:
Following up on r1803210, r1803127 and r1803261, move the declaration of
a few dependency related preprocessor defines to the dependency generator
instead of hardcoding them in the standard Windows configuration.

* build/generator/gen_win_dependencies.py
  (_find_lz4,
   _find_utf8proc): Add define here.

* subversion/svn_private_config.hw
  (SVN_INTERNAL_LZ4,
   SVN_INTERNAL_UTF8PROC): Remove define here.

Modified:
    subversion/trunk/build/generator/gen_win_dependencies.py
    subversion/trunk/subversion/svn_private_config.hw

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1803264&r1=1803263&r2=1803264&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Fri Jul 28 11:00:07 2017
@@ -1471,7 +1471,8 @@ class GenDependenciesBase(gen_base.Gener
 
     lz4_version = '%d.%d.%s' % (major, minor, rel)
     self._libraries['lz4'] = SVNCommonLibrary('lz4', None, None, None,
-                                              lz4_version, internal=True)
+                                              lz4_version, internal=True,
+                                              defines=['SVN_INTERNAL_LZ4'])
 
   def _find_utf8proc(self):
     "Find the Utf8proc library"
@@ -1496,7 +1497,8 @@ class GenDependenciesBase(gen_base.Gener
     utf8proc_version = '%d.%d.%d' % (major, minor, patch)
     self._libraries['utf8proc'] = SVNCommonLibrary('utf8proc', None, None,
                                                    None, utf8proc_version,
-                                                   internal=True)
+                                                   internal=True,
+                                        defines=['SVN_INTERNAL_UTF8PROC'])
 
 # ============================================================================
 # This is a cut-down and modified version of code from:

Modified: subversion/trunk/subversion/svn_private_config.hw
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn_private_config.hw?rev=1803264&r1=1803263&r2=1803264&view=diff
==============================================================================
--- subversion/trunk/subversion/svn_private_config.hw (original)
+++ subversion/trunk/subversion/svn_private_config.hw Fri Jul 28 11:00:07 2017
@@ -77,12 +77,6 @@
 /* The default HTTP library to use */
 #define DEFAULT_HTTP_LIBRARY "serf"
 
-/* Use the internal LZ4 code */
-#define SVN_INTERNAL_LZ4 1
-
-/* Use the internal utf8proc code */
-#define SVN_INTERNAL_UTF8PROC 1
-
 /* Define to the Python/C API format character suitable for apr_int64_t */
 #if defined(_WIN64)
 #define SVN_APR_INT64_T_PYCFMT "l"



Mime
View raw message