Does anybody review my patch?
Let me know a reason if my patch is not approprite
I re-create a patch for the lastest revison.
Regards.
--
Masaru Tsuchiyama <[email protected]>
Index: build/generator/gen_win_dependencies.py
===================================================================
--- build/generator/gen_win_dependencies.py (revision 1520871)
+++ build/generator/gen_win_dependencies.py (working copy)
@@ -1190,19 +1190,21 @@ class GenDependenciesBase(gen_base.GeneratorBase):
match = re.search(r'^\s*#define\s+LIBINTL_VERSION\s+((0x)?[0-9A-Fa-f]+)',
txt, re.M)
+ if match != None:
+ ver = int(match.group(1), 0)
+ version = (ver >> 16, (ver >> 8) & 0xFF, ver & 0xFF)
- ver = int(match.group(1), 0)
- version = (ver >> 16, (ver >> 8) & 0xFF, ver & 0xFF)
+ libintl_version = '.'.join(str(v) for v in version)
- libintl_version = '.'.join(str(v) for v in version)
+ if version < minimal_libintl_version:
+ if show_warning:
+ print('Found libintl %s, but >= %s is required.\n' % \
+ (libintl_version,
+ '.'.join(str(v) for v in minimal_libintl_version)))
+ return
+ else:
+ libintl_version = "unknown version"
- if version < minimal_libintl_version:
- if show_warning:
- print('Found libintl %s, but >= %s is required.\n' % \
- (libintl_version,
- '.'.join(str(v) for v in minimal_libintl_version)))
- return
-
self._libraries['intl'] = SVNCommonLibrary('libintl', inc_dir, lib_dir,
lib_name, libintl_version,
dll_dir=dll_dir,
