summaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2021-06-11 09:24:32 +0300
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2021-09-10 09:29:55 +0300
commitbfa8427531cf871b7423c252f522b7bfe75c7edd (patch)
tree6e7cc2011990d04e06cba39bf3bb636ff0adc8bd /coin
parent2767b0c96a0dbe713bc2d1e346d10f6787556d5b (diff)
Add sources and qmake project files for libarchive
- Included from upstream source archive distribution: * Sources from "libarchive/" directory, excluding manpages, tests and build files * "COPYING" from archive root * Configuration headers in "3rdparty/libarchive/config/*" are pre-generated from "build/cmake/config.h.in" - Add project files for qmake, document usage of library in "3rdparty/libarchive/qt_attribution.json". - Update build instructions for Coin. - Support for libarchive can be enabled or disabled with the "libarchive" configuration feature. - Update "Getting Started" page in documentation. Change-Id: I2c2312600b3c6ede4925625d29953dcebaa48b98 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'coin')
-rw-r--r--coin/instructions/common_environment.yaml48
-rw-r--r--coin/instructions/make_check_instructions.yaml6
-rw-r--r--coin/instructions/qmake_module_build.yaml4
3 files changed, 53 insertions, 5 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
index c3fd59f15..cdbc1ea3f 100644
--- a/coin/instructions/common_environment.yaml
+++ b/coin/instructions/common_environment.yaml
@@ -50,6 +50,54 @@ instructions:
property: host.os
in_values: [MacOS, Linux]
+ - type: EnvironmentVariable
+ variableName: IFW_LZMA_LIBRARY
+ variableValue: "/usr/local/opt/xz/lib/liblzma.a"
+ enable_if:
+ condition: property
+ property: host.os
+ equals_value: MacOS
+
+ - type: EnvironmentVariable
+ variableName: IFW_ICONV_LIBRARY
+ variableValue: "/usr/local/opt/libiconv/lib/libiconv.a"
+ enable_if:
+ condition: property
+ property: host.os
+ equals_value: MacOS
+
+ - type: PrependToEnvironmentVariable
+ variableName: C_INCLUDE_PATH
+ variableValue: "/usr/local/opt/xz/include:/usr/local/opt/libiconv/include:"
+ enable_if:
+ condition: property
+ property: host.os
+ equals_value: MacOS
+
+ - type: PrependToEnvironmentVariable
+ variableName: CPLUS_INCLUDE_PATH
+ variableValue: "/usr/local/opt/xz/include:/usr/local/opt/libiconv/include:"
+ enable_if:
+ condition: property
+ property: host.os
+ equals_value: MacOS
+
+ - type: PrependToEnvironmentVariable
+ variableName: INCLUDE
+ variableValue: "C:\\Utils\\bzip2-1.0.8;C:\\Utils\\zlib-1.2.11;C:\\Utils\\xz-5.2.5\\src\\liblzma\\api;"
+ enable_if:
+ condition: property
+ property: host.os
+ equals_value: Windows
+
+ - type: PrependToEnvironmentVariable
+ variableName: LIB
+ variableValue: "C:\\Utils\\bzip2-1.0.8;C:\\Utils\\zlib-1.2.11;C:\\Utils\\xz-5.2.5\\windows\\vs2015\\ReleaseMT\\Win32\\liblzma;"
+ enable_if:
+ condition: property
+ property: target.compiler
+ equals_value: MSVC2015
+
- type: Group
instructions:
- type: PrependToEnvironmentVariable
diff --git a/coin/instructions/make_check_instructions.yaml b/coin/instructions/make_check_instructions.yaml
index 9253fa548..f1ffec3cc 100644
--- a/coin/instructions/make_check_instructions.yaml
+++ b/coin/instructions/make_check_instructions.yaml
@@ -23,7 +23,7 @@ instructions:
maxTimeBetweenOutput: 120
userMessageOnFailure: "Failed to change into tests directory."
- type: ExecuteCommand
- command: "{{.InstallDir}}/bin/qmake.exe INSTALL_PREFIX={{.InstallDir}} IFW_LIB_PATH={{.InstallDir}}/lib"
+ command: "{{.InstallDir}}/bin/qmake.exe CONFIG+=libarchive INSTALL_PREFIX={{.InstallDir}} IFW_LIB_PATH={{.InstallDir}}/lib"
maxTimeInSeconds: 600
maxTimeBetweenOutput: 600
userMessageOnFailure: "Failed running qmake, check logs."
@@ -57,7 +57,7 @@ instructions:
maxTimeBetweenOutput: 120
userMessageOnFailure: "Failed to change into tests directory."
- type: ExecuteCommand
- command: "{{.InstallDir}}/bin/qmake INSTALL_PREFIX={{.InstallDir}} IFW_LIB_PATH={{.InstallDir}}/lib"
+ command: "{{.InstallDir}}/bin/qmake CONFIG+=libarchive INSTALL_PREFIX={{.InstallDir}} IFW_LIB_PATH={{.InstallDir}}/lib"
maxTimeInSeconds: 600
maxTimeBetweenOutput: 600
userMessageOnFailure: "Failed running qmake, check logs."
@@ -86,7 +86,7 @@ instructions:
maxTimeBetweenOutput: 120
userMessageOnFailure: "Failed to change into tests directory."
- type: ExecuteCommand
- command: "c:{{.InstallDir}}\\bin\\qmake.exe INSTALL_PREFIX={{.InstallDir}} IFW_LIB_PATH={{.InstallDir}}/lib"
+ command: "c:{{.InstallDir}}\\bin\\qmake.exe CONFIG+=libarchive INSTALL_PREFIX={{.InstallDir}} IFW_LIB_PATH={{.InstallDir}}/lib"
maxTimeInSeconds: 600
maxTimeBetweenOutput: 600
userMessageOnFailure: "Failed running qmake, check logs."
diff --git a/coin/instructions/qmake_module_build.yaml b/coin/instructions/qmake_module_build.yaml
index 3e1072d01..023927567 100644
--- a/coin/instructions/qmake_module_build.yaml
+++ b/coin/instructions/qmake_module_build.yaml
@@ -33,7 +33,7 @@ instructions:
directory: "{{.BuildDir}}"
- type: ExecuteCommand
- command: ["{{.InstallDir}}/bin/qmake", "QTPLUGIN.platforms = qminimal qxcb", "INSTALL_PREFIX={{.InstallDir}}", "{{.SourceDir}}"]
+ command: ["{{.InstallDir}}/bin/qmake", "CONFIG+=libarchive", "QTPLUGIN.platforms = qminimal qxcb", "INSTALL_PREFIX={{.InstallDir}}", "{{.SourceDir}}"]
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 600
userMessageOnFailure: "Failed to run qmake, check logs."
@@ -43,7 +43,7 @@ instructions:
equals_value: Linux
- type: ExecuteCommand
- command: ["{{.InstallDir}}/bin/qmake", "INSTALL_PREFIX={{.InstallDir}}", "{{.SourceDir}}"]
+ command: ["{{.InstallDir}}/bin/qmake", "CONFIG+=libarchive", "INSTALL_PREFIX={{.InstallDir}}", "{{.SourceDir}}"]
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 600
userMessageOnFailure: "Failed to run qmake, check logs."