diff options
Diffstat (limited to 'build_scripts')
-rw-r--r-- | build_scripts/config.py | 10 | ||||
-rw-r--r-- | build_scripts/platforms/unix.py | 36 | ||||
-rw-r--r-- | build_scripts/platforms/windows_desktop.py | 22 | ||||
-rw-r--r-- | build_scripts/utils.py | 6 | ||||
-rw-r--r-- | build_scripts/wheel_override.py | 2 |
5 files changed, 28 insertions, 48 deletions
diff --git a/build_scripts/config.py b/build_scripts/config.py index edd7fdbf7..739d88fe6 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -91,6 +91,7 @@ class Config(object): 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', ] self.setup_script_dir = None @@ -212,8 +213,9 @@ class Config(object): setup_kwargs['install_requires'] = ["{}=={}".format(self.shiboken_module_st_name, package_version)] setup_kwargs['entry_points'] = { 'console_scripts': [ - 'pyside2-uic = {}.scripts.uic:main'.format(self.package_name()), - 'pyside2-rcc = {}.scripts.pyside_tool:main'.format(self.package_name()), + 'pyside2-uic = {}.scripts.pyside_tool:uic'.format(self.package_name()), + 'pyside2-rcc = {}.scripts.pyside_tool:rcc'.format(self.package_name()), + 'pyside2-designer= {}.scripts.pyside_tool:designer'.format(self.package_name()), 'pyside2-lupdate = {}.scripts.pyside_tool:main'.format(self.package_name()), ] } @@ -287,9 +289,6 @@ class Config(object): if self.internal_build_type == self.pyside_option_name: return [ config.package_name(), - 'pyside2uic', - 'pyside2uic.Compiler', - 'pyside2uic.port_v{}'.format(sys.version_info[0]) ] elif self.internal_build_type == self.shiboken_module_option_name: return [self.package_name()] @@ -320,7 +319,6 @@ class Config(object): elif self.is_internal_pyside_build(): return { self.package_name(): "sources/pyside2/PySide2", - "pyside2uic": "sources/pyside2-tools/pyside2uic" } else: return {} diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 83de489df..9327e8bd7 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -118,25 +118,9 @@ def prepare_packages_posix(self, vars): vars=vars) if config.is_internal_pyside_build(): - # <install>/lib/site-packages/pyside2uic/* -> - # <setup>/pyside2uic - copydir( - "{site_packages_dir}/pyside2uic", - "{st_build_dir}/pyside2uic", - force=False, vars=vars) - if sys.version_info[0] > 2: - rmtree("{st_build_dir}/pyside2uic/port_v2".format(**vars)) - else: - rmtree("{st_build_dir}/pyside2uic/port_v3".format(**vars)) - - # <install>/bin/pyside2-uic -> {st_package_name}/scripts/uic.py makefile( "{st_build_dir}/{st_package_name}/scripts/__init__.py", vars=vars) - copyfile( - "{install_dir}/bin/pyside2-uic", - "{st_build_dir}/{st_package_name}/scripts/uic.py", - force=False, vars=vars) # For setting up setuptools entry points copyfile( @@ -150,10 +134,24 @@ def prepare_packages_posix(self, vars): "{st_build_dir}/{st_package_name}", filter=[ "pyside2-lupdate", - "pyside2-rcc", + "uic", + "rcc", ], recursive=False, vars=vars)) + # Copying designer + if sys.platform == "darwin": + executables.extend(copydir( + "{install_dir}/bin/Designer.app", + "{st_build_dir}/{st_package_name}/Designer.app", + filter=None, + recursive=True, vars=vars)) + else: + copyfile( + "{install_dir}/bin/designer", + "{st_build_dir}/{st_package_name}/designer", + force=False, vars=vars) + # <install>/lib/lib* -> {st_package_name}/ copydir( "{install_dir}/lib/", @@ -207,9 +205,9 @@ def prepare_packages_posix(self, vars): if sys.version_info[0] == 3: examples_path = "{st_build_dir}/{st_package_name}/examples".format( **vars) - pyside_rcc_path = "{install_dir}/bin/pyside2-rcc".format( + pyside_rcc_path = "{install_dir}/bin/rcc".format( **vars) - pyside_rcc_options = '-py3' + pyside_rcc_options = ['-g', 'python'] regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index ae0d66682..a5a5b8fd2 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -147,25 +147,9 @@ def prepare_packages_win32(self, vars): filter=pdbs, recursive=False, vars=vars) - # <install>/lib/site-packages/pyside2uic/* -> - # <setup>/pyside2uic - copydir( - "{site_packages_dir}/pyside2uic", - "{st_build_dir}/pyside2uic", - force=False, vars=vars) - if sys.version_info[0] > 2: - rmtree("{st_build_dir}/pyside2uic/port_v2".format(**vars)) - else: - rmtree("{st_build_dir}/pyside2uic/port_v3".format(**vars)) - - # <install>/bin/pyside2-uic -> {st_package_name}/scripts/uic.py makefile( "{st_build_dir}/{st_package_name}/scripts/__init__.py", vars=vars) - copyfile( - "{install_dir}/bin/pyside2-uic", - "{st_build_dir}/{st_package_name}/scripts/uic.py", - force=False, vars=vars) # For setting up setuptools entry points copyfile( @@ -177,7 +161,7 @@ def prepare_packages_win32(self, vars): copydir( "{install_dir}/bin/", "{st_build_dir}/{st_package_name}", - filter=["pyside*.exe", "pyside*.dll"], + filter=["pyside*.exe", "pyside*.dll", "uic.exe", "rcc.exe", "designer.exe"], recursive=False, vars=vars) # <install>/lib/*.lib -> {st_package_name}/ @@ -236,9 +220,9 @@ def prepare_packages_win32(self, vars): if sys.version_info[0] == 3: examples_path = "{st_build_dir}/{st_package_name}/examples".format( **vars) - pyside_rcc_path = "{install_dir}/bin/pyside2-rcc".format( + pyside_rcc_path = "{install_dir}/bin/rcc.exe".format( **vars) - pyside_rcc_options = '-py3' + pyside_rcc_options = ['-g', 'python'] regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 85a2f9e36..56ec8e350 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -492,9 +492,9 @@ def regenerate_qt_resources(src, pyside_rcc_path, pyside_rcc_options): if os.path.exists(dstname): log.info('Regenerating {} from {}'.format(dstname, os.path.basename(srcname))) - run_process([pyside_rcc_path, - pyside_rcc_options, - srcname, '-o', dstname]) + run_process([pyside_rcc_path] + + pyside_rcc_options + + [srcname, '-o', dstname]) def back_tick(cmd, ret_err=False): diff --git a/build_scripts/wheel_override.py b/build_scripts/wheel_override.py index 3a5c8164b..b06628b3b 100644 --- a/build_scripts/wheel_override.py +++ b/build_scripts/wheel_override.py @@ -86,7 +86,7 @@ class PysideBuildWheel(_bdist_wheel): # create a properly named package. limited_api_enabled = OPTION_LIMITED_API and sys.version_info[0] >= 3 if limited_api_enabled: - self.py_limited_api = "cp35.cp36.cp37" + self.py_limited_api = "cp35.cp36.cp37.cp38" _bdist_wheel.finalize_options(self) |