diff options
| -rw-r--r-- | .gitmodules | 14 | ||||
| -rw-r--r-- | setup.py | 16 | ||||
| m--------- | sources/pyside | 10 | ||||
| m--------- | sources/pyside2 | 15 | ||||
| m--------- | sources/shiboken | 10 | ||||
| m--------- | sources/shiboken2 | 8 |
6 files changed, 45 insertions, 28 deletions
diff --git a/.gitmodules b/.gitmodules index 9d73859e2..dc44c6ab8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,14 @@ -[submodule "sources/shiboken"] - path = sources/shiboken - url = https://git.gitorious.org/pyside/shiboken.git -[submodule "sources/pyside"] - path = sources/pyside - url = https://git.gitorious.org/pyside/pyside.git +[submodule "sources/pyside2"] + path = sources/pyside2 + url = https://bitbucket.org/ctismer/pyside2 + branch = qt5 [submodule "sources/pyside-tools"] path = sources/pyside-tools url = https://github.com/PySide/Tools.git [submodule "sources/pyside-examples"] path = sources/pyside-examples url = https://github.com/PySide/Examples.git +[submodule "sources/shiboken2"] + path = sources/shiboken2 + url = https://bitbucket.org/ctismer/shiboken2 + branch = qt5 @@ -26,9 +26,15 @@ OpenSSL: You can specify the location of OpenSSL DLLs with option --opnessl=</pa You can download OpenSSL for windows here: http://slproweb.com/products/Win32OpenSSL.html """ -__version__ = "1.3.0dev" +__version__ = "2.0.0.dev0" submodules = { + '2.0.0.dev0': [ + ["shiboken2", "qt5"], + ["pyside2", "qt5"], + ["pyside-tools", "master"], + ["pyside-examples", "master"], + ], '1.3.0dev': [ ["shiboken", "master"], ["pyside", "master"], @@ -77,6 +83,8 @@ import os import sys import platform +import difflib # for a close match of dirname and module + from distutils import log from distutils.errors import DistutilsOptionError from distutils.errors import DistutilsSetupError @@ -548,6 +556,10 @@ class pyside_build(_build): raise DistutilsSetupError("Error building patchelf") 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] + log.info("Building module %s..." % extension) # Prepare folders @@ -560,7 +572,7 @@ class pyside_build(_build): os.makedirs(module_build_dir) os.chdir(module_build_dir) - module_src_dir = os.path.join(self.sources_dir, extension) + module_src_dir = os.path.join(self.sources_dir, folder) # Build module cmake_cmd = [ diff --git a/sources/pyside b/sources/pyside deleted file mode 160000 -Subproject a12de51b654973d965b1888b4dd3c539422f71d diff --git a/sources/pyside2 b/sources/pyside2 new file mode 160000 +Subproject 0c64d1b2c6e5e0951675ad9b22294db4a10741c diff --git a/sources/shiboken b/sources/shiboken deleted file mode 160000 -Subproject 43857068b0706f4a473c5f0a8d8c545ccab89cd diff --git a/sources/shiboken2 b/sources/shiboken2 new file mode 160000 +Subproject 823cc65ecf87fe2587815d1d61ae3289f9d9583 |