From 79f556095a6b56f400858f3aace08ba6f1408fa3 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Sun, 5 Apr 2026 17:02:14 +0300
Subject: [PATCH] Update build

---
 .github/workflows/build-watcom.yml | 56 ++++++++++++++++++++++++++++++
 .github/workflows/build-win64.yml  |  4 ++-
 Makefile.msvc                      |  8 ++---
 Makefile.watcom                    |  6 ++++
 4 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/build-watcom.yml

diff --git a/.github/workflows/build-watcom.yml b/.github/workflows/build-watcom.yml
new file mode 100644
index 0000000..cb057fe
--- /dev/null
+++ b/.github/workflows/build-watcom.yml
@@ -0,0 +1,56 @@
+name: C/C++ CI
+
+on:
+  push:
+    branches: [ "test-ci" ]
+    paths: [ 'RELEASE', '.github/workflows/build-watcom.yml' ]
+
+jobs:
+  ci:
+    name: "${{ matrix.target }}"
+    strategy:
+      matrix:
+        target:
+          - windows-2022
+    runs-on: ${{ matrix.target }}
+    steps:
+    - uses: actions/checkout@v4
+#    - name: configure
+#      run: ./configure
+    - name: Setup Open Watcom
+      uses: open-watcom/setup-watcom@v0
+    - name: set date
+      run: |
+       $NOW = Get-Date -Format "yyMMddHHmmss"
+       echo "now: $NOW"
+       $RELEASE = Get-Content -Path "RELEASE" -Raw
+       echo "release: $RELEASE"
+       echo "NOW=$NOW" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "VERSION=VERSION=`"$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "BUILDDATE=BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+    - name: make Watcom
+      shell: cmd
+      run: |
+       echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
+       nmake /F Makefile.watcom
+    - name: Get artifact
+      uses: actions/upload-artifact@v4
+      with:
+       name: "3proxy-${{ env.RELEASE }}-light.zip"
+       path: |
+        bin/3proxy.exe
+        bin/*.dll
+        bin/mycrypt.exe
+        cfg/*.*
+        cfg/sql/*.*
+        doc/ru/*.*
+        doc/html/*.*
+        doc/html/plugins/*.*
+        doc/html/man8/*.*
+        doc/html/man3/*.*
+        doc/devel/*.rtf
+        copying
+        authors
+        README
+        rus.3ps
diff --git a/.github/workflows/build-win64.yml b/.github/workflows/build-win64.yml
index d00d5fe..c5a1971 100644
--- a/.github/workflows/build-win64.yml
+++ b/.github/workflows/build-win64.yml
@@ -44,7 +44,9 @@ jobs:
        echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
        nmake /F Makefile.msvc64
        dir c:\vcpkg\installed\x64-windows\bin\
-       copy /Y c:\vcpkg\installed\x64-windows\bin\*.dll bin64
+       copy /Y c:\vcpkg\installed\x64-windows\bin\pcre2-8.dll bin64
+       copy /Y c:\vcpkg\installed\x64-windows\bin\*crypto*.dll bin64
+       copy /Y c:\vcpkg\installed\x64-windows\bin\*ssl*.dll bin64
     - name: Get artifact
       uses: actions/upload-artifact@v4
       with:
diff --git a/Makefile.msvc b/Makefile.msvc
index 975e894..1e9ba19 100644
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -7,11 +7,11 @@
 BUILDDIR = ../bin/
 CC = cl
 CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC"  /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "WITH_SSL" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRINTF_INT64_MODIFIER=\"I64\"" /Fp"proxy.pch" /FD /c
-!IFDEF VERSION
-CFLAGS = $CFLAGS /D $VERSION
+!IFDEF RELEASE
+VERSION=/D VERSION=\"3proxy-$(RELEASE)\"
 !ENDIF
-!IFDEF BUILDDATE
-CFLAGS = $CFLAGS /D $BUILDDATE
+!IFDEF NOW
+BUILDDATE=/D BUILDDATE=\"$(NOW)\"
 !ENDIF
 COUT = /Fo
 LN = link
diff --git a/Makefile.watcom b/Makefile.watcom
index d0f3380..df55b07 100644
--- a/Makefile.watcom
+++ b/Makefile.watcom
@@ -7,6 +7,12 @@
 BUILDDIR = ../bin/
 CC = cl
 CFLAGS = /nologo /Ox /MT /D "NOIPV6" /D "NODEBUG" /D "NOODBC" /D "NORADIUS" /D"WATCOM" /D "MSVC"  /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRINTF_INT64_MODIFIER=\"I64\"" /c $(VERSION) $(BUILDDATE)
+!IFDEF RELEASE
+VERSION=/D VERSION=\"3proxy-$(RELEASE)\"
+!ENDIF
+!IFDEF NOW
+BUILDDATE=/D BUILDDATE=\"$(NOW)\"
+!ENDIF
 COUT = /Fo
 LN = link
 LDFLAGS = /nologo /subsystem:console /incremental:no