From c5bad87eca5352357ea789d77c3f79bd1f33a479 Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Fri, 18 Jul 2025 18:06:19 +0200 Subject: [PATCH 1/2] Build static version --- .github/workflows/windows.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1009c0a4..069c9a87 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -48,12 +48,15 @@ jobs: - uses: actions/checkout@v4 with: ref: master - - name: Test JAVA_HOME + - name: Set JAVA_HOME and compiler/linker options shell: cmd run: | - echo rem SPDX-License-Identifier: Apache-2.0> set_java_home.bat - echo set JAVA_HOME=%JAVA_HOME_21_X64%>> set_java_home.bat - call .\set_java_home.bat + echo rem SPDX-License-Identifier: Apache-2.0> set_build_env.bat + echo set JAVA_HOME=%JAVA_HOME_21_X64%>> set_build_env.bat + echo set EXTRA_LFLAGS="/NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib /HIGHENTROPYVA">> set_build_env.bat + echo set EXTRA_CFLAGS="/GS">> set_build_env.bat + echo set EXTRA_RCFLAGS="/nologo /d _WINNT /d WINVER=0x0A00 /d _WIN32_WINNT=0x0A00">> set_build_env.bat + call .\set_build_env.bat echo "JAVA_HOME: %JAVA_HOME%" - name: Build prunsrv shell: cmd @@ -74,13 +77,13 @@ jobs: - name: Build jar shell: cmd run: | - call .\set_java_home.bat + call .\set_build_env.bat echo "JAVA_HOME: %JAVA_HOME%" mvn --batch-mode --no-transfer-progress install - name: Test shell: cmd run: | - call .\set_java_home.bat + call .\set_build_env.bat echo "JAVA_HOME: %JAVA_HOME%" cd src/native/windows/apps/prunsrv/test/scripts test.bat From f9da92510aea201888bd822bd5a1aacd535f3732 Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Fri, 18 Jul 2025 18:37:12 +0200 Subject: [PATCH 2/2] The environment is not enough. --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 069c9a87..cd27d27c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -65,7 +65,7 @@ jobs: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }} cd src/native/windows/apps/prunsrv echo "Building prunsrv for ${{ matrix.arch }}" - nmake BUILD_CPU=${{ matrix.arch }} + nmake BUILD_CPU=${{ matrix.arch }} STATIC_CRT=1 WINVER=0x0A00 - name: Build prunmgr shell: cmd run: | @@ -73,7 +73,7 @@ jobs: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }} cd src/native/windows/apps/prunmgr echo "Building prunmgr for ${{ matrix.arch }}" - nmake BUILD_CPU=${{ matrix.arch }} + nmake BUILD_CPU=${{ matrix.arch }} STATIC_CRT=1 WINVER=0x0A00 - name: Build jar shell: cmd run: |