diff options
Diffstat (limited to 'coin')
-rw-r--r-- | coin/dependencies.yaml | 13 | ||||
-rw-r--r-- | coin/instructions/make_instructions.yaml | 33 | ||||
-rw-r--r-- | coin/instructions/make_win_docs_instructions.yaml | 33 |
3 files changed, 58 insertions, 21 deletions
diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml new file mode 100644 index 000000000..6e5b58335 --- /dev/null +++ b/coin/dependencies.yaml @@ -0,0 +1,13 @@ + +product_dependency: + ../../qt/qt5: + ref: "ifw-5.12.10" +dependency_source: supermodule +dependencies: [ + "../../qt/qtbase", + "../../qt/qtsvg", + "../../qt/qtdeclarative", + "../../qt/qttools", + "../../qt/qttranslations", + "../../qt/qtwinextras" + ] diff --git a/coin/instructions/make_instructions.yaml b/coin/instructions/make_instructions.yaml index b106aa11f..2d2041f6d 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 @@ -86,13 +77,13 @@ 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-4.1.1.run" + command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-linux-x64-4.2.0.run" maxTimeInSeconds: 36000 maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to create ifw installer." - type: Rename - sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-linux-x64-4.1.1.run" - targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-linux-x64-4.1.1.run" + sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-linux-x64-4.2.0.run" + targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-linux-x64-4.2.0.run" userMessageOnFailure: "Failed to copy installer." enable_if: condition: and @@ -106,7 +97,7 @@ 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-4.1.1.app" + command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-macOS-x64-4.2.0.app" maxTimeInSeconds: 36000 maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to create ifw installer." @@ -114,18 +105,18 @@ instructions: variableName: QT_CODESIGN_IDENTITY_KEY variableValue: "A5GTH44LYL" - type: ExecuteCommand - command: "{{.AgentWorkingDir}}/qtsdk/qtsdk/packaging-tools/sign_installer.py mac --file={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.1.1.app" + command: "{{.AgentWorkingDir}}/qtsdk/qtsdk/packaging-tools/sign_installer.py mac --file={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.2.0.app" maxTimeInSeconds: 36000 maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to sign the ifw installer" - type: ExecuteCommand - command: "{{.AgentWorkingDir}}/qtsdk/qtsdk/packaging-tools/notarize.py --dmg={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.1.1.dmg" + command: "{{.AgentWorkingDir}}/qtsdk/qtsdk/packaging-tools/notarize.py --dmg={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.2.0.dmg" maxTimeInSeconds: 36000 maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to notarize the ifw installer" - type: Rename - sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.1.1.dmg" - targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-macOS-x64-4.1.1.dmg" + sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.2.0.dmg" + targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-macOS-x64-4.2.0.dmg" userMessageOnFailure: "Failed to copy installer." enable_if: condition: and @@ -139,7 +130,7 @@ 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-x86-4.1.1" + 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-x86-4.2.0" maxTimeInSeconds: 1200 maxTimeBetweenOutput: 1200 userMessageOnFailure: "Failed to create ifw installer." @@ -160,8 +151,8 @@ instructions: equals_value: Windows - type: Rename - sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-windows-x86-4.1.1.exe" - targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-windows-x86-4.1.1.exe" + sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-windows-x86-4.2.0.exe" + targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-windows-x86-4.2.0.exe" userMessageOnFailure: "Failed to copy installer." enable_if: condition: property diff --git a/coin/instructions/make_win_docs_instructions.yaml b/coin/instructions/make_win_docs_instructions.yaml new file mode 100644 index 000000000..5d5f28f67 --- /dev/null +++ b/coin/instructions/make_win_docs_instructions.yaml @@ -0,0 +1,33 @@ +type: Group +instructions: + - type: Group + instructions: + - type: ChangeDirectory + directory: "{{.SourceDir}}\\doc" + maxTimeInSeconds: 300 + maxTimeBetweenOutput: 120 + userMessageOnFailure: "Failed to change dir" + - type: ExecuteCommand + command: ['sed', '-i', 's/Users\\qt\\work\\install/Utils\\qt-bld-dynamic\\qtbase/g', 'qdoc_wrapper.bat'] + maxTimeInSeconds: 36000 + maxTimeBetweenOutput: 3600 + userMessageOnFailure: 'Failed to patch qdoc_wrapper.bat.' + - type: ChangeDirectory + directory: "{{.BuildDir}}" + maxTimeInSeconds: 300 + maxTimeBetweenOutput: 120 + userMessageOnFailure: "Failed to change dir" + - 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 + enable_if: + condition: property + property: target.compiler + in_values: [MSVC2013, MSVC2015, MSVC2017, MSVC2019] |