jenkinsci · basil · Apr 26, 2024 · Oct 6, 2022 · Oct 6, 2022 · Apr 3, 2024
diff --git a/DEVELOPER.md b/DEVELOPER.md
@@ -3,20 +3,24 @@ WinP Developer info
 
 ## Building
 
-In order to build and test the project, use the `build.cmd` script available in the repository. 
-In order to build the project, you need MSbuild 15.0 and Microsoft Visual Studio 2017 with Windows XP support and BuildTools v140.
+In order to build and test the project, use the `build.cmd` script available in the repository.
+In order to build the project, you need MSbuild 15.0 and Microsoft Visual Studio 2019 and BuildTools v142.
+Toolchains for x86 and x64 targets should be installed.
+Furthermore, Windows SDK 10.0.16299 should be installed too.
+
+The `JAVA_HOME` environment variable should point to your Java installation (>= 11).
 
 * `build.cmd cleanbuild` - Build and test the release version of the JAR file.
 Code will not be signed automatically.
-* `build.cmd cleanbuild Debug` - Build and test the Debug configuration of the library. 
+* `build.cmd cleanbuild Debug` - Build and test the Debug configuration of the library.
 This version simplifies debugging of the native part of the library (see below).
 
 ## Testing
 
 * Right now all tests are implemented in Java part of the library (JUnit Framework).
 There is no fully native tests.
 * All tests are being automatically invoked by `build.cmd`
-* Tests run from Maven, and the selected 32/64-bit mode depends on the Java version, 
+* Tests run from Maven, and the selected 32/64-bit mode depends on the Java version,
 which can be passed to maven using the `JAVA_HOME` environment variable.
 * Generally you need to run `build.cmd cleanbuild Debug` and `build.cmd cleanbuild Release` on 3 configurations
   * 32-bit Windows, 32-bit Java
@@ -28,17 +32,16 @@ Ideally, tests should be executed on all target platforms.
 
 ## Continuous Integration
 
-Project has a continuous integration flow being hosted by AppVeyor ([project page](https://ci.appveyor.com/project/oleg-nenashev/winp)).
-This CI instance automates testing of Debug and Release configurations, 
+Project has a continuous integration flow being hosted by official Jenkins CI ([project page](https://ci.jenkins.io/job/jenkinsci-libraries/job/winp)).
+This CI instance automates testing of Debug and Release configurations,
 but it does not provide full coverage of possible system configurations.
-See [the appveyor.yml file](./appveyor.yml) for more details.
 
 ## Debugging
 
 ### Debugging Java part
 
 Java part of the library can be debugged independently or within a project using standard tools available in the Java Development Kit.
- 
+
 ### Debugging Native part
 
 In order to debug native parts of the library attach your debugger (e.g. from Microsoft Visual Studio UI) to the `java.exe` process.

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,8 +3,8 @@
  * easy Linux/Windows testing and produces incrementals. The only feature that relates to plugins is
  * allowing one to test against multiple Jenkins versions.
  */
-buildPlugin(useContainerAgent: true, configurations: [
-  [platform: 'linux', jdk: 21],
-  [platform: 'linux', jdk: 17],
+buildPlugin(useContainerAgent: false, configurations: [
+  [platform: 'windows', jdk: 21],
+  [platform: 'windows', jdk: 17],
 ])
 
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build status](https://ci.appveyor.com/api/projects/status/0w6ivhpkt20d88md?svg=true)](https://ci.appveyor.com/project/oleg-nenashev/winp)
 
-This project develops a library that lets you control Windows processes better, beyond what's available in JDK. 
+This project develops a library that lets you control Windows processes better, beyond what's available in JDK.
 
 Features summary:
 
@@ -28,7 +28,7 @@ Starting with 1.29, this library is published at:
 ## Java support
 
 Starting with 1.29, this library requires Java 11 or newer.
- 
+
 WinP Library includes native libraries for all supported platforms, hence it can run on both 32bit and 64bit Java versions without any additional configuration.
 
 ## Platform support
@@ -37,22 +37,20 @@ The library supports _x86_ and _amd64_ architectures.
 ARM architecture is not supported.
 Please raise an issue to the library if you need ARM support && ready to provide proper test environment.
 
-:exclamation: It is **not recommended** to use WinP with _32bit_ Java on a _64bit_ operating system. 
-In such case the library will be running in the WoW64 mode; 
+:exclamation: It is **not recommended** to use WinP with _32bit_ Java on a _64bit_ operating system.
+In such case the library will be running in the WoW64 mode;
 and it will be unable to properly work with 64bit processes in the system.
 E.g. any process information query call (e.g. Environment variables retrieval) may fail if you run it against 64bit process.
 
 ## Supported Windows versions
 
 The current version of WinP is known to work correctly on the following Windows versions:
 
-* Windows XP SP2 and above
-* Windows Server 2003 and above
+* Windows 10 and above
+* Windows Server 2019 and above
 
 Other Windows product lines are not being actively tested though WinP may work there.
 
-:exclamation: Minimal required Windows version is a subject to change in next releases of WinP.
-
 ## License
 
 [MIT License][license]

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/build-native.cmd b/build-native.cmd
@@ -0,0 +1,78 @@
+setlocal
+
+set VS2019=C:\Program Files (x86)\Microsoft Visual Studio\2019
+set VS=
+
+if exist "%VS2019%\Community\" set VS=%VS2019%\Community
+if exist "%VS2019%\Enterprise\" set VS=%VS2019%\Enterprise
+if "%VS%" == "" (
+    echo Can't find VS2019 install
+    exit /b 1
+)
+
+call "%VS%/VC/Auxiliary/Build/vcvarsall.bat" amd64 || exit /b 1
+set BUIDROOT=%cd%
+
+:getopts
+if "%2"=="" (
+	set configuration="Release"
+) else (
+	set configuration=%2%
+)
+
+
+if "%1"=="" (goto :default) else (goto :%1)
+goto :exit
+
+:default
+goto :build
+
+:clean
+echo ### Cleaning the %configuration% build directory
+cd %BUIDROOT%\native
+msbuild winp.vcxproj /t:Clean /p:Configuration=%configuration% /verbosity:minimal /nologo /p:Platform="Win32"
+if %errorlevel% neq 0 exit /b %errorlevel%
+msbuild winp.vcxproj /t:Clean /p:Configuration=%configuration% /verbosity:minimal /nologo /p:Platform="x64"
+if %errorlevel% neq 0 exit /b %errorlevel%
+msbuild sendctrlc\sendctrlc.vcxproj /t:Clean /p:Configuration=%configuration% /verbosity:minimal /nologo /p:Platform="Win32"
+if %errorlevel% neq 0 exit /b %errorlevel%
+msbuild sendctrlc\sendctrlc.vcxproj /t:Clean /p:Configuration=%configuration% /verbosity:minimal /nologo /p:Platform="x64"
+if %errorlevel% neq 0 exit /b %errorlevel%
+msbuild ..\native_test\testapp\testapp.vcxproj /t:Clean /p:Configuration=%configuration% /verbosity:minimal /nologo /p:Platform="Win32"
+if %errorlevel% neq 0 exit /b %errorlevel%
+msbuild ..\native_test\testapp\testapp.vcxproj /t:Clean /p:Configuration=%configuration% /verbosity:minimal /nologo /p:Platform="x64"
+if %errorlevel% neq 0 exit /b %errorlevel%
+goto :exit
+
+:build
+echo ### Building the %configuration% configuration
+cd %BUIDROOT%\native
+REM /verbosity:minimal
+msbuild winp.vcxproj /p:Configuration=%configuration% /nologo /p:Platform="Win32"
+if %errorlevel% neq 0 exit /b %errorlevel%
+msbuild winp.vcxproj /p:Configuration=%configuration% /nologo /p:Platform="x64"
+if %errorlevel% neq 0 exit /b %errorlevel%
+msbuild sendctrlc\sendctrlc.vcxproj /p:Configuration=%configuration% /nologo /p:Platform="Win32"
+if %errorlevel% neq 0 exit /b %errorlevel%
+msbuild sendctrlc\sendctrlc.vcxproj /p:Configuration=%configuration% /nologo /p:Platform="x64"
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo ### Building test applications
+msbuild ..\native_test\testapp\testapp.vcxproj /verbosity:minimal /p:Configuration=%configuration% /nologo /p:Platform="Win32"
+if %errorlevel% neq 0 exit /b %errorlevel%
+msbuild ..\native_test\testapp\testapp.vcxproj /verbosity:minimal /p:Configuration=%configuration% /nologo /p:Platform="x64"
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo ### Updating WinP resource files for the %configuration% build
+cd %BUIDROOT%
+if not exist target\classes mkdir target\classes
+COPY native\Win32\%configuration%\winp.dll target\classes\
+if %errorlevel% neq 0 exit /b %errorlevel%
+COPY native\x64\%configuration%\winp.x64.dll target\classes\
+if %errorlevel% neq 0 exit /b %errorlevel%
+COPY native\sendctrlc\Win32\%configuration%\sendctrlc.exe target\classes\
+if %errorlevel% neq 0 exit /b %errorlevel%
+COPY native\sendctrlc\x64\%configuration%\sendctrlc.x64.exe target\classes\
+
+:exit
+endlocal
diff --git a/build.cmd b/build.cmd
@@ -1,7 +1,4 @@
-@echo off
 setlocal
-set PATH=%PATH%;%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\bin\amd64
-set VCTargetsPath=C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140
 set BUIDROOT=%cd%
 
 :getopts
@@ -28,57 +25,26 @@ goto :exit
 :default
 goto :cleanbuild
 
+:clean
+echo ### Cleaning the %configuration% build directory
+call build-native.cmd clean %configuration% || exit /b 1
+goto :exit
+
 :cleanbuild
 echo ### Cleaning the %configuration% build directory
-cd %BUIDROOT%\native
-msbuild winp.vcxproj /t:Clean /p:Configuration=%configuration% /verbosity:minimal /nologo /p:Platform="Win32"
-if %errorlevel% neq 0 exit /b %errorlevel%
-msbuild winp.vcxproj /t:Clean /p:Configuration=%configuration% /verbosity:minimal /nologo /p:Platform="x64"
-if %errorlevel% neq 0 exit /b %errorlevel%
-msbuild sendctrlc\sendctrlc.vcxproj /t:Clean /p:Configuration=Release /verbosity:minimal /nologo /p:Platform="Win32"
-if %errorlevel% neq 0 exit /b %errorlevel%
-msbuild sendctrlc\sendctrlc.vcxproj /t:Clean /p:Configuration=Release /verbosity:minimal /nologo /p:Platform="x64"
-if %errorlevel% neq 0 exit /b %errorlevel%
-msbuild ..\native_test\testapp\testapp.vcxproj /t:Clean /p:Configuration=Release /verbosity:minimal /nologo /p:Platform="Win32"
-if %errorlevel% neq 0 exit /b %errorlevel%
-msbuild ..\native_test\testapp\testapp.vcxproj /t:Clean /p:Configuration=Release /verbosity:minimal /nologo /p:Platform="x64"
-if %errorlevel% neq 0 exit /b %errorlevel%
+call build-native.cmd clean %configuration% || exit /b 1
 goto :build
 
 :build
+:build_native
 echo ### Building the %configuration% configuration
-cd %BUIDROOT%\native
-REM /verbosity:minimal
-msbuild winp.vcxproj /p:Configuration=%configuration% /nologo /p:Platform="Win32"
-if %errorlevel% neq 0 exit /b %errorlevel%
-msbuild winp.vcxproj /p:Configuration=%configuration% /nologo /p:Platform="x64"
-if %errorlevel% neq 0 exit /b %errorlevel%
-msbuild sendctrlc\sendctrlc.vcxproj /p:Configuration=%configuration% /nologo /p:Platform="Win32"
-if %errorlevel% neq 0 exit /b %errorlevel%
-msbuild sendctrlc\sendctrlc.vcxproj /p:Configuration=%configuration% /nologo /p:Platform="x64"
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo ### Building test applications
-msbuild ..\native_test\testapp\testapp.vcxproj /verbosity:minimal /p:Configuration=Release /nologo /p:Platform="Win32"
-if %errorlevel% neq 0 exit /b %errorlevel%
-msbuild ..\native_test\testapp\testapp.vcxproj /verbosity:minimal /p:Configuration=Release /nologo /p:Platform="x64"
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo ### Updating WinP resource files for the %configuration% build
-cd %BUIDROOT%
-COPY native\%configuration%\winp.dll src\main\resources\winp.dll
-if %errorlevel% neq 0 exit /b %errorlevel%
-COPY native\x64\%configuration%\winp.dll src\main\resources\winp.x64.dll
-if %errorlevel% neq 0 exit /b %errorlevel%
-COPY native\sendctrlc\Win32\%configuration%\sendctrlc.exe src\main\resources\sendctrlc.exe
-if %errorlevel% neq 0 exit /b %errorlevel%
-COPY native\sendctrlc\x64\%configuration%\sendctrlc.exe src\main\resources\sendctrlc.x64.exe
-if %errorlevel% neq 0 exit /b %errorlevel%
+call build-native.cmd build %configuration% || exit /b 1
+if "%1"=="" goto :maven
+goto :exit
 
+:maven
 echo ### Build and Test winp.jar for %version%
 cd %BUIDROOT%
-call mvn -q --batch-mode versions:set -DnewVersion=%version%
-if %errorlevel% neq 0 exit /b %errorlevel%
 call mvn --batch-mode clean package verify 
 if %errorlevel% neq 0 exit /b %errorlevel%
 goto :exit

diff --git a/native/sendctrlc/sendctrlc.vcxproj b/native/sendctrlc/sendctrlc.vcxproj
@@ -28,26 +28,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -69,19 +69,21 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(MSBuildProjectDirectory)\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(MSBuildProjectDirectory)\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>sendctrlc.x64</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(MSBuildProjectDirectory)\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(MSBuildProjectDirectory)\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>sendctrlc.x64</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>