Use FilesToPackage to copy map files

And remove build.ps1 scripting to copy map files

Signed-off-by: Owen Smith <owen.smith@cloud.com>

diff --git a/build.ps1 b/build.ps1
index 38f8386483f96661d01c4ea807bd4c7126d0b717..4ff02c1ba64b3e1d84cc2f034e229733cf75f5a3 100644 (file)
--- a/build.ps1
+++ b/build.ps1
@@ -14,7 +14,6 @@ param(
 #
 # Script Body
 #
-$TargetPath = "xenbus"
 
 Function Build {
        param(
@@ -38,13 +37,6 @@ Function Build {
                Write-Host -ForegroundColor Red "ERROR: Build failed, code:" $LASTEXITCODE
                Exit $LASTEXITCODE
        }
-        # Find and Move map files
-       foreach ($item in Get-ChildItem -Path $solutiondir[$visualstudioversion] -Include *.map -Recurse)
-       {
-               $filename = Split-Path -Path $item -Leaf -Resolve
-               $newpath = "$TargetPath\$Arch\$filename"
-               Move-Item $item -Destination $newpath -Force
-       }
 }
 
 Function SdvBuild {

diff --git a/vs2019/xen/xen.vcxproj b/vs2019/xen/xen.vcxproj
index 9fc9b105952dfed332cde359749bed63b875f6a9..ca6cef604cc83b81edae8d645fa3ba64fb2844b5 100644 (file)
--- a/vs2019/xen/xen.vcxproj
+++ b/vs2019/xen/xen.vcxproj
@@ -64,6 +64,7 @@
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
     <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).map" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\common\registry.c" />

diff --git a/vs2019/xenbus/xenbus.vcxproj b/vs2019/xenbus/xenbus.vcxproj
index aa889808ebf698c51681b89a4e3edf8beab3e777..9227e0a3b3ac06bf6b815d96a45a15d07369cc04 100644 (file)
--- a/vs2019/xenbus/xenbus.vcxproj
+++ b/vs2019/xenbus/xenbus.vcxproj
@@ -68,6 +68,7 @@
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
     <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).map" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\common\registry.c" />

diff --git a/vs2019/xenbus_monitor/xenbus_monitor.vcxproj b/vs2019/xenbus_monitor/xenbus_monitor.vcxproj
index d98a059612c3c59f44986f596f7e1fafb08e3be5..2a2c00f94bfc7722def6f121265f59e67b1f97eb 100644 (file)
--- a/vs2019/xenbus_monitor/xenbus_monitor.vcxproj
+++ b/vs2019/xenbus_monitor/xenbus_monitor.vcxproj
@@ -69,6 +69,7 @@
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
     <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).map" />
     <FilesToPackage Include="$(OutDir)$(TargetName).dll" />
     <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>

diff --git a/vs2019/xenfilt/xenfilt.vcxproj b/vs2019/xenfilt/xenfilt.vcxproj
index dce68eea56f1501e6cd9448aa11c1bb32ac032a5..58e231fbaa2ecf56991982785557f826a29469c7 100644 (file)
--- a/vs2019/xenfilt/xenfilt.vcxproj
+++ b/vs2019/xenfilt/xenfilt.vcxproj
@@ -68,6 +68,7 @@
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
     <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).map" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="../../src/common/registry.c" />

diff --git a/vs2022/xen/xen.vcxproj b/vs2022/xen/xen.vcxproj
index 40285d046f2342e2df649a735a912accc2bfddc1..2304a4b007b2ddb20772b35e5cffebe22e9b94de 100644 (file)
--- a/vs2022/xen/xen.vcxproj
+++ b/vs2022/xen/xen.vcxproj
@@ -59,6 +59,7 @@
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
     <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).map" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\common\registry.c" />

diff --git a/vs2022/xenbus/xenbus.vcxproj b/vs2022/xenbus/xenbus.vcxproj
index ce0526f3dcc6597ba028260925c280130b0ab827..422f6107b460e4215b23f71b1e26642b081027ea 100644 (file)
--- a/vs2022/xenbus/xenbus.vcxproj
+++ b/vs2022/xenbus/xenbus.vcxproj
@@ -60,6 +60,7 @@
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
     <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).map" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\common\registry.c" />

diff --git a/vs2022/xenbus_monitor/xenbus_monitor.vcxproj b/vs2022/xenbus_monitor/xenbus_monitor.vcxproj
index 198a03cf5b4ddeb5ed112a67cf038bef84c3ab7f..4d26331fb4eb1e2a392fd11e20060f8a5923f043 100644 (file)
--- a/vs2022/xenbus_monitor/xenbus_monitor.vcxproj
+++ b/vs2022/xenbus_monitor/xenbus_monitor.vcxproj
@@ -59,6 +59,7 @@
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
     <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).map" />
     <FilesToPackage Include="$(OutDir)$(TargetName).dll" />
     <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>

diff --git a/vs2022/xenfilt/xenfilt.vcxproj b/vs2022/xenfilt/xenfilt.vcxproj
index 0df220f9953365b9c1e2ac31bddd955dc073dace..1b7125202e61bc294ee75ac840c208e62e395a50 100644 (file)
--- a/vs2022/xenfilt/xenfilt.vcxproj
+++ b/vs2022/xenfilt/xenfilt.vcxproj
@@ -60,6 +60,7 @@
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
     <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).map" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="../../src/common/registry.c" />