From 06a60584b71eb24ceaa9738bcab185d8a47fdc35 Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Mon, 6 Jul 2015 00:11:29 +0200 Subject: support renamed pyside-examples folder --- setup.py | 17 ++++++++++++----- sources/pyside2 | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 760fdd36f..020a53f0d 100644 --- a/setup.py +++ b/setup.py @@ -113,6 +113,12 @@ from utils import regenerate_qt_resources from utils import filter_match from utils import osx_localize_libpaths +# guess a close folder name for extensions +def get_extension_folder(ext): + maybe = list(map(lambda x:x[0], submodules[__version__])) + folder = difflib.get_close_matches(ext, maybe)[0] + return folder + # Declare options OPTION_DEBUG = has_option("debug") OPTION_RELWITHDEBINFO = has_option('relwithdebinfo') @@ -203,7 +209,7 @@ Use --list-versions option to get list of available versions""" % OPTION_VERSION if OPTION_NOEXAMPLES: # remove pyside-exampes from submodules so they will not be included for idx, item in enumerate(submodules[__version__]): - if item[0] == 'pyside-examples': + if item[0].startswith('pyside-examples'): del submodules[__version__][idx] @@ -536,8 +542,7 @@ class pyside_build(_build): def build_extension(self, extension): # calculate the subrepos folder name - maybe = list(map(lambda x:x[0], submodules[__version__])) - folder = difflib.get_close_matches(extension, maybe)[0] + folder = get_extension_folder(extension) log.info("Building module %s..." % extension) @@ -717,8 +722,9 @@ class pyside_build(_build): vars=vars) if not OPTION_NOEXAMPLES: # /pyside-examples/examples/* -> /PySide/examples + folder = get_extension_folder('pyside-examples') copydir( - "{sources_dir}/pyside-examples/examples", + "{sources_dir}/%s/examples" % folder, "{dist_dir}/PySide/examples", force=False, vars=vars) # Re-generate examples Qt resource files for Python 3 compatibility @@ -836,8 +842,9 @@ class pyside_build(_build): vars=vars) if not OPTION_NOEXAMPLES: # /pyside-examples/examples/* -> /PySide/examples + folder = get_extension_folder('pyside-examples') copydir( - "{sources_dir}/pyside-examples/examples", + "{sources_dir}/%s/examples" % folder, "{dist_dir}/PySide/examples", force=False, vars=vars) # Re-generate examples Qt resource files for Python 3 compatibility diff --git a/sources/pyside2 b/sources/pyside2 index 99ea8dec7..c4e2fb03a 160000 --- a/sources/pyside2 +++ b/sources/pyside2 @@ -1 +1 @@ -Subproject commit 99ea8dec72c9a250bd0d0aeec5ca11edb9aa0d62 +Subproject commit c4e2fb03ad7a996d30a9ed34182996b19ecddc38 -- cgit v1.2.3