[PATCH] Delete xenbus_monitor.dll

["Tu Dinh" <ngoc-tu.dinh@xxxxxxxxxx>]

Now that trace logging is used, the DLL is not needed any more. Remove
it from the build and package.

Signed-off-by: Tu Dinh <ngoc-tu.dinh@xxxxxxxxxx>
---
 src/monitor/messages.mc                      | 55 --------------------
 src/monitor/monitor.c                        |  2 -
 src/monitor/xenbus_monitor.rc                |  1 -
 vs2019/xenbus_monitor/xenbus_monitor.vcxproj | 17 ------
 vs2022/xenbus_monitor/xenbus_monitor.vcxproj | 12 -----
 5 files changed, 87 deletions(-)
 delete mode 100644 src/monitor/messages.mc

diff --git a/src/monitor/messages.mc b/src/monitor/messages.mc
deleted file mode 100644
index eb1d382..0000000
--- a/src/monitor/messages.mc
+++ /dev/null
@@ -1,55 +0,0 @@
-; // Copyright (c) Xen Project.
-; // Copyright (c) Cloud Software Group, Inc.
-; // All rights reserved.
-; //
-; // Redistribution and use in source and binary forms,
-; // with or without modification, are permitted provided
-; // that the following conditions are met:
-; //
-; // *   Redistributions of source code must retain the above
-; //     copyright notice, this list of conditions and the
-; //     following disclaimer.
-; // *   Redistributions in binary form must reproduce the above
-; //     copyright notice, this list of conditions and the
-; //     following disclaimer in the documentation and/or other
-; //     materials provided with the distribution.
-; //
-; // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-; // CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-; // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-; // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-; // DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-; // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-; // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-; // BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-; // SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-; // INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-; // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-; // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-; // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-; // SUCH DAMAGE.
-
-MessageIdTypedef=DWORD
-
-SeverityNames=(
-       Success=0x0:STATUS_SEVERITY_SUCCESS
-       Informational=0x1:STATUS_SEVERITY_INFORMATIONAL
-       Warning=0x2:STATUS_SEVERITY_WARNING
-       Error=0x3:STATUS_SEVERITY_ERROR
-       )
-
-
-FacilityNames=(
-       System=0x0:FACILITY_SYSTEM
-       Runtime=0x2:FACILITY_RUNTIME
-       Stubs=0x3:FACILITY_STUBS
-       Io=0x4:FACILITY_IO_ERROR_CODE
-       )
-
-MessageId=0x1
-Severity=Informational
-Facility=System
-SymbolicName=MONITOR_LOG
-Language=English
-%1
-.
diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c
index 9bfb1f6..904badd 100644
--- a/src/monitor/monitor.c
+++ b/src/monitor/monitor.c
@@ -47,8 +47,6 @@
 
 #include <version.h>
 
-#include "messages.h"
-
 #define stringify_literal(_text) #_text
 #define stringify(_text) stringify_literal(_text)
 #define __MODULE__ stringify(PROJECT)
diff --git a/src/monitor/xenbus_monitor.rc b/src/monitor/xenbus_monitor.rc
index dc2fc19..e771dad 100644
--- a/src/monitor/xenbus_monitor.rc
+++ b/src/monitor/xenbus_monitor.rc
@@ -54,4 +54,3 @@
 #define VER_FILESUBTYPE                    VFT2_UNKNOWN
 
 #include "common.ver"
-#include "messages.rc"
diff --git a/vs2019/xenbus_monitor/xenbus_monitor.vcxproj 
b/vs2019/xenbus_monitor/xenbus_monitor.vcxproj
index c9eef03..9b20fce 100644
--- a/vs2019/xenbus_monitor/xenbus_monitor.vcxproj
+++ b/vs2019/xenbus_monitor/xenbus_monitor.vcxproj
@@ -18,9 +18,6 @@
     <EnableInf2cat>false</EnableInf2cat>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>
-  <PropertyGroup>
-    <CustomBuildAfterTargets>Link</CustomBuildAfterTargets>
-  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
@@ -55,32 +52,18 @@
     <ClCompile>
       
<PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <CustomBuildStep>
-      <Outputs>$(TargetDir)$(TargetName).dll</Outputs>
-      <Inputs>$(IntDir)$(TargetName).res</Inputs>
-      <Command>link -machine:x86 -dll -noentry -out:%(Outputs) 
%(Inputs)</Command>
-    </CustomBuildStep>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
     <ClCompile>
       
<PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <CustomBuildStep>
-      <Outputs>$(TargetDir)$(TargetName).dll</Outputs>
-      <Inputs>$(IntDir)$(TargetName).res</Inputs>
-      <Command>link -machine:x64 -dll -noentry -out:%(Outputs) 
%(Inputs)</Command>
-    </CustomBuildStep>
   </ItemDefinitionGroup>
   <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>
-  <ItemGroup>
-    <MessageCompile Include="..\..\src\monitor\messages.mc" />
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\monitor\monitor.c" />
   </ItemGroup>
diff --git a/vs2022/xenbus_monitor/xenbus_monitor.vcxproj 
b/vs2022/xenbus_monitor/xenbus_monitor.vcxproj
index 1d686df..7d30855 100644
--- a/vs2022/xenbus_monitor/xenbus_monitor.vcxproj
+++ b/vs2022/xenbus_monitor/xenbus_monitor.vcxproj
@@ -18,9 +18,6 @@
     <EnableInf2cat>false</EnableInf2cat>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>
-  <PropertyGroup>
-    <CustomBuildAfterTargets>Link</CustomBuildAfterTargets>
-  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
@@ -55,22 +52,13 @@
     <ClCompile>
       
<PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <CustomBuildStep>
-      <Outputs>$(TargetDir)$(TargetName).dll</Outputs>
-      <Inputs>$(IntDir)$(TargetName).res</Inputs>
-      <Command>link -machine:x64 -dll -noentry -out:%(Outputs) 
%(Inputs)</Command>
-    </CustomBuildStep>
   </ItemDefinitionGroup>
   <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>
-  <ItemGroup>
-    <MessageCompile Include="..\..\src\monitor\messages.mc" />
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\monitor\monitor.c" />
   </ItemGroup>
-- 
2.53.0.windows.2



--
Ngoc Tu Dinh | Vates XCP-ng Developer

XCP-ng & Xen Orchestra - Vates solutions

web: https://vates.tech