aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/create_installer.py
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-12-13 12:10:41 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2017-12-13 12:14:37 +0000
commit8946abc3e49b89d5429d9b94b75880f46d796d2e (patch)
tree57adb4034154360a4fccc658b468248f2b01bcbe /packaging-tools/create_installer.py
parent8d4a16aa980ba006add1d939f8fff4b244a95e6c (diff)
Remove Win OS requirement for removing pdb files
Device Creation emulator packaging is not done on Windows platform. Removing the Win OS requirement allows Device Creation Windows Emulator packaging with pdb files removed. Task-number: QTBUG-64838 Change-Id: I03eb85a850bfc1d67e9479f40280150970a61cae Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'packaging-tools/create_installer.py')
-rw-r--r--packaging-tools/create_installer.py47
1 files changed, 23 insertions, 24 deletions
diff --git a/packaging-tools/create_installer.py b/packaging-tools/create_installer.py
index 4bb1e972e..c460bb6d2 100644
--- a/packaging-tools/create_installer.py
+++ b/packaging-tools/create_installer.py
@@ -838,30 +838,29 @@ def get_component_data(sdk_component, archive, install_dir, data_dir_dest, compr
# remove Windows pdb files when explicitly defined so. Used in offline installer
# and emulator packaging
- if bldinstallercommon.is_win_platform():
- if REMOVE_PDB_FILES.lower() == "true":
- pdb_bin_dir = bldinstallercommon.locate_directory(install_dir, 'bin')
- if os.path.exists(pdb_bin_dir):
- print 'Erasing pdb files from: ' + pdb_bin_dir
- # This will only take the text connected to the .pdb by grabbing all non-space characters (\S).
- bldinstallercommon.delete_files_by_type_recursive(pdb_bin_dir, '\S*\.pdb')
-
- pdb_lib_dir = bldinstallercommon.locate_directory(install_dir, 'lib')
- if os.path.exists(pdb_lib_dir):
- print 'Erasing pdb files from: ' + pdb_lib_dir
- bldinstallercommon.delete_files_by_type_recursive(pdb_lib_dir, '\S*\.pdb')
-
- pdb_qml_dir = bldinstallercommon.locate_directory(install_dir, 'qml')
- if os.path.exists(pdb_qml_dir):
- print 'Erasing pdb files from: ' + pdb_qml_dir
- bldinstallercommon.delete_files_by_type_recursive(pdb_qml_dir, '\S*\.pdb')
-
- pdb_plugins_dir = bldinstallercommon.locate_directory(install_dir, 'plugins')
- if os.path.exists(pdb_plugins_dir):
- print 'Erasing pdb files from: ' + pdb_plugins_dir
- bldinstallercommon.delete_files_by_type_recursive(pdb_plugins_dir, '\S*\.pdb')
- else:
- print 'Removal of pdb files is allowed only when creating offline installer!'
+ if REMOVE_PDB_FILES.lower() == "true":
+ pdb_bin_dir = bldinstallercommon.locate_directory(install_dir, 'bin')
+ if os.path.exists(pdb_bin_dir):
+ print 'Erasing pdb files from: ' + pdb_bin_dir
+ # This will only take the text connected to the .pdb by grabbing all non-space characters (\S).
+ bldinstallercommon.delete_files_by_type_recursive(pdb_bin_dir, '\S*\.pdb')
+
+ pdb_lib_dir = bldinstallercommon.locate_directory(install_dir, 'lib')
+ if os.path.exists(pdb_lib_dir):
+ print 'Erasing pdb files from: ' + pdb_lib_dir
+ bldinstallercommon.delete_files_by_type_recursive(pdb_lib_dir, '\S*\.pdb')
+
+ pdb_qml_dir = bldinstallercommon.locate_directory(install_dir, 'qml')
+ if os.path.exists(pdb_qml_dir):
+ print 'Erasing pdb files from: ' + pdb_qml_dir
+ bldinstallercommon.delete_files_by_type_recursive(pdb_qml_dir, '\S*\.pdb')
+
+ pdb_plugins_dir = bldinstallercommon.locate_directory(install_dir, 'plugins')
+ if os.path.exists(pdb_plugins_dir):
+ print 'Erasing pdb files from: ' + pdb_plugins_dir
+ bldinstallercommon.delete_files_by_type_recursive(pdb_plugins_dir, '\S*\.pdb')
+ else:
+ print 'Removal of pdb files is allowed only when creating offline installer!'
if archive.rpath_target:
if not archive.rpath_target.startswith(os.sep):