Replace pyside2 uic/rcc

After the compatibility patches for uic and rcc,
is now possible to generate Python code by using the option
'-g python':
    uic -g python file.ui -o ui_file.py
    rcc -g python file.qrc -o rc_file.py

This patch depends on many changes on the 'pyside2-tools'
submodule, which mainly remove the old implementations of pyside2-uic
and pyside2-rcc.

The pyside_tool.py wrapper is now in charge of calling the uic and rcc
binaries, with the -g python every time the pyside2-uic and pyside2-rcc
binaries are called. To achieve this, we are now shipping the uic and rcc
binaries from the Qt installation.

Fixes: PYSIDE-1098
Change-Id: Ibdec0012f7ed671cd99424e1258c20649609c2da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

3 files changed, 9 insertions, 44 deletions

diff --git a/build_scripts/config.py b/build_scripts/config.py
index f32dccbfd..7fa3b486b 100644
--- a/build_scripts/config.py
+++ b/build_scripts/config.py
@@ -213,8 +213,8 @@ 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-lupdate = {}.scripts.pyside_tool:main'.format(self.package_name()),
                 ]
             }
@@ -288,9 +288,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()]
@@ -321,7 +318,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..6929e915d 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,7 +134,8 @@ def prepare_packages_posix(self, vars):
             "{st_build_dir}/{st_package_name}",
             filter=[
                 "pyside2-lupdate",
-                "pyside2-rcc",
+                "uic",
+                "rcc",
             ],
             recursive=False, vars=vars))
 
@@ -207,9 +192,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..ca198c582 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"],
             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)