From ffa3cfe0c7eb83b5d318a52d96fbce5434c4bef8 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 23 May 2017 14:56:27 +0200
Subject: setup.py/prepare_coin_sources.py: Adapt to repository merge

Remove the former submodules pyside2/shiboken2 from
the modules lists.

Change-Id: I41de78f5519c24cce1e649eaf3b2f2d1cabcc9b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 prepare_coin_sources.py |  2 --
 setup.py                | 14 +++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/prepare_coin_sources.py b/prepare_coin_sources.py
index 3445ddfe6..24dae1551 100644
--- a/prepare_coin_sources.py
+++ b/prepare_coin_sources.py
@@ -51,8 +51,6 @@ QT_CI_TESTED_SUBMODULE = option_value("module")
 SUBMODULE_BRANCH = option_value("branch")
 
 submodules = {
-        "shiboken2" : "shiboken",
-        "pyside2" : "pyside",
         "pyside2-tools" : "pyside-tools",
         "pyside2-examples" : "examples"
 }
diff --git a/setup.py b/setup.py
index 070929ffc..a2741d53d 100644
--- a/setup.py
+++ b/setup.py
@@ -81,17 +81,15 @@ OS X SDK: You can specify which OS X SDK should be used for compilation with the
 
 __version__ = "5.6"
 
+containedModules = ['shiboken2', 'pyside2']
+
 submodules = {
     '2.0.0.dev0': [
-        ["shiboken2", "dev"],
-        ["pyside2", "dev"],
         ["pyside2-tools", "dev"],
         ["pyside2-examples", "dev"],
         ["wiki", "master", ".."],
     ],
     '5.6': [
-        ["shiboken2", "5.6"],
-        ["pyside2", "5.6"],
         ["pyside2-tools", "5.6"],
         ["pyside2-examples", "5.6"],
         ["wiki", "master", ".."]
@@ -181,8 +179,10 @@ 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]
+    candidates = containedModules
+    for gitModules in submodules[__version__]:
+        candidates.append(gitModules[0])
+    folder = difflib.get_close_matches(ext, candidates)[0]
     return folder
 
 # make sure that setup.py is run with an allowed python version
@@ -722,7 +722,7 @@ class pyside_build(_build):
 
         if not OPTION_ONLYPACKAGE:
             # Build extensions
-            for ext in ['shiboken2', 'pyside2', 'pyside2-tools']:
+            for ext in containedModules + ['pyside2-tools']:
                 self.build_extension(ext)
 
             if OPTION_BUILDTESTS:
-- 
cgit v1.2.3