Move build/sign related tools into a separate folder

Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
kostyanf14 · Oct 13, 2024 · 84b50b8 · 84b50b8
1 parent 8102789
commit 84b50b8
Show file tree

Hide file tree

Showing 120 changed files with 216 additions and 225 deletions.
diff --git a/Balloon/app/blnsvr.vcxproj b/Balloon/app/blnsvr.vcxproj
@@ -80,7 +80,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <TargetVersion>Windows10</TargetVersion>
   </PropertyGroup>
-  <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\Driver.Common.props" />
+  <Import Project="$(MSBuildProjectDirectory)\..\..\build\Driver.Common.props" />
   <Import Project="$(MSBuildProjectDirectory)\blnsvr.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -293,7 +293,7 @@
     <ClCompile Include="utils.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\Driver.Common.targets" />
+  <Import Project="$(MSBuildProjectDirectory)\..\..\build\Driver.Common.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/Balloon/app/cleanAll.bat b/Balloon/app/cleanAll.bat
@@ -1,4 +1,2 @@
 @echo off
-call ..\..\Tools\clean.bat
-
-
+call ..\..\build\clean.bat
diff --git a/Balloon/buildAll.bat b/Balloon/buildAll.bat
@@ -1,6 +1,6 @@
 @echo off
-if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat balloon.sln "Win10 Win11" ARM64
+if "%VIRTIO_WIN_NO_ARM%"=="" call ..\build\build.bat balloon.sln "Win10 Win11" ARM64
 if errorlevel 1 goto :eof
-call ..\tools\build.bat balloon.sln "Win10 Win11" %*
+call ..\build\build.bat balloon.sln "Win10 Win11" %*
 if errorlevel 1 goto :eof
-call ..\tools\build.bat sys\balloon.vcxproj "Win11_SDV" %*
+call ..\build\build.bat sys\balloon.vcxproj "Win11_SDV" %*
diff --git a/Balloon/sys/balloon.rc b/Balloon/sys/balloon.rc
@@ -29,7 +29,7 @@
 #include <windows.h>
 #include <ntverp.h>
 
-#include "..\..\Tools\vendor.ver"
+#include "..\..\build\vendor.ver"
 
 #undef  VER_FILEDESCRIPTION_STR
 #undef  VER_INTERNALNAME_STR

diff --git a/Balloon/sys/balloon.vcxproj b/Balloon/sys/balloon.vcxproj
@@ -82,7 +82,7 @@
     <DriverType>KMDF</DriverType>
   </PropertyGroup>
   <Import Project="$(MSBuildProjectDirectory)\balloon.props" />
-  <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\Driver.Common.props" />
+  <Import Project="$(MSBuildProjectDirectory)\..\..\build\Driver.Common.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -180,7 +180,7 @@
     <ClCompile Include="utils.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\Driver.Common.targets" />
+  <Import Project="$(MSBuildProjectDirectory)\..\..\build\Driver.Common.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/Balloon/sys/cleanAll.bat b/Balloon/sys/cleanAll.bat
@@ -1,2 +1,2 @@
 @echo off
-call ..\..\Tools\clean.bat
+call ..\..\build\clean.bat
diff --git a/NetKVM/Common/quverp.h b/NetKVM/Common/quverp.h
@@ -29,7 +29,7 @@
 #include <windows.h>
 #include <ntverp.h>
 
-#include "..\..\Tools\vendor.ver"
+#include "..\..\build\vendor.ver"
 
 #undef __BUILDMACHINE__
 

diff --git a/NetKVM/NetKVM-VS2015.vcxproj b/NetKVM/NetKVM-VS2015.vcxproj
@@ -106,7 +106,7 @@
     <InstallRoot>$(ProjectDir)Install</InstallRoot>
   </PropertyGroup>
   <Import Project="$(MSBuildProjectDirectory)\NetKVM-VS2015.props" />
-  <Import Project="$(MSBuildProjectDirectory)\..\Tools\Driver.Common.props" />
+  <Import Project="$(MSBuildProjectDirectory)\..\build\Driver.Common.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -181,7 +181,7 @@
       <Command>
         copy /Y $(ProjectDir)NetKVM.DVL.XML $(ProjectDir)Install\$(TargetOS)\$(TargetArch)
         copy /Y $(IntDir)vc.nativecodeanalysis.all.xml $(ProjectDir)
-        call "..\Tools\dvl1903.bat" "$(ProjectDir)\$(IntDir)" "$(TargetName)" "$(Configuration)" "$(Platform)"
+        call "..\build\dvl1903.bat" "$(ProjectDir)\$(IntDir)" "$(TargetName)" "$(Configuration)" "$(Platform)"
         copy /Y $(ProjectDir)NetKVM.DVL.XML $(ProjectDir)Install\$(TargetOS)\$(TargetArch)\NetKVM.DVL-win10.XML
       </Command>
       <Inputs>$(IntDir)vc.nativecodeanalysis.all.xml;$(ProjectDir)NetKVM.DVL.XML</Inputs>
@@ -262,7 +262,7 @@
     <Inf Include="$(SourceInfFile)" CopyOutput="netkvm.inf" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildProjectDirectory)\..\Tools\Driver.Common.targets" />
+  <Import Project="$(MSBuildProjectDirectory)\..\build\Driver.Common.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/NetKVM/NotifyObject/notifyobject.vcxproj b/NetKVM/NotifyObject/notifyobject.vcxproj
@@ -81,7 +81,7 @@
     <DriverTargetPlatform>Desktop</DriverTargetPlatform>
   </PropertyGroup>
   <Import Project="$(MSBuildProjectDirectory)\notifyobject.props" />
-  <Import Project="..\..\Tools\Driver.Common.props" />
+  <Import Project="..\..\build\Driver.Common.props" />
   <PropertyGroup>
     <OutDir>$(ProjectDir)$(PlatformTarget)\$(ConfigurationName)\</OutDir>
   </PropertyGroup>
@@ -120,9 +120,9 @@
     <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\Tools\Driver.Common.targets" />
+  <Import Project="..\..\build\Driver.Common.targets" />
   <PropertyGroup>
     <TargetExt>.dummy</TargetExt>
     <TargetPath>$(OutDir)$(TargetName)$(TargetExt)</TargetPath>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/NetKVM/ProtocolService/ProtocolService.rc b/NetKVM/ProtocolService/ProtocolService.rc
@@ -5,7 +5,7 @@
 #undef _NT_TARGET_MAJ
 #define _NT_TARGET_MAJ 61
 
-#include "..\..\Tools\vendor.ver"
+#include "..\..\build\vendor.ver"
 #undef __BUILDMACHINE__
 #undef  VER_FILEDESCRIPTION_STR
 #undef  VER_INTERNALNAME_STR
@@ -14,4 +14,4 @@
 #define VER_FILEDESCRIPTION_STR     VENDOR_DESC_PREFIX "VirtIO Protocol Service" VENDOR_DESC_POSTFIX
 #define VER_INTERNALNAME_STR        "netkvmp.exe"
 
-#include "common.ver"
+#include "common.ver"
diff --git a/NetKVM/ProtocolService/ProtocolService.vcxproj b/NetKVM/ProtocolService/ProtocolService.vcxproj
@@ -97,7 +97,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <Import Project="..\..\Tools\Driver.Common.props" />
+  <Import Project="..\..\build\Driver.Common.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -236,4 +236,4 @@ echo _BUILD_MINOR_VERSION_=$(_BUILD_MINOR_VERSION_)
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/NetKVM/buildAll.bat b/NetKVM/buildAll.bat
@@ -1,6 +1,6 @@
 @echo off
-if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat netkvm-vs2015.sln "Win10 Win11" ARM64
+if "%VIRTIO_WIN_NO_ARM%"=="" call ..\build\build.bat netkvm-vs2015.sln "Win10 Win11" ARM64
 if errorlevel 1 goto :eof
-call ..\tools\build.bat netkvm-vs2015.sln "Win10 Win11" %*
+call ..\build\build.bat netkvm-vs2015.sln "Win10 Win11" %*
 if errorlevel 1 goto :eof
-call ..\tools\build.bat NetKVM-VS2015.vcxproj "Win11_SDV" %*
+call ..\build\build.bat NetKVM-VS2015.vcxproj "Win11_SDV" %*
diff --git a/NetKVM/clean_dvl_log.cmd b/NetKVM/clean_dvl_log.cmd
@@ -1,5 +1,5 @@
 setlocal
-call ..\Tools\SetVsEnv.bat
+call ..\build\SetVsEnv.bat
 rmdir /q /s sdv
 msbuild.exe NetKVM-VS2015.vcxproj /t:clean /p:Configuration="Win10 Release" /P:Platform=x64
 msbuild.exe NetKVM-VS2015.vcxproj /t:sdv /p:inputs="/clean" /p:Configuration="Win10 Release" /P:platform=x64

diff --git a/Q35/buildAll.bat b/Q35/buildAll.bat
@@ -1,6 +1,6 @@
 setlocal
 call clean.bat
-call ..\Tools\SetVsEnv x86
+call ..\build\SetVsEnv x86
 
 mkdir Install
 

diff --git a/VirtIO/VirtioLib.vcxproj b/VirtIO/VirtioLib.vcxproj
@@ -92,7 +92,7 @@
     <TargetVersion>Windows10</TargetVersion>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(MSBuildProjectDirectory)\..\Tools\Driver.Common.props" />
+  <Import Project="$(MSBuildProjectDirectory)\..\build\Driver.Common.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -133,4 +133,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/VirtIO/WDF/VirtioLib-WDF.vcxproj b/VirtIO/WDF/VirtioLib-WDF.vcxproj
@@ -89,7 +89,7 @@
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <KMDF_VERSION_MINOR>15</KMDF_VERSION_MINOR>
   </PropertyGroup>
-  <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\Driver.Common.props" />
+  <Import Project="$(MSBuildProjectDirectory)\..\..\build\Driver.Common.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -132,4 +132,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/VirtIO/buildAll.bat b/VirtIO/buildAll.bat
@@ -1,4 +1,4 @@
 @echo off
-if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat VirtioLib.sln "Win10 Win11" ARM64
+if "%VIRTIO_WIN_NO_ARM%"=="" call ..\build\build.bat VirtioLib.sln "Win10 Win11" ARM64
 if errorlevel 1 goto :eof
-call ..\tools\build.bat VirtioLib.sln "Win10 Win11" %*
+call ..\build\build.bat VirtioLib.sln "Win10 Win11" %*
diff --git a/Tools/Driver.Common.props → build/Driver.Common.props b/Tools/Driver.Common.props → build/Driver.Common.props
diff --git a/Tools/Driver.Common.targets → build/Driver.Common.targets b/Tools/Driver.Common.targets → build/Driver.Common.targets
diff --git a/Tools/Driver.Initial.props → build/Driver.Initial.props b/Tools/Driver.Initial.props → build/Driver.Initial.props
diff --git a/Tools/Driver.PackOne.targets → build/Driver.PackOne.targets b/Tools/Driver.PackOne.targets → build/Driver.PackOne.targets
diff --git a/Tools/Driver.Platform.props → build/Driver.Platform.props b/Tools/Driver.Platform.props → build/Driver.Platform.props
diff --git a/Tools/Driver.RHEL.props → build/Driver.RHEL.props b/Tools/Driver.RHEL.props → build/Driver.RHEL.props
diff --git a/Tools/Driver.VZ.props → build/Driver.VZ.props b/Tools/Driver.VZ.props → build/Driver.VZ.props
diff --git a/Tools/Driver.Vendor.props → build/Driver.Vendor.props b/Tools/Driver.Vendor.props → build/Driver.Vendor.props
diff --git a/Tools/SetVsEnv.bat → build/SetVsEnv.bat b/Tools/SetVsEnv.bat → build/SetVsEnv.bat
diff --git a/Tools/VirtIOTestCert.cer → build/VirtIOTestCert.cer b/Tools/VirtIOTestCert.cer → build/VirtIOTestCert.cer
diff --git a/Tools/VirtIOTestCert.pfx → build/VirtIOTestCert.pfx b/Tools/VirtIOTestCert.pfx → build/VirtIOTestCert.pfx
diff --git a/Tools/build.bat → build/build.bat b/Tools/build.bat → build/build.bat
diff --git a/Tools/clean.bat → build/clean.bat b/Tools/clean.bat → build/clean.bat
diff --git a/Tools/dvl1903.bat → build/dvl1903.bat b/Tools/dvl1903.bat → build/dvl1903.bat
diff --git a/Tools/readme_msbuild.txt → build/readme_msbuild.txt b/Tools/readme_msbuild.txt → build/readme_msbuild.txt
diff --git a/Tools/rhel.ver → build/rhel.ver b/Tools/rhel.ver → build/rhel.ver
diff --git a/Tools/signAll.bat → build/signAll.bat b/Tools/signAll.bat → build/signAll.bat
diff --git a/Tools/vendor.ver → build/vendor.ver b/Tools/vendor.ver → build/vendor.ver
diff --git a/Tools/vz.ver → build/vz.ver b/Tools/vz.ver → build/vz.ver
diff --git a/buildAll.bat b/buildAll.bat
@@ -1,42 +1,42 @@
 @echo off
 
-if "%VIRTIO_WIN_NO_ARM%"=="" call tools\build.bat virtio-win.sln "Win10 Win11" ARM64
+if "%VIRTIO_WIN_NO_ARM%"=="" call build\build.bat virtio-win.sln "Win10 Win11" ARM64
 if errorlevel 1 goto :fail
 
-call tools\build.bat virtio-win.sln "Win10 Win11" %*
+call build\build.bat virtio-win.sln "Win10 Win11" %*
 if errorlevel 1 goto :fail
-call tools\build.bat NetKVM\NetKVM-VS2015.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat NetKVM\NetKVM-VS2015.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat vioscsi\vioscsi.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat vioscsi\vioscsi.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat viostor\viostor.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat viostor\viostor.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
 if "%VIRTIO_WIN_SDV_2022%"=="" goto :nosdv2022
-call tools\build.bat Balloon\sys\balloon.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat Balloon\sys\balloon.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat fwcfg64\fwcfg.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat fwcfg64\fwcfg.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat ivshmem\ivshmem.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat ivshmem\ivshmem.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat pvpanic\pvpanic\pvpanic.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat pvpanic\pvpanic\pvpanic.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat viorng\viorng\viorng.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat viorng\viorng\viorng.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat vioserial\sys\vioser.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat vioserial\sys\vioser.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat viosock\sys\viosock.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat viosock\sys\viosock.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat viosock\wsk\wsk.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat viosock\wsk\wsk.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat viosock\viosock-wsk-test\viosock-wsk-test.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat viosock\viosock-wsk-test\viosock-wsk-test.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat viofs\pci\viofs.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat viofs\pci\viofs.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat vioinput\hidpassthrough\hidpassthrough.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat vioinput\hidpassthrough\hidpassthrough.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat vioinput\sys\vioinput.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat vioinput\sys\vioinput.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
-call tools\build.bat viomem\sys\viomem.vcxproj "Win10_SDV Win11_SDV" %*
+call build\build.bat viomem\sys\viomem.vcxproj "Win10_SDV Win11_SDV" %*
 if errorlevel 1 goto :fail
 
 

diff --git a/fwcfg/buildAll.bat b/fwcfg/buildAll.bat
@@ -1,6 +1,6 @@
 setlocal
 call clean.bat
-call ..\Tools\SetVsEnv x86
+call ..\build\SetVsEnv x86
 
 inf2cat /uselocaltime /driver:. /os:6_3_X86,6_3_X64,Server6_3_X64,10_X86,10_X64,Server10_X64
 

diff --git a/fwcfg64/buildAll.bat b/fwcfg64/buildAll.bat
@@ -1,4 +1,4 @@
 @echo off
-call ..\tools\build.bat fwcfg.sln "Win10 Win11" %*
+call ..\build\build.bat fwcfg.sln "Win10 Win11" %*
 if errorlevel 1 goto :eof
-call ..\tools\build.bat fwcfg.vcxproj "Win11_SDV" %*
+call ..\build\build.bat fwcfg.vcxproj "Win11_SDV" %*
diff --git a/fwcfg64/cleanAll.bat b/fwcfg64/cleanAll.bat
@@ -1,5 +1,4 @@
 @echo off
 
 rmdir /S /Q Install
-call ..\Tools\clean.bat
-
+call ..\build\clean.bat
diff --git a/fwcfg64/fwcfg.rc b/fwcfg64/fwcfg.rc
@@ -28,7 +28,7 @@
 #include <windows.h>
 #include <ntverp.h>
 
-#include "..\Tools\vendor.ver"
+#include "..\build\vendor.ver"
 
 #undef  VER_FILEDESCRIPTION_STR
 #undef  VER_INTERNALNAME_STR

diff --git a/fwcfg64/fwcfg.vcxproj b/fwcfg64/fwcfg.vcxproj
@@ -87,7 +87,7 @@
     <KMDF_VERSION_MINOR>15</KMDF_VERSION_MINOR>
   </PropertyGroup>
   <Import Project="$(MSBuildProjectDirectory)\fwcfg.props" />
-  <Import Project="$(MSBuildProjectDirectory)\..\Tools\Driver.Common.props" />
+  <Import Project="$(MSBuildProjectDirectory)\..\build\Driver.Common.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -209,7 +209,7 @@
     <FilesToPackage Include="$(TargetPath)" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildProjectDirectory)\..\Tools\Driver.Common.targets" />
+  <Import Project="$(MSBuildProjectDirectory)\..\build\Driver.Common.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/ivshmem/buildAll.bat b/ivshmem/buildAll.bat
@@ -1,6 +1,6 @@
 @echo off
-if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat ivshmem.sln "Win10 Win11" ARM64
+if "%VIRTIO_WIN_NO_ARM%"=="" call ..\build\build.bat ivshmem.sln "Win10 Win11" ARM64
 if errorlevel 1 goto :eof
-call ..\tools\build.bat ivshmem.sln "Win10 Win11" %*
+call ..\build\build.bat ivshmem.sln "Win10 Win11" %*
 if errorlevel 1 goto :eof
-call ..\tools\build.bat ivshmem.vcxproj "Win11_SDV" %*
+call ..\build\build.bat ivshmem.vcxproj "Win11_SDV" %*
diff --git a/ivshmem/cleanAll.bat b/ivshmem/cleanAll.bat
@@ -1,7 +1,7 @@
 @echo on
 
 rmdir /S /Q Install
-call ..\Tools\clean.bat
+call ..\build\clean.bat
 
 pushd test
 call cleanAll.bat

diff --git a/ivshmem/ivshmem.rc b/ivshmem/ivshmem.rc
@@ -29,7 +29,7 @@
 #include <windows.h>
 #include <ntverp.h>
 
-#include "..\Tools\vendor.ver"
+#include "..\build\vendor.ver"
 
 #undef  VER_FILEDESCRIPTION_STR
 #undef  VER_INTERNALNAME_STR

diff --git a/ivshmem/ivshmem.vcxproj b/ivshmem/ivshmem.vcxproj
@@ -100,7 +100,7 @@
     <KMDF_VERSION_MINOR>15</KMDF_VERSION_MINOR>
   </PropertyGroup>
   <Import Project="$(MSBuildProjectDirectory)\ivshmem.props" />
-  <Import Project="$(MSBuildProjectDirectory)\..\Tools\Driver.Common.props" />
+  <Import Project="$(MSBuildProjectDirectory)\..\build\Driver.Common.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -202,7 +202,7 @@
     <FilesToPackage Include="$(TargetPath)" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildProjectDirectory)\..\Tools\Driver.Common.targets" />
+  <Import Project="$(MSBuildProjectDirectory)\..\build\Driver.Common.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/ivshmem/test/cleanAll.bat b/ivshmem/test/cleanAll.bat
@@ -1,2 +1,2 @@
 @echo off
-call ..\..\Tools\clean.bat
+call ..\..\build\clean.bat