From d2aea3b2405dfe51545a799f8a660086e6a71813 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 22 May 2024 17:30:01 +0900
Subject: [PATCH] Updated build process for Zabbix agent (windows)

---
 Dockerfiles/build-base/windows/Dockerfile.agent   | 2 +-
 Dockerfiles/build-base/windows/Dockerfile.agent2  | 2 +-
 Dockerfiles/build-mysql/windows/Dockerfile.agent  | 2 +-
 Dockerfiles/build-mysql/windows/Dockerfile.agent2 | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent
index 19177ea7f..268603f29 100644
--- a/Dockerfiles/build-base/windows/Dockerfile.agent
+++ b/Dockerfiles/build-base/windows/Dockerfile.agent
@@ -242,7 +242,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
         --prefix=$env:BUILD_OUTPUT\openssl `
         --openssldir=$env:BUILD_OUTPUT\openssl_ssl; `
     set CL=/MP; `
-    nmake /S build_sw; `
+    nmake /S build_libs; `
     nmake /S install_dev; `
     nmake /S clean | Out-Null; `
     Write-Host 'OpenSSL is ready...'; `
diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2
index a8ecc31c0..b5857085d 100644
--- a/Dockerfiles/build-base/windows/Dockerfile.agent2
+++ b/Dockerfiles/build-base/windows/Dockerfile.agent2
@@ -269,7 +269,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
         --libdir=lib `
         --prefix=$env:BUILD_OUTPUT/openssl `
         --openssldir=$env:BUILD_OUTPUT/openssl_ssl; `
-    mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" build_sw; `
+    mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" build_libs; `
     mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install_dev; `
     mingw32-make -s clean | Out-Null; `
     Write-Host 'OpenSSL is ready...'; `
diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent b/Dockerfiles/build-mysql/windows/Dockerfile.agent
index 071a441f2..34056fe03 100644
--- a/Dockerfiles/build-mysql/windows/Dockerfile.agent
+++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent
@@ -57,7 +57,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
         RFLAGS="""/D ZABBIX_VERSION_REVISION=$ZbxRevision /D ZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM""" `
         TLSINCDIR=$env:BUILD_OUTPUT\openssl\include `
         TLSLIBDIR=$env:BUILD_OUTPUT\openssl\lib `
-	LIBS="""$env:LIBS $env:BUILD_OUTPUT\curl\lib\libcurl_a.lib $env:BUILD_OUTPUT\zlib\lib\zlib.lib""" `
+	LIBS="""$env:LIBS Crypt32.lib $env:BUILD_OUTPUT\curl\lib\libcurl_a.lib $env:BUILD_OUTPUT\zlib\lib\zlib.lib""" `
         all; `
     `
     Write-Host 'Verifying build ("zabbix_agentd.exe -V") ...'; `
diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent2 b/Dockerfiles/build-mysql/windows/Dockerfile.agent2
index e207a6091..fca737b60 100644
--- a/Dockerfiles/build-mysql/windows/Dockerfile.agent2
+++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent2
@@ -13,7 +13,7 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.42
 ARG ZABBIX_VERSION_RC_NUM=2400
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
-ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION GIT_BRANCH=${GIT_BRANCH:-$ZBX_VERSION}
+ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION GIT_BRANCH=${GIT_BRANCH:-$ZBX_VERSION} `
     ZABBIX_VERSION_RC_NUM=$ZABBIX_VERSION_RC_NUM
 
 LABEL org.opencontainers.image.title="Zabbix agent 2 build (Windows)" `
@@ -48,7 +48,6 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     (Get-Content src\go\pkg\version\version.go).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content src\go\pkg\version\version.go; `
     Set-Location -Path $env:SystemDrive\zabbix_src\zabbix-$env:ZBX_VERSION\build\mingw; `
     mingw32-make -j"""$env:NUMBER_OF_PROCESSORS""" `
-#        CGO_LDFLAGS="""-lcrypt32 -L$env:BUILD_OUTPUT\openssl\lib -L$env:BUILD_OUTPUT\pcre\lib""" `
         PCRE=$env:BUILD_OUTPUT\pcre `
         OPENSSL=$env:BUILD_OUTPUT\openssl `
         RFLAGS="""-DZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM"""; `