aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/create_installer.py
diff options
context:
space:
mode:
authorAntti Kokko <antti.kokko@qt.io>2022-11-29 13:19:30 +0200
committerAntti Kokko <antti.kokko@qt.io>2022-12-02 07:39:11 +0000
commit4d9667c768b4bb297a7d2a567a29071078ef75dd (patch)
treeabab5004f0fe52b92458f14d678637232bdb449b /packaging-tools/create_installer.py
parente3502143b1ee8febd162eab0531c2d8a774af617 (diff)
create_installer.py: remove obsolete maintenancetool resource creationv6.2.7-lts-packagingv5.15.12-lts-packaging
Resource file is created in CI currently, this code is not used anymore. Change-Id: I61e7c0af2af68c76602ae69ebc85e2264fa029cc Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'packaging-tools/create_installer.py')
-rw-r--r--packaging-tools/create_installer.py40
1 files changed, 2 insertions, 38 deletions
diff --git a/packaging-tools/create_installer.py b/packaging-tools/create_installer.py
index 413ad173d..3d0c3196b 100644
--- a/packaging-tools/create_installer.py
+++ b/packaging-tools/create_installer.py
@@ -791,11 +791,6 @@ def create_online_repository(task: Any) -> None:
"""Create online repository using repogen tool."""
log.info("Create online repository")
- # handle special case if MaintenanceTool repository build and
- # update.rcc update requeste
- if task.create_maintenance_tool_resource_file:
- create_maintenance_tool_resource_file(task)
-
# repogen arguments
if task.create_repository:
log.info("Creating online repository:")
@@ -811,28 +806,6 @@ def create_online_repository(task: Any) -> None:
raise CreateInstallerError(f"Unable to create repository directory: {task.repo_output_dir}")
-##############################################################
-# Create MaintenanceTool resource file
-##############################################################
-def create_maintenance_tool_resource_file(task: Any) -> None:
- """Create MaintenanceTool resource file."""
- log.info("Create MaintenanceTool resource file")
- set_config_directory(task)
- config_xml = set_config_xml(task)
- pkg_dir = task.packages_full_path_dst
- cmd_args = [task.binarycreator_tool, '--online-only', '-p', pkg_dir, '-c', config_xml, '-rcc']
- run_cmd(cmd=cmd_args, cwd=task.script_root_dir)
- # archive
- resource_file = os.path.join(task.script_root_dir, 'update.rcc')
- try:
- installer_base_archive = locate_path(task.packages_full_path_dst, ["*installer-framework*"], filters=[os.path.isfile])
- # inject the resource file to the same archive where installerbase is
- inject_update_rcc_to_archive(installer_base_archive, resource_file)
- except PackagingError:
- log.error("Unable to locate installerbase archive from: %s", task.packages_full_path_dst)
- log.error("The update.rcc will not be included in the MaintenanceTool repository!")
-
-
###############################
# function
###############################
@@ -961,9 +934,6 @@ class QtInstallerTask:
force_version_number_increase: bool = False
version_number_auto_increase_value: str = "-" + strftime("%Y%m%d%H%M", gmtime())
max_cpu_count: int = 8
- create_maintenance_tool_resource_file: bool = bool(
- os.environ.get("CREATE_MAINTENANCE_TOOL_RESOURCE_FILE")
- )
substitution_list: List[str] = field(default_factory=list)
def __post_init__(self) -> None:
@@ -1006,8 +976,7 @@ class QtInstallerTask:
Build timestamp: {self.build_timestamp}
Force version number increase: {self.force_version_number_increase}
Version number auto increase value: {self.version_number_auto_increase_value}
- Mac cpu count: {self.max_cpu_count}
- Create MaintenanceTool resource file: {self.create_maintenance_tool_resource_file}"""
+ Mac cpu count: {self.max_cpu_count}"""
def _parse_substitutions(self) -> None:
for item in self.substitution_list: # pylint: disable=not-an-iterable
@@ -1146,10 +1115,6 @@ def main() -> None:
parser.add_argument("--max-cpu-count", dest="max_cpu_count", type=int, default=8,
help="Set maximum number of CPU's used on packaging")
- parser.add_argument("--create-maintenance-tool-resource-file", type=str2bool, nargs='?',
- const=True, dest="create_maintenance_tool_resource_file",
- default=os.environ.get('CREATE_MAINTENANCE_TOOL_RESOURCE_FILE'),
- help="Create resource file for Maintenance Tool")
args = parser.parse_args(sys.argv[1:])
task: QtInstallerTask = QtInstallerTask(
@@ -1171,8 +1136,7 @@ def main() -> None:
remove_debug_information_files=args.remove_debug_information_files,
remove_debug_libraries=args.remove_debug_libraries,
remove_pdb_files=args.remove_pdb_files,
- max_cpu_count=args.max_cpu_count,
- create_maintenance_tool_resource_file=args.create_maintenance_tool_resource_file,
+ max_cpu_count=args.max_cpu_count
)
log.info(str(task))
create_installer(task)