[vioscsi] Conditionally manage DVL copying

a) Updates the CustomBuildStep Command to conditionally copy COMPAT and Win10 DVL files. This permits COMPAT DVLs with Checksums and Win10 SDV DVLs to be copied if available. b) Enables Win10_SDV for local buildAll.bat script. Signed-off-by: benyamin-codez <[email protected]>
virtio-win · Dec 5, 2024 · 7348ad4 · 7348ad4
1 parent 13de4f0
commit 7348ad4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/vioscsi/buildAll.bat b/vioscsi/buildAll.bat
@@ -3,4 +3,4 @@ if "%VIRTIO_WIN_NO_ARM%"=="" call ..\build\build.bat vioscsi.sln "Win10 Win11" A
 if errorlevel 1 goto :eof
 call ..\build\build.bat vioscsi.sln "Win10 Win11" %*
 if errorlevel 1 goto :eof
-call ..\build\build.bat vioscsi.vcxproj "Win11_SDV" %*
+call ..\build\build.bat vioscsi.vcxproj "Win10_SDV Win11_SDV" %*
diff --git a/vioscsi/vioscsi.vcxproj b/vioscsi/vioscsi.vcxproj
@@ -132,8 +132,30 @@
       <Command>
         copy /Y $(ProjectDir)vioscsi.DVL.XML $(ProjectDir)Install\$(TargetOS)\$(TargetArch)
         copy /Y $(IntDir)vc.nativecodeanalysis.all.xml $(ProjectDir)
-        call "..\build\dvl1903.bat" "$(ProjectDir)\$(IntDir)" "$(TargetName)" "$(Configuration)" "$(Platform)"
-        copy /Y $(ProjectDir)vioscsi.DVL.XML $(ProjectDir)Install\$(TargetOS)\$(TargetArch)\vioscsi.DVL-win10.XML
+        if "$(TargetOS)"=="Win10" (
+          if exist C:\DVL1903 (
+            call "..\build\dvl1903.bat" "$(ProjectDir)\$(IntDir)" "$(TargetName)" "$(Configuration)" "$(Platform)"
+            copy /Y $(ProjectDir)vioscsi.DVL.XML $(ProjectDir)vioscsi.DVL-compat.XML 
+            copy /Y $(ProjectDir)vioscsi.DVL.XML $(ProjectDir)Install\$(TargetOS)\$(TargetArch)\vioscsi.DVL-compat.XML
+          )
+        )
+        if "$(TargetOS)"=="Win11" (
+          if exist $(ProjectDir)Install\Win10\$(TargetArch)\vioscsi.DVL.XML (
+            copy /Y $(ProjectDir)Install\Win10\$(TargetArch)\vioscsi.DVL.XML $(ProjectDir)Install\$(TargetOS)\$(TargetArch)\vioscsi.DVL-win10.XML
+          ) else (
+            copy /Y $(ProjectDir)vioscsi.DVL.XML $(ProjectDir)Install\$(TargetOS)\$(TargetArch)\vioscsi.DVL-win10.XML
+          )
+          if exist $(ProjectDir)Install\Win10\$(TargetArch)\vioscsi.DVL-compat.XML (
+            copy /Y $(ProjectDir)Install\Win10\$(TargetArch)\vioscsi.DVL-compat.XML $(ProjectDir)Install\$(TargetOS)\$(TargetArch)\vioscsi.DVL-compat.XML
+          ) else (
+            if exist $(ProjectDir)vioscsi.DVL-compat.XML (
+              copy /Y $(ProjectDir)vioscsi.DVL-compat.XML $(ProjectDir)Install\$(TargetOS)\$(TargetArch)\vioscsi.DVL-compat.XML
+            ) else (
+              findstr /v /c:"General.Checksum" "$(ProjectDir)vioscsi.DVL.XML" | findstr /v /c:".Semmle." > $(ProjectDir)vioscsi.DVL-compat.XML
+              copy /Y $(ProjectDir)vioscsi.DVL-compat.XML $(ProjectDir)Install\$(TargetOS)\$(TargetArch)\vioscsi.DVL-compat.XML
+            )
+          )
+        )
       </Command>
       <Inputs>$(IntDir)vc.nativecodeanalysis.all.xml;$(ProjectDir)vioscsi.DVL.XML</Inputs>
       <Outputs>$(ProjectDir)Install\$(TargetOS)\$(TargetArch)\vioscsi.DVL.XML;$(ProjectDir)Install\$(TargetOS)\$(TargetArch)\vioscsi.DVL-win10.XML</Outputs>