diff options
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/config.py | 2 | ||||
| -rw-r--r-- | build_scripts/main.py | 8 | ||||
| -rw-r--r-- | build_scripts/platforms/macos.py | 2 | ||||
| -rw-r--r-- | build_scripts/platforms/unix.py | 2 | ||||
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 3 | ||||
| -rw-r--r-- | build_scripts/qp5_tool.py | 5 | ||||
| -rw-r--r-- | build_scripts/utils.py | 22 |
7 files changed, 5 insertions, 39 deletions
diff --git a/build_scripts/config.py b/build_scripts/config.py index b1b32068d..86482a043 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -331,7 +331,7 @@ class Config(object): if self.is_internal_shiboken_module_build() or self.is_internal_shiboken_generator_build(): return ['shiboken2'] elif self.is_internal_pyside_build(): - return ['pyside2', 'pyside2-tools'] + return ['pyside2', 'pyside-tools'] return None def set_is_top_level_invocation(self): diff --git a/build_scripts/main.py b/build_scripts/main.py index ab0a6c083..84628d8e0 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -227,9 +227,6 @@ def get_py_library(build_type, py_version, py_prefix, py_libdir, py_include_dir) return py_library -# Git submodules: ["submodule_name", "location_relative_to_sources_folder"] -submodules = [["pyside2-tools"]] - try: import setuptools except ImportError: @@ -347,9 +344,6 @@ def prepare_sub_modules(): def prepare_build(): - if (os.path.isdir(".git") and not OPTION["IGNOREGIT"] and not OPTION["ONLYPACKAGE"] - and not OPTION["REUSE_BUILD"]): - prepare_sub_modules() # Clean up temp build folder. for n in ["build"]: d = os.path.join(setup_script_dir, n) @@ -857,7 +851,7 @@ class PysideBuild(_build, DistUtilsCommandMixin): timestamp = get_package_timestamp() cmake_cmd.append("-DPACKAGE_SETUP_PY_PACKAGE_TIMESTAMP={}".format(timestamp)) - if extension.lower() in ["shiboken2", "pyside2-tools"]: + if extension.lower() in ["shiboken2"]: cmake_cmd.append("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=yes") if sys.version_info[0] > 2: cmake_cmd.append("-DUSE_PYTHON_VERSION=3.3") diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py index 7932db337..614d6acbc 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -140,8 +140,6 @@ def prepare_standalone_package_macos(self, vars): ignored_modules = [] if not self.is_webengine_built(built_modules): ignored_modules.extend(['libQt5WebEngine*.dylib']) - if 'WebKit' not in built_modules: - ignored_modules.extend(['libQt5WebKit*.dylib']) accepted_modules = ['libQt5*.5.dylib'] if constrain_modules: accepted_modules = ["libQt5" + module + "*.5.dylib" for module in constrain_modules] diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index b842510ff..754cdc961 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -204,7 +204,7 @@ def prepare_packages_posix(self, vars): # compatibility if sys.version_info[0] == 3: examples_path = "{st_build_dir}/{st_package_name}/examples".format(**vars) - pyside_rcc_path = "{install_dir}/bin/rcc".format(**vars) + pyside_rcc_path = "rcc" 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 345847e20..112bd436f 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -220,8 +220,7 @@ 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/rcc.exe".format( - **vars) + pyside_rcc_path = "rcc.exe" pyside_rcc_options = ['-g', 'python'] regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) diff --git a/build_scripts/qp5_tool.py b/build_scripts/qp5_tool.py index 0dea03b27..b213948e7 100644 --- a/build_scripts/qp5_tool.py +++ b/build_scripts/qp5_tool.py @@ -159,9 +159,6 @@ def run_git(args): """Run git in the current directory and its submodules""" args.insert(0, git) # run in repo execute(args) # run for submodules - module_args = [git, "submodule", "foreach"] - module_args.extend(args) - execute(module_args) def expand_reference(cache_dict, value): @@ -407,7 +404,7 @@ if __name__ == '__main__': with open(config_file, 'w') as f: f.write(DEFAULT_CONFIG_FILE.format(' '.join(DEFAULT_BUILD_ARGS))) - while not os.path.exists('.gitmodules'): + while not os.path.exists('.git'): cwd = os.getcwd() if cwd == '/' or (IS_WINDOWS and len(cwd) < 4): warnings.warn('Unable to find git root', RuntimeWarning) diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 0782ae036..220d32efe 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -669,28 +669,6 @@ def find_glob_in_path(pattern): return result -# Locate the most recent version of llvm_config in the path. -def find_llvm_config(): - version_re = re.compile(r'(\d+)\.(\d+)\.(\d+)') - result = None - last_version_string = '000000' - for llvm_config in find_glob_in_path('llvm-config*'): - try: - output = run_process_output([llvm_config, '--version']) - if output: - match = version_re.match(output[0]) - if match: - version_string = "{:02d}{:02d}{:02d}".format(int(match.group(1)), - int(match.group(2)), - int(match.group(3))) - if (version_string > last_version_string): - result = llvm_config - last_version_string = version_string - except OSError: - pass - return result - - # Add Clang to path for Windows for the shiboken ApiExtractor tests. # Revisit once Clang is bundled with Qt. def detect_clang(): |