Extract and share create_download_extract_task

From bld_module and bld_qtcreator

Change-Id: I18446f8c1f593562d319e5b1d73417f3e3bdac48
Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>

1 files changed, 7 insertions, 18 deletions

diff --git a/packaging-tools/bld_qtcreator.py b/packaging-tools/bld_qtcreator.py
index 90c55e2c9..929c64c54 100644
--- a/packaging-tools/bld_qtcreator.py
+++ b/packaging-tools/bld_qtcreator.py
@@ -49,24 +49,13 @@ import multiprocessing
 import os
 import subprocess
 import sys
-from urlparse import urlparse
 
 # own imports
 from threadedwork import Task, ThreadedWork
-from bld_utils import download, gitSHA, runBuildCommand, runCommand, runInstallCommand, stripVars
+from bld_utils import gitSHA, runBuildCommand, runCommand, runInstallCommand, stripVars
 import bldinstallercommon
 from patch_qmake_qt_key import replace_key
 
-def createDownloadExtract7zTask(url, target_path, temp_path, caller_arguments):
-    fileNameFromUrl = os.path.basename(urlparse(url).path)
-    sevenzipFile = os.path.join(temp_path, fileNameFromUrl)
-    downloadExtract7zTask = Task("download {0} to {1} and extract it to {2}".format(url, sevenzipFile, target_path))
-
-    downloadExtract7zTask.addFunction(download, url, sevenzipFile)
-    downloadExtract7zTask.addFunction(runCommand, "7z x -y {0} -o{1}".format(
-        sevenzipFile, target_path), temp_path, caller_arguments)
-    return downloadExtract7zTask
-
 bldinstallercommon.init_common_module(os.path.dirname(os.path.realpath(__file__)))
 
 # install an argument parser
@@ -184,7 +173,7 @@ if not os.path.lexists(callerArguments.qt5path):
         package_url = callerArguments.qt5_packages_url + '/' + package
         if bldinstallercommon.is_content_url_valid(package_url):
             myGetQtBinaryWork.addTaskObject(
-                createDownloadExtract7zTask(package_url, callerArguments.qt5path, tempPath, callerArguments))
+                bldinstallercommon.create_download_extract_task(package_url, callerArguments.qt5path, tempPath, callerArguments))
         else:
             print("warning: could not find {0}".format(package_url))
 
@@ -196,21 +185,21 @@ if not os.path.lexists(callerArguments.qt5path):
 
     if not bldinstallercommon.is_mac_platform():
         myGetQtBinaryWork.addTaskObject(
-            createDownloadExtract7zTask(callerArguments.icu7z, targetPath, tempPath, callerArguments))
+            bldinstallercommon.create_download_extract_task(callerArguments.icu7z, targetPath, tempPath, callerArguments))
 
     if bldinstallercommon.is_win_platform():
         targetPath = os.path.join(callerArguments.qt5path, 'bin')
         myGetQtBinaryWork.addTaskObject(
-            createDownloadExtract7zTask(callerArguments.d3dcompiler7z, targetPath, tempPath, callerArguments))
+            bldinstallercommon.create_download_extract_task(callerArguments.d3dcompiler7z, targetPath, tempPath, callerArguments))
         myGetQtBinaryWork.addTaskObject(
-            createDownloadExtract7zTask(callerArguments.opengl32sw7z, targetPath, tempPath, callerArguments))
+            bldinstallercommon.create_download_extract_task(callerArguments.opengl32sw7z, targetPath, tempPath, callerArguments))
         if callerArguments.openssl7z:
             myGetQtBinaryWork.addTaskObject(
-                createDownloadExtract7zTask(callerArguments.openssl7z, targetPath, tempPath, callerArguments))
+                bldinstallercommon.create_download_extract_task(callerArguments.openssl7z, targetPath, tempPath, callerArguments))
 
 ### add get installer base task
     myGetQtBinaryWork.addTaskObject(
-        createDownloadExtract7zTask(callerArguments.installerbase7z, tempPath, tempPath, callerArguments))
+        bldinstallercommon.create_download_extract_task(callerArguments.installerbase7z, tempPath, tempPath, callerArguments))
 
 ### run get Qt 5 tasks
     myGetQtBinaryWork.run()