diff options
Diffstat (limited to 'build/generator/gen_win.py')
| -rw-r--r-- | build/generator/gen_win.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/build/generator/gen_win.py b/build/generator/gen_win.py index 9d7350a..7565a9a 100644 --- a/build/generator/gen_win.py +++ b/build/generator/gen_win.py @@ -158,6 +158,13 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase): ### implement this from scratch using the algorithms described in ### http://www.webdav.org/specs/draft-leach-uuids-guids-01.txt + # Ensure data is in byte representation. If it doesn't have an encode + # attribute, assume it is already in the correct form. + try: + data = data.encode('utf8') + except AttributeError: + pass + myhash = hashlib_md5(data).hexdigest() guid = ("{%s-%s-%s-%s-%s}" % (myhash[0:8], myhash[8:12], @@ -739,7 +746,7 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase): fakedefines.append(self.quote_define('SVN_WIN32_CRASHREPORT_EMAIL="users@subversion.apache.org"')) return fakedefines - + def quote_define(self, value): "Properly quote special characters in a define (if needed)" return value @@ -778,6 +785,10 @@ class WinGeneratorBase(gen_win_dependencies.GenDependenciesBase): else: lang_subdir = target.lang + if target.lang == "python": + lib = self._libraries['py3c'] + fakeincludes.extend(lib.include_dirs) + # After the language specific includes include the generic libdir, # to allow overriding a generic with a per language include fakeincludes.append(os.path.join(self.swig_libdir, lang_subdir)) |