aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2018-04-23 12:51:12 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2018-04-25 06:29:59 +0000
commitd6143cf77b3e28945768596f671418623da02a43 (patch)
tree3bbd4ec020db48ad6ef5313047759a33ed167e54 /setup.py
parent5c7eb1ee4a8bafe81afcc29c689402c6ecf304b4 (diff)
Replace 'osx' with 'macos' in installation scripts
Change-Id: Ibe5412edb6467594c5d2fd80545d9e1572a286cb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/setup.py b/setup.py
index a36cd090..8da8c70e 100644
--- a/setup.py
+++ b/setup.py
@@ -301,7 +301,7 @@ from utils import update_env_path
from utils import init_msvc_env
from utils import regenerate_qt_resources
from utils import filter_match
-from utils import osx_fix_rpaths_for_library
+from utils import macos_fix_rpaths_for_library
from utils import copy_icu_libs
from utils import find_files_using_glob
@@ -1478,7 +1478,7 @@ class pyside_build(_build):
if OPTION_STANDALONE:
vars['built_modules'] = config['built_modules']
if sys.platform == 'darwin':
- self.prepare_standalone_package_osx(executables, vars)
+ self.prepare_standalone_package_macos(executables, vars)
else:
self.prepare_standalone_package_linux(executables, vars)
@@ -1566,7 +1566,7 @@ class pyside_build(_build):
"{pyside_package_dir}/PySide2/Qt/libexec",
vars=vars)
- def prepare_standalone_package_osx(self, executables, vars):
+ def prepare_standalone_package_macos(self, executables, vars):
built_modules = vars['built_modules']
# Directory filter for skipping unnecessary files.
@@ -1615,7 +1615,7 @@ class pyside_build(_build):
webengine_process_path = os.path.join(bundle, binary)
final_path = os.path.join(qt_lib_path, webengine_process_path)
rpath = "@loader_path/../../../../../"
- osx_fix_rpaths_for_library(final_path, rpath)
+ macos_fix_rpaths_for_library(final_path, rpath)
else:
ignored_modules = []
if not self.is_webengine_built(built_modules):
@@ -1649,7 +1649,7 @@ class pyside_build(_build):
binary = "QtWebEngineProcess"
final_path = os.path.join(qt_libexec_path, binary)
rpath = "@loader_path/../lib"
- osx_fix_rpaths_for_library(final_path, rpath)
+ macos_fix_rpaths_for_library(final_path, rpath)
# Copy the qt.conf file to libexec.
copyfile(
@@ -2063,7 +2063,7 @@ class pyside_build(_build):
final_rpath = "@loader_path/Qt/lib"
else:
final_rpath = self.qtinfo.libs_dir
- osx_fix_rpaths_for_library(srcpath, final_rpath)
+ macos_fix_rpaths_for_library(srcpath, final_rpath)
else:
raise RuntimeError('Not configured for platform ' +