From 9f2a9aba3aff73e31ea15eb4a7a04b0e50f4ee4e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 5 Jan 2018 15:58:35 +0100 Subject: Move examples from submodule to pyside-setup Move PySide2 examples that are owned by the Qt Company to a new examples directory. Done-with: Venugopal Shivashankar Task-number: PYSIDE-363 Change-Id: I14099764d9eef2bc35e067086121427955862e3a Reviewed-by: Alexandru Croitor --- setup.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 8202b6801..d73760be6 100644 --- a/setup.py +++ b/setup.py @@ -1121,12 +1121,10 @@ class pyside_build(_build): "{dist_dir}/PySide2/support", vars=vars) if not OPTION_NOEXAMPLES: - # /pyside2-examples/examples/* -> /PySide2/examples - folder = get_extension_folder('pyside2-examples') - copydir( - "{sources_dir}/%s/examples" % folder, - "{dist_dir}/PySide2/examples", - force=False, vars=vars) + # examples/* -> /PySide2/examples + copydir(os.path.join(self.script_dir, "examples"), + "{dist_dir}/PySide2/examples", + force=False, vars=vars) # Re-generate examples Qt resource files for Python 3 compatibility if sys.version_info[0] == 3: examples_path = "{dist_dir}/PySide2/examples".format(**vars) @@ -1393,12 +1391,10 @@ class pyside_build(_build): "{dist_dir}/PySide2/support", vars=vars) if not OPTION_NOEXAMPLES: - # /pyside2-examples/examples/* -> /PySide2/examples - folder = get_extension_folder('pyside2-examples') - copydir( - "{sources_dir}/%s/examples" % folder, - "{dist_dir}/PySide2/examples", - force=False, vars=vars) + # examples/* -> /PySide2/examples + copydir(os.path.join(self.script_dir, "examples"), + "{dist_dir}/PySide2/examples", + force=False, vars=vars) # Re-generate examples Qt resource files for Python 3 compatibility if sys.version_info[0] == 3: examples_path = "{dist_dir}/PySide2/examples".format(**vars) -- cgit v1.2.3