You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/07/17 18:38:21 UTC
svn commit: r1504194 -
/subversion/trunk/build/generator/gen_win_dependencies.py
Author: rhuijben
Date: Wed Jul 17 16:38:20 2013
New Revision: 1504194
URL: http://svn.apache.org/r1504194
Log:
* gen_win_dependencies.py
Detect serf 2.0 (aka serf trunk) installs.
Fix openssl definition indenting.
Modified:
subversion/trunk/build/generator/gen_win_dependencies.py
Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1504194&r1=1504193&r2=1504194&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Wed Jul 17 16:38:20 2013
@@ -672,11 +672,11 @@ class GenDependenciesBase(gen_base.Gener
int(vermatch.group(4)))
openssl_version = vermatch.group(1)
- self._libraries['ssleay32'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
- 'ssleay32.lib',
- openssl_version,
- dll_name='ssleay32.dll',
- dll_dir=bin_dir)
+ self._libraries['openssl'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
+ 'ssleay32.lib',
+ openssl_version,
+ dll_name='ssleay32.dll',
+ dll_dir=bin_dir)
self._libraries['libeay32'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
'libeay32.lib',
@@ -934,6 +934,13 @@ class GenDependenciesBase(gen_base.Gener
lib_dir = os.path.join(inc_dir, 'lib')
debug_lib_dir = None
is_src = False
+ elif os.path.isfile(os.path.join(self.serf_path, 'include/serf-2/serf.h')):
+ # Install layout
+ inc_dir = os.path.join(self.serf_path, 'include/serf-2')
+ version = self._get_serf_version(inc_dir)
+ lib_dir = os.path.join(inc_dir, 'lib')
+ debug_lib_dir = None
+ is_src = False
else:
if show_warning:
print('WARNING: \'serf.h\' not found')