mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Merge remote-tracking branch 'origin/5.12' into 5.12.1
Change-Id: I53782263d173268fdfd3a3116c7fc6b596716992
This commit is contained in:
Liang Qi
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -211,7 +211,7 @@
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.12
|
||||
@@ -297,11 +297,11 @@
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.12
|
||||
status = preview
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.12
|
||||
status = preview
|
||||
status = addon
|
||||
|
||||
@@ -14,7 +14,7 @@ qtci-linux-openSUSE-42.3-x86_64 GCC
|
||||
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
|
||||
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-8 Clang DeveloperBuild NoFramework Release QtNamespace NoPch
|
||||
qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch
|
||||
qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
|
||||
qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests
|
||||
qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests
|
||||
|
||||
@@ -9,11 +9,12 @@ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017
|
||||
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-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
|
||||
qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
|
||||
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2
|
||||
|
||||
3
coin/platform_configs/qtconnectivity.txt
Normal file
3
coin/platform_configs/qtconnectivity.txt
Normal file
@@ -0,0 +1,3 @@
|
||||
Template Target OS Target arch Compiler Features
|
||||
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
|
||||
qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo
|
||||
@@ -54,7 +54,7 @@ toolsFile="sdk-tools-linux-4333796.zip"
|
||||
ndkVersion="r18b"
|
||||
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
|
||||
sdkBuildToolsVersion="28.0.3"
|
||||
sdkApiLevel="android-21"
|
||||
sdkApiLevel="android-28"
|
||||
|
||||
toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
|
||||
ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b"
|
||||
@@ -80,14 +80,14 @@ else
|
||||
sudo chown -R qt:users "$targetFolder"
|
||||
fi
|
||||
|
||||
echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
|
||||
echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
|
||||
# shellcheck disable=SC2031
|
||||
if [ "$http_proxy" != "" ]; then
|
||||
proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1)
|
||||
proxy_port=$(echo "$proxy" | cut -d':' -f3)
|
||||
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
|
||||
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
|
||||
else
|
||||
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
|
||||
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
|
||||
fi
|
||||
|
||||
echo "Checking the contents of Android SDK..."
|
||||
|
||||
60
coin/provisioning/common/linux/squish-coco.sh
Executable file
60
coin/provisioning/common/linux/squish-coco.sh
Executable file
@@ -0,0 +1,60 @@
|
||||
#!/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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script installs Squish Coco
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
|
||||
version="4.2.2"
|
||||
sha1="a44f0f039f3712c715eea63c4021d08bf17a44c6"
|
||||
package="SquishCocoSetup_${version}_Linux_x86_64.run"
|
||||
url="http://ci-files01-hki.intra.qt.io/input/coco//$package"
|
||||
|
||||
echo "Enable license for Coco"
|
||||
|
||||
DownloadURL "$url" "$url" "$sha1" "/tmp/$package"
|
||||
sudo chmod 755 "/tmp/$package"
|
||||
echo 1 | sudo "/tmp/$package" "--nox11"
|
||||
|
||||
/opt/SquishCoco/bin/cocolic --license-server=Qt-SRV-33.intra.qt.io:49344
|
||||
|
||||
echo "export PATH=/opt/SquishCoco/bin/:$PATH" >> ~/.bashrc
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/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.
|
||||
@@ -39,33 +39,21 @@ set -ex
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
|
||||
targetFolder="/opt/fbx"
|
||||
version="2016.1.2"
|
||||
fileName="fbx20161_2_fbxsdk_clang_mac.pkg_nospace.tgz"
|
||||
cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName"
|
||||
officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$fileName"
|
||||
sha1="f82535423c700c605320c52e13e781c92208ec6b"
|
||||
# officialUrl="http://download.autodesk.com/us/fbx_release_older/$version/fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
|
||||
targetFolder="/tmp"
|
||||
targetFile="$targetFolder/$fileName"
|
||||
installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"
|
||||
|
||||
echo "Extracting '$cachedUrl'"
|
||||
tar -xzf "$cachedUrl" -C "$targetFolder" || (
|
||||
echo "Failed to uncompress from '$cachedUrl'"
|
||||
echo "Downloading from '$officialUrl'"
|
||||
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl"
|
||||
echo "Checking SHA1 on PKG '$targetFile'"
|
||||
echo "$sha1 *$targetFile" > $targetFile.sha1
|
||||
shasum --check $targetFile.sha1
|
||||
echo "Extracting '$targetFile'"
|
||||
tar -xzf "$targetFile" -C "$targetFolder"
|
||||
)
|
||||
tar -xzf "$cachedUrl" -C "$targetFolder"
|
||||
|
||||
rm -rf "$targetFile"
|
||||
echo "Running installer for '$installer'"
|
||||
sudo installer -pkg "$installer" -target "/"
|
||||
rm -rf "$targetFolder/$fileName"
|
||||
echo "Copying preinstalled FBX SDK to Applications"
|
||||
sudo cp -r "$targetFolder/Autodesk" /Applications
|
||||
|
||||
# Set env variables
|
||||
SetEnvVar "FBXSDK" "/Applications/Autodesk/FBX\ SDK/2016.1.2/"
|
||||
SetEnvVar "FBXSDK" "/Applications/Autodesk/FBXSDK/2016.1.2/"
|
||||
|
||||
echo "FBX SDK = 2016.1.2" >> ~/versions.txt
|
||||
|
||||
|
||||
81
coin/provisioning/common/macos/install_openssl.sh
Executable file
81
coin/provisioning/common/macos/install_openssl.sh
Executable file
@@ -0,0 +1,81 @@
|
||||
#!/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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script install OpenSSL
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
opensslVersion="1.0.2p"
|
||||
opensslFile="openssl-$opensslVersion.tar.gz"
|
||||
opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
|
||||
opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
|
||||
opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c"
|
||||
|
||||
# Below target location has been hard coded into Coin.
|
||||
# QTQAINFRA-1195
|
||||
openssl_install_dir=/usr/local/openssl-$opensslVersion
|
||||
opensslTargetLocation="/usr/local/opt/openssl"
|
||||
|
||||
InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion"
|
||||
cd "/tmp/openssl-$opensslVersion"
|
||||
pwd
|
||||
sudo ./config --prefix=$openssl_install_dir
|
||||
echo "Running 'make' for OpenSSL"
|
||||
sudo make --silent > /tmp/openssl_make.log 2>&1
|
||||
echo "Running 'make install' for OpenSSL"
|
||||
sudo make --silent install > /tmp/openssl_make_install.log 2>&1
|
||||
|
||||
path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
|
||||
sudo mkdir -p "$path"
|
||||
sudo ln -s $openssl_install_dir $opensslTargetLocation
|
||||
|
||||
SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\""
|
||||
SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\""
|
||||
|
||||
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
|
||||
|
||||
sudo rm -rf /tmp/openssl-$opensslVersion
|
||||
|
||||
echo "OpenSSL = $opensslVersion" >> ~/versions.txt
|
||||
54
coin/provisioning/common/macos/libiodbc.sh
Executable file
54
coin/provisioning/common/macos/libiodbc.sh
Executable file
@@ -0,0 +1,54 @@
|
||||
#!/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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# Install libiodbc
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
brew update
|
||||
brew install libiodbc
|
||||
|
||||
# CPLUS_INCLUDE_PATH is set so clang and configure can find 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"
|
||||
|
||||
echo "libiodbc = $version" >> ~/versions.txt
|
||||
@@ -122,7 +122,7 @@ function MountAndInstall {
|
||||
sudo cp $targetFileMount /tmp
|
||||
UnMount
|
||||
sudo hdiutil attach "/tmp/$targetFile"
|
||||
sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory"
|
||||
sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
|
||||
mountFolder="/Volumes/froglogic Squish"
|
||||
UnMount
|
||||
elif [[ $targetFile == *.run ]]; then
|
||||
|
||||
@@ -51,7 +51,7 @@ $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
|
||||
$toolsVersion = "26.1.1"
|
||||
$toolsFile = "sdk-tools-windows-4333796.zip"
|
||||
$sdkApi = "ANDROID_API_VERSION"
|
||||
$sdkApiLevel = "android-21"
|
||||
$sdkApiLevel = "android-28"
|
||||
$sdkBuildToolsVersion = "28.0.3"
|
||||
$toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
|
||||
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
|
||||
@@ -95,7 +95,7 @@ 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 tools platform-tools build-tools;$sdkBuildToolsVersion"
|
||||
$sdkmanager_args += " platforms;$sdkApiLevel platform-tools build-tools;$sdkBuildToolsVersion"
|
||||
Run-Executable "$toolsFolder\bin\sdkmanager.bat" "$sdkmanager_args"
|
||||
cd $toolsFolder\bin\
|
||||
$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
|
||||
|
||||
34
coin/provisioning/common/windows/disable-defragment.ps1
Normal file
34
coin/provisioning/common/windows/disable-defragment.ps1
Normal file
@@ -0,0 +1,34 @@
|
||||
#############################################################################
|
||||
##
|
||||
## 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
schtasks /Delete /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /F
|
||||
@@ -37,11 +37,11 @@
|
||||
|
||||
$version = "2016.1.2"
|
||||
|
||||
$name = "fbx20161_2_fbxsdk_vs2015_win"
|
||||
$name = "fbx20161_2_fbxsdk_vs2015_win_nospace"
|
||||
$packageName = "$name.7z"
|
||||
$installerName = "$name.exe"
|
||||
$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\fbx\$packageName"
|
||||
$sha1 = "3690400625672bef6369bcf90dcde4d78b493b24"
|
||||
$sha1 = "de80edc255ffd5ce86ba25869dad72b4c809fd41"
|
||||
|
||||
# The executable is an interactive installer only. We can't run it in a script silently.
|
||||
# $officialUrl = "http://download.autodesk.com/us/fbx_release_older/2016.1.2/$installerName"
|
||||
@@ -49,7 +49,7 @@ $sha1 = "3690400625672bef6369bcf90dcde4d78b493b24"
|
||||
# $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e"
|
||||
|
||||
#$targetFile = "C:\Windows\Temp\$packageName"
|
||||
$targetFolder = "C:\Program Files\"
|
||||
$targetFolder = "C:\Utils\"
|
||||
|
||||
#Write-Host "Downloading '$installerName'"
|
||||
#Download $officialUrl $cacheUrl $targetFile
|
||||
@@ -60,7 +60,7 @@ Extract-7Zip $cacheUrl $targetFolder
|
||||
|
||||
#Remove-Item -Recurse -Force "$packageName"
|
||||
|
||||
Set-EnvironmentVariable "FBXSDK" "$targetFolder\Autodesk\FBX\FBX SDK\2016.1.2"
|
||||
Set-EnvironmentVariable "FBXSDK" "$targetFolder\Autodesk\FBX\FBX_SDK\2016.1.2"
|
||||
|
||||
Write-Output "FBX SDK = $version" >> ~\versions.txt
|
||||
|
||||
|
||||
@@ -27,7 +27,8 @@ function Run-Executable
|
||||
$p = Start-Process -FilePath "$Executable" -Wait -PassThru
|
||||
} else {
|
||||
Write-Host "Running `"$Executable`" with arguments `"$Arguments`""
|
||||
$p = Start-Process -FilePath "$Executable" -ArgumentList $Arguments -Wait -PassThru
|
||||
$p = Start-Process -FilePath "$Executable" -ArgumentList $Arguments -PassThru
|
||||
Wait-Process -InputObject $p
|
||||
}
|
||||
if ($p.ExitCode -ne 0) {
|
||||
throw "Process $($Executable) exited with exit code $($p.ExitCode)"
|
||||
|
||||
@@ -38,7 +38,7 @@ $sha1 = "e1927dbd5d8bb459b468fa70a70b1de51a4ce022"
|
||||
$installLocation = "C:\Utils\uacpp"
|
||||
|
||||
Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..."
|
||||
$internalUrl = "http://ci-files01-hki.ci.local/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.zip"
|
||||
$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
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ function PrepareRepository
|
||||
$zip = "c:\users\$username\downloads\open62541.zip"
|
||||
|
||||
$externalUrl = "https://github.com/open62541/open62541/archive/$commitSHA.zip"
|
||||
$internalUrl = "http://ci-files01-hki.ci.local/input/open62541/$commitSHA.zip"
|
||||
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/open62541/$commitSHA.zip"
|
||||
|
||||
Download $externalUrl $internalUrl $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
|
||||
48
coin/provisioning/common/windows/squish-coco.ps1
Normal file
48
coin/provisioning/common/windows/squish-coco.ps1
Normal file
@@ -0,0 +1,48 @@
|
||||
#############################################################################
|
||||
#
|
||||
# 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$
|
||||
#
|
||||
############################################################################
|
||||
|
||||
# This script installs Squish Coco for RTA
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
|
||||
$coco_version="4.2.2"
|
||||
$url="http://ci-files01-hki.intra.qt.io/input/coco/SquishCocoSetup_" + $coco_version + "_Windows_x64.exe"
|
||||
$sha1="d6f9f3c20df086ec9a7e13a068f4446442ae5d51"
|
||||
$installer="C:\Windows\Temp\SquishCocoSetup_" + $coco_version + "_Windows_x64.exe"
|
||||
|
||||
Download $url $url $installer
|
||||
Verify-Checksum $installer $sha1
|
||||
Run-Executable $installer "/S"
|
||||
Run-Executable "C:\Program Files\squishcoco\cocolic.exe" "--license-server=Qt-SRV-33.intra.qt.io:49344"
|
||||
Remove-Item -Force -Path $installer
|
||||
3
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh
Executable file
3
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh"
|
||||
@@ -47,4 +47,4 @@ set -ex
|
||||
# shellcheck source=../common/macos/install_xcode.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
|
||||
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.2.tar.gz 9.2
|
||||
|
||||
@@ -37,10 +37,10 @@ set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
|
||||
|
||||
version="8.3.2"
|
||||
packageName="CommandLineToolsforXcode$version.dmg"
|
||||
version="9.2"
|
||||
packageName="Command_Line_Tools_macOS_10.12_for_Xcode_$version.dmg"
|
||||
url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
|
||||
sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe"
|
||||
sha1="f121c3b70fb77a98c1f2fc5e1932bd93bde03acf"
|
||||
|
||||
InstallCommandLineTools $url $url $sha1 $packageName $version
|
||||
|
||||
|
||||
7
coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
Executable file
7
coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
Executable file
@@ -0,0 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
# Install libiodbc
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
$BASEDIR/../common/macos/libiodbc.sh
|
||||
@@ -1,76 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 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 OpenSSL
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
opensslVersion="1.0.2p"
|
||||
opensslFile="openssl-$opensslVersion.tar.gz"
|
||||
opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
|
||||
opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
|
||||
opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c"
|
||||
|
||||
# Below target location has been hard coded into Coin.
|
||||
# QTQAINFRA-1195
|
||||
opensslTargetLocation="/usr/local/opt/openssl"
|
||||
|
||||
InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion"
|
||||
cd "/tmp/openssl-$opensslVersion"
|
||||
pwd
|
||||
sudo ./config --prefix=/usr/local/openssl-$opensslVersion
|
||||
echo "Running 'make' for OpenSSL"
|
||||
sudo make --silent > /tmp/openssl_make.log 2>&1
|
||||
echo "Running 'make install' for OpenSSL"
|
||||
sudo make --silent install > /tmp/openssl_make_install.log 2>&1
|
||||
|
||||
path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
|
||||
sudo mkdir -p "$path"
|
||||
sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation
|
||||
|
||||
SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\""
|
||||
SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\""
|
||||
|
||||
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
|
||||
|
||||
sudo rm -rf /tmp/openssl-$opensslVersion
|
||||
|
||||
echo "OpenSSL = $opensslVersion" >> ~/versions.txt
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh"
|
||||
|
||||
@@ -50,4 +50,4 @@ set -ex
|
||||
# shellcheck source=../common/macos/install_xcode.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
|
||||
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.tar.gz 10.0.0
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1.tar.gz 10.1
|
||||
|
||||
@@ -37,10 +37,10 @@ set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
|
||||
|
||||
version="10.0.0"
|
||||
version="10.1"
|
||||
packageName="Command_Line_Tools_macOS_10.13_for_Xcode_$version.dmg"
|
||||
url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/$packageName"
|
||||
sha1="1d6abe29b8df6397c179b8e2ffbfd0293f1282b0"
|
||||
sha1="c8d198347adf836de7937691282b35e9d086e4c2"
|
||||
|
||||
InstallCommandLineTools $url $url $sha1 $packageName $version
|
||||
|
||||
|
||||
7
coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh
Executable file
7
coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh
Executable file
@@ -0,0 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
# Install libiodbc
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
$BASEDIR/../common/macos/libiodbc.sh
|
||||
@@ -48,11 +48,14 @@ sdkTargetFolder="$targetFolder/sdk"
|
||||
basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
|
||||
|
||||
toolsVersion="r26.1.1"
|
||||
# toolsFile dertermines tools version
|
||||
toolsFile="sdk-tools-darwin-4333796.zip"
|
||||
|
||||
ndkVersion="r18b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
|
||||
sdkBuildToolsVersion="28.0.3"
|
||||
sdkApiLevel="android-21"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-28"
|
||||
|
||||
toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad"
|
||||
ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440"
|
||||
@@ -70,8 +73,8 @@ sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
|
||||
echo "Changing ownership of Android files."
|
||||
sudo chown -R qt:wheel "$targetFolder"
|
||||
|
||||
echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
|
||||
(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
|
||||
echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
|
||||
(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
|
||||
|
||||
echo "Checking the contents of Android SDK..."
|
||||
ls -l "$sdkTargetFolder"
|
||||
|
||||
@@ -1,76 +1,5 @@
|
||||
#!/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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script install OpenSSL
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
opensslVersion="1.0.2p"
|
||||
opensslFile="openssl-$opensslVersion.tar.gz"
|
||||
opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
|
||||
opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
|
||||
opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c"
|
||||
|
||||
# Below target location has been hard coded into Coin.
|
||||
# QTQAINFRA-1195
|
||||
opensslTargetLocation="/usr/local/opt/openssl"
|
||||
|
||||
InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion"
|
||||
cd "/tmp/openssl-$opensslVersion"
|
||||
pwd
|
||||
sudo ./config --prefix=/usr/local/openssl-$opensslVersion
|
||||
echo "Running 'make' for OpenSSL"
|
||||
sudo make --silent > /tmp/openssl_make.log 2>&1
|
||||
echo "Running 'make install' for OpenSSL"
|
||||
sudo make --silent install > /tmp/openssl_make_install.log 2>&1
|
||||
|
||||
path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
|
||||
sudo mkdir -p "$path"
|
||||
sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation
|
||||
|
||||
SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\""
|
||||
SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\""
|
||||
|
||||
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
|
||||
|
||||
sudo rm -rf /tmp/openssl-$opensslVersion
|
||||
|
||||
echo "OpenSSL = $opensslVersion" >> ~/versions.txt
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-defragment.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-defragment.ps1"
|
||||
@@ -0,0 +1,2 @@
|
||||
"$PSScriptRoot\..\common\windows\squish-coco.ps1"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-defragment.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-defragment.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-defragment.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-defragment.ps1"
|
||||
Reference in New Issue
Block a user