mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-24 00:46:22 +08:00
Compare commits
73 Commits
v5.12.1
...
wip/qt3dst
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8337e20fad | ||
|
|
7ff76b89dd | ||
|
|
d0d7ade759 | ||
|
|
84aaf6871c | ||
|
|
b02d849d76 | ||
|
|
665703efc9 | ||
|
|
a97d669a20 | ||
|
|
7cc57995bf | ||
|
|
209b8117bd | ||
|
|
78afd2d4b6 | ||
|
|
323dcdb60f | ||
|
|
c71f004171 | ||
|
|
0660a25cca | ||
|
|
675deb1474 | ||
|
|
cc1203311a | ||
|
|
f9c5acb2ff | ||
|
|
76c80866af | ||
|
|
afa1b053fe | ||
|
|
e403403b39 | ||
|
|
ec772e3e4a | ||
|
|
7100c54887 | ||
|
|
88b35a4921 | ||
|
|
cfea5af0ed | ||
|
|
b74bc40b41 | ||
|
|
4df2866684 | ||
|
|
3a1e557e54 | ||
|
|
091820f6a1 | ||
|
|
ffe8fd7701 | ||
|
|
099b7ffe4c | ||
|
|
becac559b7 | ||
|
|
83d5226604 | ||
|
|
9c60d8b190 | ||
|
|
b3b6b100e6 | ||
|
|
1c6f272dd0 | ||
|
|
391ba3a9ca | ||
|
|
d5d380f452 | ||
|
|
6967ec6b73 | ||
|
|
80deae9b74 | ||
|
|
2dff8afa98 | ||
|
|
f64ba39ce5 | ||
|
|
ef7908d90c | ||
|
|
9df5188493 | ||
|
|
774f18e61a | ||
|
|
4f7c2120a7 | ||
|
|
4987a682ff | ||
|
|
bee2b8cdb9 | ||
|
|
3cb745565f | ||
|
|
92498bad9c | ||
|
|
8ba5474da7 | ||
|
|
54cdba9e3d | ||
|
|
6d90dd2191 | ||
|
|
1518bfdab6 | ||
|
|
92b7d48bc2 | ||
|
|
daf0d3a4c6 | ||
|
|
e8a1ca0581 | ||
|
|
22f032bd02 | ||
|
|
47d14b365e | ||
|
|
56b801a77e | ||
|
|
4ddadb9aa3 | ||
|
|
3332223130 | ||
|
|
34c751db5e | ||
|
|
6d2929d1aa | ||
|
|
ea0825abe8 | ||
|
|
209d09d530 | ||
|
|
c1f3a886ed | ||
|
|
6930998900 | ||
|
|
3b5c100040 | ||
|
|
cfa7877afe | ||
|
|
56c43a03cd | ||
|
|
0b18f12f99 | ||
|
|
7028ee3184 | ||
|
|
ff12741299 | ||
|
|
f4b482d844 |
80
.gitmodules
vendored
80
.gitmodules
vendored
@@ -1,60 +1,60 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -62,7 +62,7 @@
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -83,14 +83,14 @@
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -123,185 +123,185 @@
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.12.1
|
||||
branch = 5.12.3
|
||||
status = addon
|
||||
|
||||
@@ -13,9 +13,10 @@ BasedOnStyle: WebKit
|
||||
|
||||
Standard: Cpp11
|
||||
|
||||
# Leave the line breaks up to the user.
|
||||
# Column width is limited to 100 in accordance with Qt Coding Style.
|
||||
# https://wiki.qt.io/Qt_Coding_Style
|
||||
# Note that this may be changed at some point in the future.
|
||||
ColumnLimit: 0
|
||||
ColumnLimit: 100
|
||||
# How much weight do extra characters after the line length limit have.
|
||||
# PenaltyExcessCharacter: 4
|
||||
|
||||
@@ -77,4 +78,5 @@ SortIncludes: false
|
||||
# macros for which the opening brace stays attached.
|
||||
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
|
||||
|
||||
|
||||
# Break constructor initializers before the colon and after the commas.
|
||||
BreakConstructorInitializers: BeforeColon
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Template Target OS Target arch Compiler Target Compiler Features
|
||||
----------------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
|
||||
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
|
||||
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle
|
||||
qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic
|
||||
qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
@@ -12,6 +12,7 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC
|
||||
qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
|
||||
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
|
||||
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
|
||||
qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests
|
||||
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
|
||||
qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release
|
||||
qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch
|
||||
|
||||
@@ -8,9 +8,9 @@ qtci-windows-10-x86_64-10 Mingw73
|
||||
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
Template Target OS Target arch Compiler Target Compiler Features
|
||||
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
|
||||
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
|
||||
qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
|
||||
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
|
||||
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
|
||||
|
||||
3
coin/platform_configs/qtsaferenderer.txt
Normal file
3
coin/platform_configs/qtsaferenderer.txt
Normal file
@@ -0,0 +1,3 @@
|
||||
Template Target OS Target arch Compiler Features
|
||||
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
|
||||
qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples
|
||||
@@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
|
||||
version="1.38.1"
|
||||
version="1.38.16"
|
||||
version_node="8.9.1"
|
||||
urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz"
|
||||
urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
|
||||
@@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten
|
||||
urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
|
||||
urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz"
|
||||
urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz"
|
||||
sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3"
|
||||
sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7"
|
||||
sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d"
|
||||
sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673"
|
||||
sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
|
||||
targetFolder="/opt/emsdk"
|
||||
sudo mkdir "$targetFolder"
|
||||
|
||||
3
coin/provisioning/common/linux/remove-update_notifier.sh
Executable file
3
coin/provisioning/common/linux/remove-update_notifier.sh
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
sudo apt -q -y remove update-notifier update-manager
|
||||
@@ -73,8 +73,8 @@ SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\""
|
||||
SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
|
||||
SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""
|
||||
|
||||
security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
|
||||
security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
|
||||
security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
|
||||
security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
|
||||
|
||||
sudo rm -rf /tmp/openssl-$opensslVersion
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ brew install libiodbc
|
||||
read -r -a arr <<< $(brew list --versions libiodbc)
|
||||
version=${arr[1]}
|
||||
|
||||
SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include:$CPLUS_INCLUDE_PATH"
|
||||
SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib:$LIBRARY_PATH"
|
||||
SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}"
|
||||
SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}"
|
||||
|
||||
echo "libiodbc = $version" >> ~/versions.txt
|
||||
|
||||
@@ -40,6 +40,8 @@
|
||||
# If called directly from another script, it will exit the parent script
|
||||
# as well, if not called in its own subshell with parentheses.
|
||||
|
||||
set -ex
|
||||
|
||||
function DownloadURL {
|
||||
url=$1
|
||||
url_alt=$2
|
||||
@@ -47,11 +49,11 @@ function DownloadURL {
|
||||
targetFile=$4
|
||||
|
||||
echo "Downloading from primary URL '$url'"
|
||||
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || (
|
||||
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || {
|
||||
echo "Failed to download '$url' multiple times"
|
||||
echo "Downloading from alternative URL '$url_alt'"
|
||||
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
|
||||
)
|
||||
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || { echo 'Failed to download even from alternative url'; exit 1; }
|
||||
}
|
||||
|
||||
echo "Checking SHA1 on PKG '$targetFile'"
|
||||
echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
|
||||
|
||||
81
coin/provisioning/common/unix/install-breakpad.sh
Executable file
81
coin/provisioning/common/unix/install-breakpad.sh
Executable file
@@ -0,0 +1,81 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
############################################################################
|
||||
##
|
||||
## Copyright (C) 2019 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
############################################################################
|
||||
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
set -ex
|
||||
|
||||
breakpad_commit_sha="b988fa74ec18de6214b18f723e48331d9a7802ae"
|
||||
breakpad_tar="breakpad_$breakpad_commit_sha.tar.gz"
|
||||
breakpad_tar_url="http://ci-files01-hki.intra.qt.io/input/breakpad/$breakpad_tar"
|
||||
breakpad_tar_sha="a2d404d2aebc947cdac5840a9bccd65dfafae24c"
|
||||
|
||||
linux_syscall_support_commit_sha1="93426bda6535943ff1525d0460aab5cc0870ccaf"
|
||||
linux_syscall_support_tar="linux-syscall-support_$linux_syscall_support_commit_sha1.tar.gz"
|
||||
linux_syscall_support_tar_url="http://ci-files01-hki.intra.qt.io/input/linux-syscall-support/$linux_syscall_support_tar"
|
||||
linux_syscall_support_tar_sha="62565be0920f3661e138d68026b79fbbdc2a11e4"
|
||||
|
||||
targetBreakpad="/tmp/$breakpad_tar"
|
||||
targetSyscall="/tmp/$linux_syscall_support_tar"
|
||||
installFolder="$HOME"
|
||||
breakpadHome="$HOME/breakpad"
|
||||
|
||||
# shellcheck disable=SC2015
|
||||
( DownloadURL "$breakpad_tar_url" "$breakpad_tar_url" "$breakpad_tar_sha" "$targetBreakpad" ) && (
|
||||
DownloadURL "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_sha" "$targetSyscall"
|
||||
) && (
|
||||
tar -xzf "$targetBreakpad" -C "$installFolder"
|
||||
tar -xzf "$targetSyscall" -C "/tmp"
|
||||
mv "/tmp/linux-syscall-support/" "$breakpadHome/src/third_party/lss/"
|
||||
rm -rf $targetBreakpad
|
||||
rm -rf $targetSyscall
|
||||
) || (
|
||||
cd "$HOME"
|
||||
git clone https://chromium.googlesource.com/breakpad/breakpad "$breakpadHome"
|
||||
git clone https://chromium.googlesource.com/linux-syscall-support "$breakpadHome/src/third_party/lss"
|
||||
cd "$breakpadHome"
|
||||
git checkout "$breakpad_commit_sha"
|
||||
cd "$breakpadHome/src/third_party/lss"
|
||||
git checkout "$linux_syscall_support_commit_sha1"
|
||||
)
|
||||
|
||||
|
||||
SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"
|
||||
|
||||
echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
|
||||
echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt
|
||||
75
coin/provisioning/common/unix/install_protobuff.sh
Executable file
75
coin/provisioning/common/unix/install_protobuff.sh
Executable file
@@ -0,0 +1,75 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2018 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# shellcheck source=./DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||
# shellcheck source=./SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
|
||||
|
||||
# This script will install Google's Protocal Buffers which is needed by Automotive Suite
|
||||
|
||||
version="3.6.1"
|
||||
sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
|
||||
internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip"
|
||||
externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
|
||||
|
||||
targetDir="$HOME/protobuf-$version"
|
||||
targetFile="$targetDir.zip"
|
||||
DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
|
||||
unzip "$targetFile" -d "$HOME"
|
||||
sudo rm "$targetFile"
|
||||
|
||||
# devtoolset is needed when running configuration
|
||||
if uname -a |grep -qv "Darwin"; then
|
||||
export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"
|
||||
fi
|
||||
|
||||
echo "Configuring and building protobuf"
|
||||
cd "$targetDir"
|
||||
if uname -a |grep -q Darwin; then
|
||||
./configure --prefix "$(xcrun --sdk macosx --show-sdk-path)/usr/local"
|
||||
SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin"
|
||||
else
|
||||
./configure
|
||||
fi
|
||||
make
|
||||
sudo make install
|
||||
|
||||
# Refresh shared library cache if OS isn't macOS
|
||||
if uname -a |grep -qv "Darwin"; then
|
||||
sudo ldconfig
|
||||
fi
|
||||
|
||||
sudo rm -r "$targetDir"
|
||||
@@ -38,9 +38,9 @@ set -ex
|
||||
# This script will install squish package for Linux and Mac.
|
||||
# Squish is need by Release Test Automation (RTA)
|
||||
|
||||
version="6.3.2"
|
||||
version="6.4.3"
|
||||
# Branch version without dot
|
||||
qtBranch="510x"
|
||||
qtBranch="512x"
|
||||
squishFolder="/opt/squish"
|
||||
squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
|
||||
squishFile="squish-$version-qt$qtBranch-linux64.run"
|
||||
|
||||
@@ -53,10 +53,6 @@ Rename-Item C:\Utils\openssl-$version $destination
|
||||
Remove-Item -Path $zip
|
||||
Remove-Item C:\Utils\openssl-$version.tar
|
||||
|
||||
Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang"
|
||||
Set-EnvironmentVariable "AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar"
|
||||
Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr"
|
||||
|
||||
# Make sure configure for openssl has a "make" and "perl" available
|
||||
$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
|
||||
|
||||
|
||||
@@ -85,7 +85,7 @@ if (IsProxyEnabled) {
|
||||
# Remove "http://" from the beginning
|
||||
$proxy = $proxy.Remove(0,7)
|
||||
$proxyhost,$proxyport = $proxy.split(':')
|
||||
$sdkmanager_args = "--no_https --proxy=http --proxy_host=`"$proxyhost`" --proxy_port=`"$proxyport`" "
|
||||
$sdkmanager_args = "--no_https", "--proxy=http", "--proxy_host=`"$proxyhost`"", "--proxy_port=`"$proxyport`""
|
||||
}
|
||||
|
||||
New-Item -ItemType Directory -Force -Path C:\Utils\Android\licenses
|
||||
@@ -95,9 +95,10 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8
|
||||
# Get a PATH where Java's path is defined from previous provisioning
|
||||
[Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process")
|
||||
|
||||
$sdkmanager_args += " platforms;$sdkApiLevel platform-tools build-tools;$sdkBuildToolsVersion"
|
||||
Run-Executable "$toolsFolder\bin\sdkmanager.bat" "$sdkmanager_args"
|
||||
cd $toolsFolder\bin\
|
||||
$sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion"
|
||||
$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args'
|
||||
iex $command
|
||||
$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
|
||||
iex $command
|
||||
cmd /c "dir C:\Utils\android"
|
||||
|
||||
@@ -4,16 +4,16 @@
|
||||
|
||||
$package = "DXSDK_Jun10.exe"
|
||||
|
||||
$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
|
||||
$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
|
||||
$officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package"
|
||||
$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
|
||||
$exe = "C:\Windows\Temp\$package"
|
||||
|
||||
Download $officialUrl $cachedUrl $exe
|
||||
$sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
|
||||
$package_path = "C:\Windows\Temp\$package"
|
||||
|
||||
Download $officialUrl $cachedUrl $package_path
|
||||
Verify-Checksum $package_path $sdkChecksumSha1 sha1
|
||||
Write-Host "Installing DirectX SDK"
|
||||
Run-Executable $exe "/u"
|
||||
Run-Executable $package_path "/u"
|
||||
|
||||
Remove-Item -Path $exe
|
||||
Remove-Item -Path $package_path
|
||||
|
||||
Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt
|
||||
|
||||
@@ -35,6 +35,28 @@ function Run-Executable
|
||||
}
|
||||
}
|
||||
|
||||
function Extract-tar_gz
|
||||
{
|
||||
Param (
|
||||
[string]$Source,
|
||||
[string]$Destination
|
||||
)
|
||||
Write-Host "Extracting '$Source' to '$Destination'..."
|
||||
|
||||
if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
|
||||
$zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe'
|
||||
if (-not (test-path $zipExe)) {
|
||||
$zipExe = "C:\Utils\sevenzip\7z.exe"
|
||||
if (-not (test-path $zipExe)) {
|
||||
throw "Could not find 7-zip."
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$zipExe = "7z.exe"
|
||||
}
|
||||
Run-Executable "cmd.exe" "/C $zipExe x -y `"$Source`" -so | $zipExe x -y -aoa -si -ttar `"-o$Destination`""
|
||||
}
|
||||
|
||||
function Extract-7Zip
|
||||
{
|
||||
Param (
|
||||
@@ -137,3 +159,22 @@ function IsProxyEnabled {
|
||||
function Get-Proxy {
|
||||
return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
|
||||
}
|
||||
|
||||
function Remove {
|
||||
|
||||
Param (
|
||||
[string]$Path = $(BadParam("a path"))
|
||||
)
|
||||
Write-Host "Removing $Path"
|
||||
$i = 0
|
||||
While ( Test-Path($Path) ){
|
||||
Try{
|
||||
remove-item -Force -Recurse -Path $Path -ErrorAction Stop
|
||||
}catch{
|
||||
$i +=1
|
||||
if ($i -eq 5) {exit 1}
|
||||
Write-Verbose "$Path locked, trying again in 5"
|
||||
Start-Sleep -seconds 5
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
94
coin/provisioning/common/windows/install-breakpad.ps1
Normal file
94
coin/provisioning/common/windows/install-breakpad.ps1
Normal file
@@ -0,0 +1,94 @@
|
||||
############################################################################
|
||||
##
|
||||
## Copyright (C) 2019 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
############################################################################
|
||||
|
||||
# This script install breakpad from sources.
|
||||
# for manual install.. remember to checkout correct version
|
||||
# git clone https://chromium.googlesource.com/breakpad/breakpad
|
||||
# git clone https://chromium.googlesource.com/linux-syscall-support breakpad/src/third_party/lss
|
||||
|
||||
# Commit used to make this zip breakpad_20181113.tar.gz
|
||||
# breakpad
|
||||
# commit 66571f4838b2306161f072555cb199049bc68142 (HEAD -> master, origin/master, origin/HEAD)
|
||||
# linux-syscall-support
|
||||
# commit 93426bda6535943ff1525d0460aab5cc0870ccaf (HEAD -> master, origin/master, origin/HEAD)
|
||||
|
||||
# This script installs breakpad.
|
||||
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
|
||||
$breakpad_commit_sha="b988fa74ec18de6214b18f723e48331d9a7802ae"
|
||||
$breakpad_tar="breakpad_$breakpad_commit_sha.tar.gz"
|
||||
$breakpad_tar_url="http://ci-files01-hki.intra.qt.io/input/breakpad/$breakpad_tar"
|
||||
$breakpad_tar_sha="a2d404d2aebc947cdac5840a9bccd65dfafae24c"
|
||||
|
||||
$linux_syscall_support_commit_sha1="93426bda6535943ff1525d0460aab5cc0870ccaf"
|
||||
$linux_syscall_support_tar="linux-syscall-support_$linux_syscall_support_commit_sha1.tar.gz"
|
||||
$linux_syscall_support_tar_url="http://ci-files01-hki.intra.qt.io/input/linux-syscall-support/$linux_syscall_support_tar"
|
||||
$linux_syscall_support_tar_sha="62565be0920f3661e138d68026b79fbbdc2a11e4"
|
||||
|
||||
$targetBreakpad="$env:tmp\$breakpad_tar"
|
||||
$targetSyscall="$env:tmp\$linux_syscall_support_tar"
|
||||
$installFolder = "C:\Utils"
|
||||
|
||||
# breakpad
|
||||
try {
|
||||
Download $breakpad_tar_url $breakpad_tar_url $targetBreakpad
|
||||
Verify-Checksum $targetBreakpad $breakpad_tar_sha
|
||||
Extract-tar_gz $targetBreakpad $installFolder
|
||||
Remove-Item -Path $targetBreakpad
|
||||
# linux-syscall-support
|
||||
Download $linux_syscall_support_tar_url $linux_syscall_support_tar_url $targetSyscall
|
||||
Verify-Checksum $targetSyscall $linux_syscall_support_tar_sha
|
||||
Extract-tar_gz $targetSyscall "$env:tmp\"
|
||||
New-Item -ItemType directory -Path "$installFolder\breakpad\third_party\lss"
|
||||
Get-ChildItem -Path "$env:tmp\linux-syscall-support\*" -Recurse | Move-Item -Destination "$installFolder\breakpad\third_party\lss"
|
||||
Remove-Item -Path $targetSyscall
|
||||
}
|
||||
catch {
|
||||
Write-Host "Cached download failed: Attempping fallback method eg git."
|
||||
Set-Location $installFolder
|
||||
git.exe clone "https://chromium.googlesource.com/breakpad/breakpad"
|
||||
git.exe clone "https://chromium.googlesource.com/linux-syscall-support breakpad\third_party\ssl"
|
||||
Set-Location "breakpad"
|
||||
git checkout $breakpad_commit_sha
|
||||
Set-Location "src/third_party/lss"
|
||||
git checkout $linux_syscall_support_commit_sha1
|
||||
}
|
||||
|
||||
Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad"
|
||||
|
||||
# Write HEAD commit sha to versions txt, so build can be repeated at later date
|
||||
Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt
|
||||
Write-Output "linux-syscall-support = $linux_syscall_support_tar" >> ~/versions.txt
|
||||
55
coin/provisioning/common/linux/open62541.sh → coin/provisioning/common/windows/install-gnuwin32.ps1
Executable file → Normal file
55
coin/provisioning/common/linux/open62541.sh → coin/provisioning/common/windows/install-gnuwin32.ps1
Executable file → Normal file
@@ -1,8 +1,6 @@
|
||||
#!/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 The Qt Company Ltd.
|
||||
## Copyright (C) 2019 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -31,43 +29,18 @@
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
############################################################################
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
set +e
|
||||
# This script will install gnuwin32
|
||||
|
||||
# shellcheck disable=SC1090
|
||||
|
||||
# We need to source to be able to use cmake in the shell
|
||||
if uname -a |grep -q "Ubuntu"; then
|
||||
source ~/.profile
|
||||
else
|
||||
source ~/.bashrc
|
||||
fi
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
|
||||
# shellcheck disable=SC2064
|
||||
trap "sudo rm -fr $TEMPDIR" EXIT
|
||||
cd "$TEMPDIR"
|
||||
|
||||
sudo pip install --upgrade pip
|
||||
sudo pip install six
|
||||
|
||||
git clone https://github.com/open62541/open62541.git open62541
|
||||
cd open62541
|
||||
git checkout 215651ab8db94e5eacdd10ec26a5a9fb96b9301f
|
||||
mkdir build
|
||||
cd build
|
||||
TARGETPATH=/opt/open62541
|
||||
cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH="$TARGETPATH" ..
|
||||
make
|
||||
|
||||
sudo make install
|
||||
sudo /sbin/ldconfig
|
||||
|
||||
SetEnvVar "CI_OPEN62541_GCC_X64_PREFIX" "$TARGETPATH"
|
||||
$prog = "gnuwin32"
|
||||
$zipPackage = "$prog.zip"
|
||||
$temp = "$env:tmp"
|
||||
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage"
|
||||
$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage"
|
||||
Download $externalUrl $internalUrl "$temp\$zipPackage"
|
||||
Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
|
||||
Extract-7Zip "$temp\$zipPackage" C:\Utils
|
||||
|
||||
Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt
|
||||
64
coin/provisioning/common/windows/install-protobuf.ps1
Normal file
64
coin/provisioning/common/windows/install-protobuf.ps1
Normal file
@@ -0,0 +1,64 @@
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2019 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script will install Google's Protocol Buffers
|
||||
# Script requires Cmake to be installed and strawberry-perl not to be installed
|
||||
|
||||
$version = "3.6.1"
|
||||
$sha1 = "44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
|
||||
$officialUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
|
||||
$cachedUrl = "http://ci-files01-hki.ci.local/input/automotive_suite/protobuf-all-$version.zip"
|
||||
$zip = "C:\Utils\protobuf-all-$version.zip"
|
||||
$installationFolder = "C:\Utils\protobuf"
|
||||
|
||||
Write-Host "Installing Protocol Buffers"
|
||||
Add-Path "C:\CMake\bin"
|
||||
Download "$officialUrl" "$cachedUrl" "$zip"
|
||||
Verify-Checksum "$zip" "$sha1"
|
||||
Extract-7Zip "$zip" C:\Utils
|
||||
New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build"
|
||||
New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build\release"
|
||||
New-Item -ItemType directory -Force -Path "$installationFolder"
|
||||
cd "C:\Utils\protobuf-$version\cmake\build\release"
|
||||
cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && cmake -G `"NMake Makefiles`" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$installationFolder ../.. && nmake && nmake install"
|
||||
if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){
|
||||
Write-Host "Can't find $installationFolder\bin\protoc.exe. Installation probably failed!"
|
||||
exit 1
|
||||
}
|
||||
|
||||
Remove-Item "$zip"
|
||||
|
||||
Add-Path "$installationFolder\bin"
|
||||
Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include"
|
||||
Set-EnvironmentVariable PROTOBUF_LIB "$installationFolder\lib"
|
||||
@@ -1,4 +1,4 @@
|
||||
. "$PSScriptRoot\..\common\windows\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script will install msys which is needed for configuring openssl for Android
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2018 The Qt Company Ltd.
|
||||
## Copyright (C) 2019 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -33,27 +33,58 @@
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$zip = Get-DownloadLocation "uasdkcpp.zip"
|
||||
$sha1 = "e1927dbd5d8bb459b468fa70a70b1de51a4ce022"
|
||||
$installLocation = "C:\Utils\uacpp"
|
||||
function DownloadAndInstallUA
|
||||
{
|
||||
Param (
|
||||
[string] $InstallerFileName = $(BadParam("no download URL specified")),
|
||||
[string] $sha1 = $(BadParam("No SHA1 for download specified")),
|
||||
[string] $Destination = $(BadParam("No location to install specified"))
|
||||
)
|
||||
Write-Host "UACPPSDK: DownloadAndInstallUA $InstallerFileName"
|
||||
$zip = Get-DownloadLocation "uasdkcpp.zip"
|
||||
|
||||
Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..."
|
||||
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.zip"
|
||||
# No public download link exists
|
||||
$externalUrl = $internalUrl
|
||||
Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..."
|
||||
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/$InstallerFileName.zip"
|
||||
# No public download link exists
|
||||
$externalUrl = $internalUrl
|
||||
|
||||
Download $externalUrl $internalUrl $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
Download $externalUrl $internalUrl $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
|
||||
Write-Host "UACPPSDK: Installing $zip..."
|
||||
Extract-7Zip $zip (Get-DefaultDownloadLocation)
|
||||
Remove-Item -Path $zip
|
||||
Write-Host "UACPPSDK: Extracting $zip..."
|
||||
Extract-7Zip $zip (Get-DefaultDownloadLocation)
|
||||
Remove-Item -Path $zip
|
||||
|
||||
$executable = (Get-DefaultDownloadLocation) + "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.exe"
|
||||
$arguments = "/S /D=$installLocation"
|
||||
Run-Executable $executable $arguments
|
||||
Write-Host "UACPPSDK: Installer done."
|
||||
Remove-Item $executable
|
||||
$executable = (Get-DefaultDownloadLocation) + "$InstallerFileName.exe"
|
||||
# We cannot call the installer as the x86 and x64 versions of the installer are not
|
||||
# allowed to be installed in parallel (they check for the same registry value and
|
||||
# delete each other). Extracting does not have a side-effect for Qt
|
||||
#$arguments = "/S /D=$installLocation"
|
||||
#Run-Executable $executable $arguments
|
||||
#Write-Host "UACPPSDK: Installer done."
|
||||
#Remove-Item $executable
|
||||
|
||||
Write-Host "Set environment variable for COIN to locate SDK"
|
||||
Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation"
|
||||
Extract-7Zip $executable $Destination
|
||||
Remove-Item $executable
|
||||
}
|
||||
|
||||
#x86 version
|
||||
$installerName86 = "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.6.3-406"
|
||||
$downloadSha86 = "C73278B4C10DF0E3D60ABAA159ABA9185095124C"
|
||||
$installLocation86 = "C:\Utils\uacpp_x86"
|
||||
|
||||
DownloadAndInstallUA $installerName86 $downloadSha86 $installLocation86
|
||||
Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation86"
|
||||
# For UA msvc2015 is binary compatible with msvc2017
|
||||
Set-EnvironmentVariable "CI_UACPP_msvc2017_x86_PREFIX" "$installLocation86"
|
||||
|
||||
|
||||
#x64 version
|
||||
$installerName64 = "uasdkcppbundle-bin-EVAL-win64-x86_64-vs2015-v1.6.3-406"
|
||||
$downloadSha64 = "1384e6882644f9163e9840aee962cdb9ca3398c8"
|
||||
$installLocation64 = "C:\Utils\uacpp_x64"
|
||||
|
||||
DownloadAndInstallUA $installerName64 $downloadSha64 $installLocation64
|
||||
Set-EnvironmentVariable "CI_UACPP_msvc2015_x64_PREFIX" "$installLocation64"
|
||||
# For UA msvc2015 is binary compatible with msvc2017
|
||||
Set-EnvironmentVariable "CI_UACPP_msvc2017_x64_PREFIX" "$installLocation64"
|
||||
|
||||
@@ -1,265 +0,0 @@
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2018 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
Param (
|
||||
[string]$targetCommand= ""
|
||||
)
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
## Variables for builds
|
||||
$commitSHA = "215651ab8db94e5eacdd10ec26a5a9fb96b9301f"
|
||||
$sha1 = "8d899f986071525be73e1ee8565b28ea10536d7d"
|
||||
$extractTarget = "C:\open62541_build"
|
||||
|
||||
function CreateArchive
|
||||
{
|
||||
param(
|
||||
[string]$sourceDirectory=$(throw("You must specify a directory")),
|
||||
[string]$archiveName=$(throw("You must specify an archive name"))
|
||||
)
|
||||
|
||||
if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
|
||||
$zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe'
|
||||
if (-not (test-path $zipExe)) {
|
||||
$zipExe = "C:\Utils\sevenzip\7z.exe"
|
||||
if (-not (test-path $zipExe)) {
|
||||
throw "Could not find 7-zip."
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$zipExe = "7z.exe"
|
||||
}
|
||||
|
||||
Run-Executable $zipExe "a -y `"$archiveName`" `"$sourceDirectory`""
|
||||
}
|
||||
|
||||
function PrepareRepository
|
||||
{
|
||||
$username = $env:USERNAME
|
||||
$zip = "c:\users\$username\downloads\open62541.zip"
|
||||
|
||||
$externalUrl = "https://github.com/open62541/open62541/archive/$commitSHA.zip"
|
||||
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/open62541/$commitSHA.zip"
|
||||
|
||||
Download $externalUrl $internalUrl $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
|
||||
Extract-7Zip $zip $extractTarget
|
||||
}
|
||||
|
||||
function PushDevEnvironment
|
||||
{
|
||||
# Provisioning updates the registry entries for PATH etc. However, they are not
|
||||
# propagated to the next provisioning script and hence need to be manually
|
||||
# read / set.
|
||||
$adaptedPath = $env:PATH
|
||||
$jomLocation = [Environment]::GetEnvironmentVariable("CI_JOM_PATH", "Machine")
|
||||
$adaptedPath = $adaptedPath + ";" + $jomLocation
|
||||
$adaptedPath = $adaptedPath + ";" + "C:\Python27"
|
||||
$adaptedPath = $adaptedPath + ";" + "C:\CMake\bin"
|
||||
[Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
|
||||
}
|
||||
|
||||
function MSVCEnvironment
|
||||
{
|
||||
Param (
|
||||
[string]$msvcDir=$(throw("No VS Directory specified")),
|
||||
[string]$msvcbat=$(throw("No vsvars batch file specified"))
|
||||
)
|
||||
|
||||
Push-Location $msvcDir
|
||||
cmd /c "$msvcbat&set" |
|
||||
foreach {
|
||||
if ($_ -match "=") {
|
||||
$v = $_.split("="); Set-Item -force -path "ENV:\$($v[0])" -value "$($v[1])"
|
||||
}
|
||||
}
|
||||
Pop-Location
|
||||
}
|
||||
|
||||
function BuildAndInstallOpen62541
|
||||
{
|
||||
Param (
|
||||
[string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
|
||||
[string]$Platform=$(throw("You must specify the target platform [x86, x64]")),
|
||||
[string]$MakeCommand=$(throw("You must specify a make command [mingw32-make, nmake]"))
|
||||
)
|
||||
Write-Host "### Open62541: Supposed to build with: $Type $Platform $MakeCommand"
|
||||
|
||||
## Make Build directory
|
||||
$buildDir = "$extractTarget\open62541-$commitSHA\build" + "_" + $Type + "_" + $Platform
|
||||
if (Test-Path $buildDir) {
|
||||
Write-Host " Deleting pre-existing build directory"
|
||||
Remove-Item $buildDir -Force -Recurse
|
||||
}
|
||||
New-Item -ItemType Directory -Force -Path $buildDir
|
||||
Push-Location $buildDir
|
||||
|
||||
## Invoke Cmake
|
||||
$makeGenerator = "NMake Makefiles JOM"
|
||||
$installTarget = "C:\Utils\open62541" + "_" + $Type + "_" + $Platform
|
||||
if (Test-Path $installTarget) {
|
||||
Write-Host " Deleting pre-existing install directory"
|
||||
Remove-Item $installTarget -Force -Recurse
|
||||
}
|
||||
|
||||
if ($Type.StartsWith("mingw")) {
|
||||
$makeGenerator = "MinGW Makefiles"
|
||||
}
|
||||
cmake -G "$makeGenerator" -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=$installTarget -DLIB_INSTALL_DIR:PATH=$installTarget/lib ..
|
||||
|
||||
## Call build command
|
||||
Write-Host "### Open62541: Compilation ###"
|
||||
Run-Executable $MakeCommand
|
||||
|
||||
## call install command
|
||||
Write-Host "### Open62541: Installation ###"
|
||||
Run-Executable $MakeCommand install
|
||||
|
||||
$platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform + "_PREFIX"
|
||||
Set-EnvironmentVariable $platformVariable $installTarget
|
||||
|
||||
## Packaging
|
||||
Push-Location "C:\Utils"
|
||||
$archiveName = "open62541_" + $Type + "_" + $Platform + ".7z"
|
||||
CreateArchive $installTarget $archiveName
|
||||
Pop-Location
|
||||
|
||||
## cleanup build directory
|
||||
Write-Host "### Open62541: Cleanup ###"
|
||||
Pop-Location
|
||||
Remove-Item $buildDir -Force -Recurse
|
||||
}
|
||||
|
||||
function DownloadAndInstall
|
||||
{
|
||||
Param (
|
||||
[string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
|
||||
[string]$Platform=$(throw("You must specify the target platform [x86, x64]"))
|
||||
)
|
||||
$baseLocation = "http://ci-files01-hki.intra.qt.io/input/open62541/"
|
||||
$targetName = "open62541_" + $Type + "_" + $Platform
|
||||
$archiveName = $targetName + ".7z"
|
||||
$downloadUrl = $baseLocation + $archiveName
|
||||
|
||||
# Download
|
||||
$downloadTarget = "C:\Utils\" + $archiveName
|
||||
Download $downloadUrl $downloadUrl $downloadTarget
|
||||
|
||||
# Extract
|
||||
Push-Location C:\Utils
|
||||
Extract-7Zip $downloadTarget C:\Utils
|
||||
Pop-Location
|
||||
|
||||
# Set environment variable
|
||||
$platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform
|
||||
$platformPath = "C:\Utils\" + $targetName
|
||||
Set-EnvironmentVariable $platformVariable $platformPath
|
||||
}
|
||||
|
||||
##############################
|
||||
# Startup #
|
||||
##############################
|
||||
if ($targetCommand.StartsWith("mingw")) {
|
||||
Write-Host "### Creating Open62541 for MinGW"
|
||||
$mingwPath = [Environment]::GetEnvironmentVariable($targetCommand, "Machine")
|
||||
if (!$mingwPath) {
|
||||
throw("Could not find mingw")
|
||||
}
|
||||
|
||||
# Strawberry has its own gcc, put mingw in front
|
||||
$adaptedPath = $mingwPath + "\bin;" + [Environment]::GetEnvironmentVariable("PATH", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
|
||||
|
||||
PushDevEnvironment
|
||||
BuildAndInstallOpen62541 $targetCommand x86 "mingw32-make"
|
||||
} elseif ($targetCommand -eq "msvc2015_x86") {
|
||||
Write-Host "### Creating Open62541 for MSVC2015 x86"
|
||||
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat x86"
|
||||
PushDevEnvironment
|
||||
BuildAndInstallOpen62541 msvc2015 x86 jom
|
||||
} elseif ($targetCommand -eq "msvc2015_x64") {
|
||||
Write-Host "### Creating Open62541 for MSVC2015 x64"
|
||||
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat amd64"
|
||||
PushDevEnvironment
|
||||
BuildAndInstallOpen62541 msvc2015 x64 jom
|
||||
} elseif ($targetCommand -eq "msvc2017_x86") {
|
||||
Write-Host "### Creating Open62541 for MSVC2017 x86"
|
||||
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars32.bat
|
||||
PushDevEnvironment
|
||||
BuildAndInstallOpen62541 msvc2017 x86 jom
|
||||
} elseif ($targetCommand -eq "msvc2017_x64") {
|
||||
Write-Host "### Creating Open62541 for MSVC2017 x64"
|
||||
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars64.bat
|
||||
PushDevEnvironment
|
||||
BuildAndInstallOpen62541 msvc2017 x64 jom
|
||||
} elseif ($targetCommand -eq "prepare") {
|
||||
PrepareRepository
|
||||
} elseif ($targetCommand -eq "build") {
|
||||
Write-Host "### Building for all supported platforms"
|
||||
PrepareRepository
|
||||
Write-Host "### Invoking MinGW530 build"
|
||||
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw530
|
||||
Write-Host "### Invoking MinGW630 build"
|
||||
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw630
|
||||
Write-Host "### Invoking MinGW730 build"
|
||||
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw730
|
||||
Write-Host "### Invoking MSVC2015 build"
|
||||
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x86
|
||||
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x64
|
||||
Write-Host "### Invoking MSVC2017 build"
|
||||
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x86
|
||||
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x64
|
||||
Write-Host "### Archives have been generated at C:/Utils. Please upload manually"
|
||||
} elseif ($targetCommand -eq "packaged") {
|
||||
Write-Host "### Expecting pre-built packages, download and install from archives"
|
||||
Write-Host "### MinGW530 x64"
|
||||
DownloadAndInstall mingw530 x86
|
||||
Write-Host "### MinGW630 x64"
|
||||
DownloadAndInstall mingw630 x86
|
||||
Write-Host "### MinGW730 x64"
|
||||
DownloadAndInstall mingw730 x64
|
||||
Write-Host "### MSVC2015 x86"
|
||||
DownloadAndInstall msvc2015 x86
|
||||
Write-Host "### MSVC2015 x64"
|
||||
DownloadAndInstall msvc2015 x64
|
||||
Write-Host "### MSVC2017 x64"
|
||||
DownloadAndInstall msvc2017 x64
|
||||
} elseif ($targetCommand) {
|
||||
Write-Host "### Unknown parameter specified:" $targetCommand " Options are: mingw, msvc2015_x(86/64), msvc2017_x(86/64)"
|
||||
throw("Unknown parameter")
|
||||
} else {
|
||||
# Default behavior
|
||||
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand build
|
||||
}
|
||||
@@ -38,18 +38,18 @@
|
||||
# NOTE! Make sure 64bit versions are always installed before 32bit,
|
||||
# because they use same folder name before a rename
|
||||
|
||||
$version = "6.3.2"
|
||||
$version = "6.4.3"
|
||||
|
||||
# Qt branch without dot (*.*)
|
||||
$qtBranch = "510x"
|
||||
# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point
|
||||
$qtBranch = "512x"
|
||||
# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point
|
||||
# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
|
||||
|
||||
$targetDir = "C:\Utils\squish"
|
||||
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
|
||||
$squishBranchUrl = "$squishUrl\$qtBranch"
|
||||
$testSuite = "suite_test_squish"
|
||||
$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z"
|
||||
$testSuiteUrl = "$squishUrl\$testSuite.7z"
|
||||
|
||||
# Squish license
|
||||
$licensePackage = ".squish-3-license"
|
||||
@@ -62,7 +62,10 @@ Function DownloadAndInstallSquish {
|
||||
[string]$bit,
|
||||
[string]$squishPackage
|
||||
)
|
||||
|
||||
# MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13
|
||||
if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) {
|
||||
$qtBranch = "511x"
|
||||
}
|
||||
$SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
|
||||
$SquishInstaller = "$targetDir\$squishPackage.exe"
|
||||
$SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"
|
||||
@@ -125,25 +128,27 @@ DownloadSquishLicence $squishUrl
|
||||
if ($OSVersion -eq "Windows 10 Enterprise") {
|
||||
|
||||
if (Is64BitWinHost) {
|
||||
DownloadAndInstallSquish $version win64 msvc14
|
||||
DownloadAndInstallSquish $version win64 "msvc14"
|
||||
DownloadAndInstallSquish $version win64 "msvc141"
|
||||
DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh"
|
||||
} else {
|
||||
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
|
||||
}
|
||||
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
|
||||
DownloadAndInstallSquish $version win32 "msvc14"
|
||||
DownloadAndInstallSquish $version win32 "msvc141"
|
||||
|
||||
} elseif ($OSVersion -eq "Windows 8.1 Enterprise") {
|
||||
|
||||
if (Is64BitWinHost) {
|
||||
DownloadAndInstallSquish $version win64 "msvc12"
|
||||
DownloadAndInstallSquish $version win64 "msvc14"
|
||||
}
|
||||
DownloadAndInstallSquish $version win32 "msvc14"
|
||||
DownloadAndInstallSquish $version win32 "msvc141"
|
||||
|
||||
} elseif ($OSVersion -eq "Windows 7 Enterprise") {
|
||||
|
||||
if (Is64BitWinHost) {
|
||||
DownloadAndInstallSquish $version win64 "msvc12"
|
||||
DownloadAndInstallSquish $version win64 "msvc14"
|
||||
} else {
|
||||
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
|
||||
}
|
||||
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
|
||||
DownloadAndInstallSquish $version win32 "msvc14"
|
||||
DownloadAndInstallSquish $version win32 "msvc141"
|
||||
}
|
||||
|
||||
@@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package
|
||||
Verify-Checksum $package $sha1
|
||||
Write-Host "Installing $package..."
|
||||
Run-Executable $package "/q"
|
||||
Write-Host "Remove $package..."
|
||||
Remove-Item -Force -Path $package
|
||||
Remove $package
|
||||
|
||||
@@ -109,6 +109,9 @@ installPackages+=(xcb-util-image-devel)
|
||||
installPackages+=(xcb-util-keysyms-devel)
|
||||
installPackages+=(xcb-util-wm-devel)
|
||||
installPackages+=(xcb-util-renderutil-devel)
|
||||
# ODBC support
|
||||
installPackages+=(unixODBC-devel)
|
||||
installPackages+=(unixODBC)
|
||||
|
||||
sudo yum -y install "${installPackages[@]}"
|
||||
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/install-breakpad.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/bin/env bash
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 The Qt Company Ltd.
|
||||
## Copyright (C) 2018 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -33,5 +33,8 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# shellcheck source=../common/linux/open62541.sh
|
||||
source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/install_protobuff.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
set -ex
|
||||
|
||||
curl -L https://packagecloud.io/github/git-lfs/gpgkey | sudo apt-key add -
|
||||
sudo apt-add-repository 'deb https://packagecloud.io/github/git-lfs/ubuntu/ xenial main'
|
||||
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 37BBEE3F7AD95B3F
|
||||
sudo apt update
|
||||
sudo apt install git-lfs
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/install-breakpad.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"
|
||||
@@ -0,0 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# shellcheck source=../common/linux/remove-update_notifier.sh
|
||||
source "${BASH_SOURCE%/*}/../common/linux/remove-update_notifier.sh"
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/install-breakpad.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/install-breakpad.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/bin/env bash
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 The Qt Company Ltd.
|
||||
## Copyright (C) 2018 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -33,5 +33,8 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# shellcheck source=../common/linux/open62541.sh
|
||||
source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/install_protobuff.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"
|
||||
|
||||
@@ -114,14 +114,14 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
|
||||
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
|
||||
{ iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null
|
||||
|
||||
iPhoneDeveloper="iosdevelopment.p12"
|
||||
shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
|
||||
iPhoneDeveloper="iosdevelopment_2019.p12"
|
||||
shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c"
|
||||
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
|
||||
echo "Importing $iPhoneDeveloper.."
|
||||
{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
|
||||
|
||||
iPhoneDistribution="iosdistribution.p12"
|
||||
shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
|
||||
iPhoneDistribution="iosdistribution_2019.p12"
|
||||
shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac"
|
||||
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
|
||||
echo "Importing $iPhoneDistribution.."
|
||||
{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"
|
||||
@@ -0,0 +1,2 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
|
||||
|
||||
14
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh → coin/provisioning/qtci-windows-10-x86/90-signing-tools.ps1
Executable file → Normal file
14
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh → coin/provisioning/qtci-windows-10-x86/90-signing-tools.ps1
Executable file → Normal file
@@ -1,8 +1,7 @@
|
||||
#!/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 The Qt Company Ltd.
|
||||
## Copyright (C) 2017 Pelagicore AG
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -33,4 +32,13 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
|
||||
. "$PSScriptRoot\..\common\windows\helpers.ps1"
|
||||
|
||||
# Signing tools are needed to sign offline installers when releasing
|
||||
|
||||
$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip"
|
||||
$destination = "C:\Windows\temp\sign.zip"
|
||||
|
||||
Download $url $url $destination
|
||||
Extract-7Zip "$destination" "C:\Utils"
|
||||
Remove-Item -Path "$destination"
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\msys.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-breakpad.ps1"
|
||||
@@ -0,0 +1,2 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\open62541.ps1"
|
||||
@@ -0,0 +1,2 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-protobuf.ps1"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-breakpad.ps1"
|
||||
@@ -0,0 +1,2 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand prepare
|
||||
. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand mingw730
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-breakpad.ps1"
|
||||
@@ -0,0 +1,2 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: a0496abe38...29c20fda75
Submodule qtactiveqt updated: fe276a86f0...766c1133cb
Submodule qtandroidextras updated: 4505f993f7...b059d67771
2
qtbase
2
qtbase
Submodule qtbase updated: 0c49815333...534df5a33b
Submodule qtcanvas3d updated: 101fdeb344...912b9b3b13
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 5ea5bc7413...9755f474a0
Submodule qtconnectivity updated: 736d3e14bb...6a8a8f328d
Submodule qtdatavis3d updated: 7f661ab616...edabd45add
Submodule qtdeclarative updated: a566125b9f...5ead393eba
2
qtdoc
2
qtdoc
Submodule qtdoc updated: f7f5859f46...38a19857d7
Submodule qtgamepad updated: 1f15fda174...cf48d4694e
Submodule qtgraphicaleffects updated: 2c15783c02...8cf6af2c89
Submodule qtimageformats updated: 3987e304df...17ac003f60
Submodule qtlocation updated: bfb88b7a87...a8ecb45143
Submodule qtmacextras updated: ee7ebf396f...1a1188d04a
Submodule qtmultimedia updated: 10ac932185...c7e735198c
Submodule qtnetworkauth updated: 410c82cdd0...0da2783261
Submodule qtpurchasing updated: 9b316440ee...45f2b4a634
2
qtqa
2
qtqa
Submodule qtqa updated: 7bedbd3bbf...8c9be4c82e
Submodule qtquickcontrols updated: 9b88ca4f03...718afd7c3a
Submodule qtquickcontrols2 updated: ef34964c1f...db38242b28
Submodule qtremoteobjects updated: e1c0dbeadc...043f7582bb
Submodule qtrepotools updated: bb13c8f9ce...df3090cb05
2
qtscript
2
qtscript
Submodule qtscript updated: 6c51f94f5c...038f630561
2
qtscxml
2
qtscxml
Submodule qtscxml updated: e64b9a5d33...daad96b2b9
Submodule qtsensors updated: 83e59fedc5...6b7f7f5ceb
Submodule qtserialbus updated: c6ff631f83...9102ab8680
Submodule qtserialport updated: 938fdd74f1...208e76d057
2
qtspeech
2
qtspeech
Submodule qtspeech updated: 935b2b051c...45e7dd1eee
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 71ddbcf502...fd12ae24b4
2
qttools
2
qttools
Submodule qttools updated: 61383ceca6...fe5b4f8e7a
Submodule qttranslations updated: c36807f030...0987e6cb7f
Submodule qtvirtualkeyboard updated: 6f668860ed...152f6935f0
Submodule qtwayland updated: d296dea131...e70a8070ea
Submodule qtwebchannel updated: b2d34596a1...c3574f4ec3
Submodule qtwebengine updated: dde9bbb40c...7ba379ecfa
Submodule qtwebglplugin updated: c76e2a3731...10a64558ce
Submodule qtwebsockets updated: ef876a7d29...c8704b3dbc
Submodule qtwebview updated: 85cf48d62a...05657f1c47
Submodule qtwinextras updated: cd9b2c76cd...b9456015d1
Submodule qtx11extras updated: 857c981c6c...719d3c8867
Submodule qtxmlpatterns updated: fe5b5faf66...6feae56922
Reference in New Issue
Block a user