summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Koenig <Joerg.Koenig@techsat.com>2019-05-15 10:18:27 (GMT)
committerJoerg Koenig <Joerg.Koenig@techsat.com>2019-05-15 10:18:27 (GMT)
commit5ccdd47298685b25c6dde529966f50986fb1d1e4 (patch)
tree9ebe0087e16cbf9c135b3d55ecbb33efba857057
parent32d3f73d68ebf31442eb9b024dd5a23c0e4a516a (diff)
downloadQt-5ccdd47298685b25c6dde529966f50986fb1d1e4.zip
Qt-5ccdd47298685b25c6dde529966f50986fb1d1e4.tar.gz
Qt-5ccdd47298685b25c6dde529966f50986fb1d1e4.tar.bz2
Fixed windows scripts
Change-Id: I13145aa06d093d17189f527d0918e5a5f993db26
-rw-r--r--Jenkinsfile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 39d0a85..8b37888 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -45,17 +45,21 @@ stage('Build') {
bat '''@echo off
net use K: \\\\dfs2.techsat.net\\dev-tools /yes
set SDKDIR=K:\\WinSDK\\VS2019BT\\
- set PERLDIR=K:\\perl\\x86_64-msvc\\
set NASMDIR=K:\\nasm\\2.12.01_32\\
set MSYSDIR=K:\\msys\\x86\\
set PATH=%PATH%;K:\\Python\\2.7\\x86-windows\\
buildqt32.bat
'''
+ bat '''
+ set MSYSDIR=K:\\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 PERLDIR=K:\\perl\\x86_64-msvc\\
set NASMDIR=K:\\nasm\\2.12.01_64
set MSYSDIR=K:\\msys\\x86\\
set PATH=%PATH%;K:\\Python\\2.7\\x86-windows\\