diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-18 09:53:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-10-21 10:19:11 +0000 |
| commit | d5aa6f7f26f465579f14e915179fac07d3d9c258 (patch) | |
| tree | 374acb9d738f517e2b32814569ad52314c375e43 /packaging-tools/bld_module.py | |
| parent | 4204c1afe21ab432cf918bca5f490c8b1b004103 (diff) | |
bld_module: Style fixes for Windows special handling
- No need for multiple if is_win_platform
- Wrongly placed comment about stripping drive letter
- There is os.path.dirname for getting the directory name
Change-Id: Id28bc7f2328c004dd399c9cea6764287b9189d23
Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
Diffstat (limited to 'packaging-tools/bld_module.py')
| -rwxr-xr-x | packaging-tools/bld_module.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/packaging-tools/bld_module.py b/packaging-tools/bld_module.py index ee901e355..7b6fb1f2f 100755 --- a/packaging-tools/bld_module.py +++ b/packaging-tools/bld_module.py @@ -223,16 +223,14 @@ else: print(("Using local copy of {0}").format(os.environ['MODULE_NAME'])) qtModuleSourceDirectory = callerArguments.module_dir -qtModuleProFile = locate_pro(qtModuleSourceDirectory) -# rip out drive letter from path on Windows -pro_file_base_path = os.path.split(qtModuleProFile)[0] - qtModuleBuildDirectory = qtModuleSourceDirectory + '_build' -if bldinstallercommon.is_win_platform(): - qtModuleBuildDirectory = pro_file_base_path qtModuleInstallDirectory = qtModuleSourceDirectory + '_install' +qtModuleProFile = locate_pro(qtModuleSourceDirectory) if bldinstallercommon.is_win_platform(): + # rip out drive letter from path on Windows qtModuleInstallDirectory = qtModuleInstallDirectory[2:] + # do not shadow-build on Windows + qtModuleBuildDirectory = os.path.dirname(qtModuleProFile) # check whether this is a QNX build if any('qnx' in qt5_url.lower() for qt5_url in callerArguments.qt5_module_urls): |