Merge pull request #4705 from SirLynix/vsproject_warning

Remove XmakeWarning options from vsxmake projects
xmake-io · Feb 5, 2024 · 82d274e · 82d274e
2 parents 4972cfb + 9d46aea
commit 82d274e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/xmake/scripts/vsxmake/vsproj/Xmake.props b/xmake/scripts/vsxmake/vsproj/Xmake.props
@@ -41,7 +41,6 @@
 
   <PropertyGroup Label="XmakeFlagsFallback">
     <XmakeCleanAll Condition="'$(XmakeCleanAll)' == ''">true</XmakeCleanAll>
-    <XmakeWarning Condition="'$(XmakeWarning)' == ''">true</XmakeWarning>
     <XmakeVerbose Condition="'$(XmakeVerbose)' == ''">false</XmakeVerbose>
     <XmakeDiagnosis Condition="'$(XmakeDiagnosis)' == ''">false</XmakeDiagnosis>
     <XmakeRebuildFile Condition="'$(XmakeRebuildFile)' == ''">false</XmakeRebuildFile>

diff --git a/xmake/scripts/vsxmake/vsproj/Xmake.targets b/xmake/scripts/vsxmake/vsproj/Xmake.targets
@@ -48,9 +48,6 @@
     <_XmakeConfigFlags>$(XmakeConfigFlags.Trim())</_XmakeConfigFlags>
     <_XmakeConfigFlags>-p $(XmakePlat) -m $(XmakeMode) -a $(XmakeArch) $(_XmakeOutFlag) $(_XmakeConfigFlags.Trim())</_XmakeConfigFlags>
 
-    <_XmakeBuildFlags>$(XmakeBuildFlags.Trim())</_XmakeBuildFlags>
-    <_XmakeBuildFlags Condition="$(XmakeWarning)">-w $(_XmakeBuildFlags.Trim())</_XmakeBuildFlags>
-
     <_XmakeBuildFileFlags>$(_XmakeBuildFlags.Trim())</_XmakeBuildFileFlags>
     <_XmakeBuildFileFlags Condition="$(XmakeRebuildFile)">$(_XmakeBuildFileFlags.Trim()) -r</_XmakeBuildFileFlags>
 
@@ -169,7 +166,6 @@ MSBuild Properties:
     XmakeConfigFileDir: $(XmakeConfigFileDirResolved)
     XmakeRunDir: $(XmakeRunDirResolved)
   Xmake Flags:
-    XmakeWarning: $(XmakeWarning)
     XmakeVerbose: $(XmakeVerbose)
     XmakeDiagnosis: $(XmakeDiagnosis)
     XmakeRebuildFile: $(XmakeRebuildFile)

diff --git a/xmake/scripts/vsxmake/vsproj/Xmake.xml b/xmake/scripts/vsxmake/vsproj/Xmake.xml
@@ -25,12 +25,6 @@
       Category="Common"
       Description="Print lots of diagnosis information (backtrace, check info ..) only for developers."
       Switch="diagnosis" />
-    <BoolProperty
-      Name="XmakeWarning"
-      DisplayName="Print warnings"
-      Category="Common"
-      Description="Enable the warnings output for build tasks."
-      Switch="warning" />
     <BoolProperty
       Name="XmakeCleanAll"
       DisplayName="Clean all"

diff --git a/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.props b/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.props
@@ -22,14 +22,11 @@
       Respect parents:
         <XmakeCleanFlags Condition=" '$(XmakeCleanFlags)' == '' ">-D</XmakeCleanFlags>
 
-      For -w, -v and -D, use <XmakeWarning>, <XmakeVerbose> and <XmakeDiagnosis> is more convenient.
+      For -v and -D, use <XmakeVerbose> and <XmakeDiagnosis> as its more convenient.
     -->
 
     <!-- Set -a for "xmake clean" -->
-    <!-- <XmakeCleanAll Condition="'$(XmakeCleanAll)' == ''">true</XmakeWarning> -->
-
-    <!-- Set -w for "xmake build" -->
-    <!-- <XmakeWarning Condition="'$(XmakeWarning)' == ''">true</XmakeWarning> -->
+    <!-- <XmakeCleanAll Condition="'$(XmakeCleanAll)' == ''">true</XmakeCleanAll> -->
 
     <!-- Set -v for all xmake call -->
     <!-- <XmakeVerbose Condition="'$(XmakeVerbose)' == ''">false</XmakeVerbose> -->