From d7a902b0a5efc6308faee663a2cc63163b1a45fc Mon Sep 17 00:00:00 2001
From: Joerg Koenig <Joerg.Koenig@techsat.com>
Date: Wed, 15 May 2019 23:40:36 +0200
Subject: Fixed windows scripts

Change-Id: I81baedfd7bf12648b3948a5f5f3d7ba1da5a168d
---
 Jenkinsfile   | 2 ++
 buildqt32.bat | 9 +++++++--
 buildqt64.bat | 9 +++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 62e14ed..f945d8d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,6 +47,7 @@ stage('Build') {
             		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\\
             		buildqt32.bat
         	    '''
@@ -62,6 +63,7 @@ stage('Build') {
             		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\\
             		buildqt64.bat
             	    '''
diff --git a/buildqt32.bat b/buildqt32.bat
index d6ecad4..957d30c 100644
--- a/buildqt32.bat
+++ b/buildqt32.bat
@@ -10,12 +10,17 @@ if not defined NASMDIR (
     echo NASMDIR is not defined.
     exit /b 1
 )
+if not defined PERLDIR (
+    echo PERLDIR is not defined.
+    exit /b 1
+)
 if not defined MSYSDIR (
     echo MSYSDIR is not defined.
     exit /b 1
 )
 
-set PATH=%MSYSDIR%\usr\bin;%PATH%
+set PATH=%PERLDIR%\bin;%MSYSDIR%\usr\bin;%PATH%
+set PERL=%PERLDIR%\bin\perl.exe
 
 SET QT_VERSION=5.12
 SET QT_RELEASE=3
@@ -43,7 +48,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 
 rem Build OpenSSL
 cd %BASEDIR%\%OPENSSL%
-call perl Configure VC-WIN32 --prefix=%BASEDIR%/openssl-%INST_ARCH%
+call %PERL% Configure VC-WIN32 --prefix=%BASEDIR%/openssl-%INST_ARCH%
 if %errorlevel% neq 0 exit /b %errorlevel%
 call ms\do_ms.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/buildqt64.bat b/buildqt64.bat
index 0dd65ac..8d32cd6 100644
--- a/buildqt64.bat
+++ b/buildqt64.bat
@@ -6,6 +6,10 @@ IF NOT DEFINED SDKDIR (
     ECHO SDKDIR is not defined.
     EXIT /b 1
 )
+if not defined PERLDIR (
+    echo PERLDIR is not defined.
+    exit /b 1
+)
 if not defined NASMDIR (
     echo NASMDIR is not defined.
     exit /b 1
@@ -15,7 +19,8 @@ if not defined MSYSDIR (
     exit /b 1
 )
 
-set PATH=%MSYSDIR%\usr\bin;%PATH%
+set PATH=%PERLDIR%\bin;%MSYSDIR%\usr\bin;%PATH%
+set PERL=%PERLDIR%\bin\perl.exe
 
 SET QT_VERSION=5.12
 SET QT_RELEASE=3
@@ -43,7 +48,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 
 rem - static - 
 cd %OPENSSL%
-call perl Configure VC-WIN64A --prefix=%BASEDIR%openssl-%INST_ARCH%
+call %PERL% Configure VC-WIN64A --prefix=%BASEDIR%openssl-%INST_ARCH%
 if %errorlevel% neq 0 exit /b %errorlevel%
 call ms\do_win64a
 if %errorlevel% neq 0 exit /b %errorlevel%
-- 
cgit v0.12