summaryrefslogtreecommitdiffstats
path: root/Jenkinsfile
diff options
context:
space:
mode:
authorJoerg Koenig <Joerg.Koenig@techsat.com>2019-05-16 08:05:02 (GMT)
committerJoerg Koenig <Joerg.Koenig@techsat.com>2019-05-16 08:05:02 (GMT)
commita1c543ef2d11442b76fa6106dfa0f55c74049877 (patch)
tree2ddcb04bd9f7c4ddde632157ad1f54007736c568 /Jenkinsfile
parent91f490260cdf58e6b4cdccad0c282edd4b35720a (diff)
downloadQt-a1c543ef2d11442b76fa6106dfa0f55c74049877.zip
Qt-a1c543ef2d11442b76fa6106dfa0f55c74049877.tar.gz
Qt-a1c543ef2d11442b76fa6106dfa0f55c74049877.tar.bz2
Fixed windows scripts
Change-Id: I3dcd1a2e6d2021f71e36c2a9c1c97ecd88d031ab
Diffstat (limited to 'Jenkinsfile')
-rw-r--r--Jenkinsfile27
1 files changed, 12 insertions, 15 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index f945d8d..621838e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,28 +43,26 @@ stage('Build') {
userRemoteConfigs: [[url: REPO]]])
bat '''@echo off
- net use K: \\\\dfs2.techsat.net\\dev-tools /yes
- set SDKDIR=K:\\WinSDK\\VS2019BT\\
- set NASMDIR=K:\\nasm\\2.12.01_32\\
- set MSYSDIR=K:\\msys\\x86\\
- set PERLDIR=K:\\perl\\x86_64-msvc\\
- set PATH=%PATH%;K:\\Python\\2.7\\x86-windows\\
+ set SDKDIR=C:\\dev-tools\\WinSDK\\VS2019BT\\
+ set NASMDIR=C:\\dev-tools\\nasm\\2.12.01_32\\
+ set MSYSDIR=C:\\dev-tools\\msys\\x86\\
+ set PERLDIR=C:\\dev-tools\\perl\\x86_64-msvc\\
+ set PATH=%PATH%;C:\\dev-tools\\Python\\2.7\\x86-windows\\
buildqt32.bat
'''
bat '''
- set MSYSDIR=K:\\msys\\x86
+ set MSYSDIR=C:\\dev-tools\\msys\\x86
set PATH=%MSYSDIR%\\usr\\bin;%PATH%
sh.exe -c "rm -f openssl-1.0.2r/NUL"
sh.exe -c "rm -Rf openssl-1.0.2r*"
'''
bat '''@echo off
- net use K: \\\\dfs2.techsat.net\\dev-tools /yes
- set SDKDIR=K:\\WinSDK\\VS2019BT\\
- set NASMDIR=K:\\nasm\\2.12.01_64
- set MSYSDIR=K:\\msys\\x86\\
- set PERLDIR=K:\\perl\\x86_64-msvc\\
- set PATH=%PATH%;K:\\Python\\2.7\\x86-windows\\
+ set SDKDIR=C:\\dev-tools\\WinSDK\\VS2019BT\\
+ set NASMDIR=C:\\dev-tools\\nasm\\2.12.01_64
+ set MSYSDIR=C:\\dev-tools\\msys\\x86\\
+ set PERLDIR=C:\\dev-tools\\perl\\x86_64-msvc\\
+ set PATH=%PATH%;C:\\dev-tools\\Python\\2.7\\x86-windows\\
buildqt64.bat
'''
archiveArtifacts artifacts: '*-msvc.zip'
@@ -73,11 +71,10 @@ stage('Build') {
echo 'Windows build failed'
} finally {
bat '''
- set PATH=K:\\msys\\x86\\usr\\bin;%PATH%
+ set PATH=C:\\dev-tools\\msys\\x86\\usr\\bin;%PATH%
cd %WORKSPACE%\\openssl-1.0.2r
sh.exe -c "rm -f NUL"
cd %WORKSPACE%
- net use K: /delete /yes
'''
}