1 files changed, 120 insertions, 11 deletions
diff --git a/coin/instructions/make_instructions.yaml b/coin/instructions/make_instructions.yaml
index f9f1dd406..dc29df9c4 100644
--- a/coin/instructions/make_instructions.yaml
+++ b/coin/instructions/make_instructions.yaml
@@ -61,16 +61,7 @@ instructions:
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to run jom/make, check logs."
-      - type: ExecuteCommand
-        command: ['jom', 'html_docs']
-        maxTimeInSeconds: 36000
-        maxTimeBetweenOutput: 3600
-        userMessageOnFailure: 'Could not build documentation.'
-      - type: UploadArtifact
-        archiveDirectory: '{{.BuildDir}}\\doc'
-        transferType: UploadModuleDocumentation
-        maxTimeInSeconds: 1800
-        maxTimeBetweenOutput: 1800
+      - !include "{{installer-framework/installer-framework}}/make_win_docs_instructions.yaml"
       - type: ExecuteCommand
         command: "nmake install INSTALL_ROOT={{.InstallRoot}}"
         maxTimeInSeconds: 1800
@@ -81,8 +72,112 @@ instructions:
       property: target.compiler
       in_values: [MSVC2013, MSVC2015, MSVC2017, MSVC2019]
 
+  - type: Group
+    instructions:
+      - type: ChangeDirectory
+        directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+      - type: ExecuteCommand
+        command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-linux-x64-5.0.0.run"
+        maxTimeInSeconds: 36000
+        maxTimeBetweenOutput: 3600
+        userMessageOnFailure: "Failed to create ifw installer."
+      - type: Rename
+        sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-linux-x64-5.0.0.run"
+        targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-linux-x64-5.0.0.run"
+        userMessageOnFailure: "Failed to copy installer."
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Linux
+        - condition: property
+          property: target.arch
+          equals_value: X86_64
+
+  - type: Group
+    instructions:
+      - type: ChangeDirectory
+        directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+      - type: ExecuteCommand
+        command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-linux-aarch64-5.0.0.run"
+        maxTimeInSeconds: 36000
+        maxTimeBetweenOutput: 3600
+        userMessageOnFailure: "Failed to create ifw installer."
+      - type: Rename
+        sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-linux-aarch64-5.0.0.run"
+        targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-linux-aarch64-5.0.0.run"
+        userMessageOnFailure: "Failed to copy installer."
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Linux
+        - condition: property
+          property: target.arch
+          equals_value: AARCH64
+
+  - type: Group
+    instructions:
+      - type: ChangeDirectory
+        directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+      - type: ExecuteCommand
+        command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-macOS-x64-5.0.0.app"
+        maxTimeInSeconds: 36000
+        maxTimeBetweenOutput: 3600
+        userMessageOnFailure: "Failed to create ifw installer."
+      - type: ChangeDirectory
+        directory: "{{.AgentWorkingDir}}/qtsdk"
+      - type: ExecuteCommand
+        command: "python3 tqtc-qtsdk/jenkins-templates/jenkins/scripts/pkg_bootstrap.py"
+        maxTimeInSeconds: 1800
+        maxTimeBetweenOutput: 600
+        userMessageOnFailure: "pkg_bootstrap.py failed"
+      - type: EnvironmentVariable
+        variableName: PKG_NODE_ROOT
+        variableValue: "{{.AgentWorkingDir}}/qtsdk"
+      - type: ChangeDirectory
+        directory: "{{.AgentWorkingDir}}/qtsdk/tqtc-qtsdk/packaging_tools"
+      - type: ExecuteCommand
+        command: "python3 -m pipenv run python sign_installer.py mac --file={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-5.0.0.app"
+        maxTimeInSeconds: 36000
+        maxTimeBetweenOutput: 3600
+        userMessageOnFailure: "Failed to sign the ifw installer"
+      - type: ExecuteCommand
+        command: "python3 -m pipenv run python notarize.py --path={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-5.0.0.dmg"
+        maxTimeInSeconds: 36000
+        maxTimeBetweenOutput: 3600
+        userMessageOnFailure: "Failed to notarize the ifw installer"
+      - type: Rename
+        sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-5.0.0.dmg"
+        targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-macOS-x64-5.0.0.dmg"
+        userMessageOnFailure: "Failed to copy installer."
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: MacOS
+
+  - type: Group
+    instructions:
+      - type: ChangeDirectory
+        directory: "{{.SourceDir}}"
+      - type: ExecuteCommand
+        command: "{{.Env.PYTHON3_PATH}}\\python {{.SourceDir}}\\coin\\create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir C:\\{{.SourceDir}}\\IfwInstaller  --target-name QtInstallerFramework-windows-x64-5.0.0"
+        maxTimeInSeconds: 1200
+        maxTimeBetweenOutput: 1200
+        userMessageOnFailure: "Failed to create ifw installer."
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+
   - type: SignPackage
-    directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+    directory: "{{.SourceDir}}/IfwInstaller"
     maxTimeInSeconds: 1200
     maxTimeBetweenOutput: 1200
     enable_if:
@@ -90,6 +185,20 @@ instructions:
       property: host.os
       equals_value: Windows
 
+  - type: Rename
+    sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-windows-x64-5.0.0.exe"
+    targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-windows-x64-5.0.0.exe"
+    userMessageOnFailure: "Failed to copy installer."
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+
+  - type: Rename
+    sourcePath: "{{.SourceDir}}/dist/packages/org.qtproject.ifw.binaries/data/data.7z"
+    targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/ifw_data.7z"
+    userMessageOnFailure: "Failed to copy IFW binary archive."
+
   - type: UploadArtifact
     archiveDirectory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
     transferType: UploadModuleBuildArtifact