diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-17 15:35:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-10-21 10:19:09 +0000 |
| commit | 4204c1afe21ab432cf918bca5f490c8b1b004103 (patch) | |
| tree | 55cfbdc8021e0c5341d4477dfed40eed33862c88 /packaging-tools/bld_module.py | |
| parent | 86eaffd1431203e5e255e7e94a60a89d27f9c2af (diff) | |
bld_module: Fix using --module_dir
Change-Id: I35d1b30648386c5e7e4077a43df772e5b13ebf98
Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
Diffstat (limited to 'packaging-tools/bld_module.py')
| -rwxr-xr-x | packaging-tools/bld_module.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging-tools/bld_module.py b/packaging-tools/bld_module.py index 38a36c550..ee901e355 100755 --- a/packaging-tools/bld_module.py +++ b/packaging-tools/bld_module.py @@ -223,14 +223,14 @@ else: print(("Using local copy of {0}").format(os.environ['MODULE_NAME'])) qtModuleSourceDirectory = callerArguments.module_dir -qtModuleProFile = locate_pro(MODULE_SRC_DIR) +qtModuleProFile = locate_pro(qtModuleSourceDirectory) # rip out drive letter from path on Windows pro_file_base_path = os.path.split(qtModuleProFile)[0] -qtModuleBuildDirectory = MODULE_SRC_DIR + '_build' +qtModuleBuildDirectory = qtModuleSourceDirectory + '_build' if bldinstallercommon.is_win_platform(): qtModuleBuildDirectory = pro_file_base_path -qtModuleInstallDirectory = MODULE_SRC_DIR + '_install' +qtModuleInstallDirectory = qtModuleSourceDirectory + '_install' if bldinstallercommon.is_win_platform(): qtModuleInstallDirectory = qtModuleInstallDirectory[2:] @@ -353,7 +353,7 @@ if callerArguments.makeDocs: dir_to_archive = os.path.dirname(bldinstallercommon.locate_directory(qtModuleInstallDirectory, 'qt5_package_dir')) # if .tag file exists in the source package (sha1) then copy it into the binary archive -tag_file = bldinstallercommon.locate_file(MODULE_SRC_DIR, '.tag') +tag_file = bldinstallercommon.locate_file(qtModuleSourceDirectory, '.tag') if tag_file: shutil.copy2(tag_file, dir_to_archive + os.sep + 'qt5_package_dir') |