From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 11 Mar 2011 17:38:19 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50911
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=698fba744b3ca1f532b1a5e2f91b3805b1121a8b;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50911
Reduce noise generated during the build of the Windows installer so warnings are more obvious.
Patch provided by sebb

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1080693 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index a620aa20a..8afb6509d 100644
--- a/build.xml
+++ b/build.xml
@@ -1621,11 +1621,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
     </copy>
     <exec dir="${tomcat.dist}" executable="${nsis.exe}" osfamily="windows">
       <arg value="/DNSISDIR=${nsis.home}" />
+      <arg value="/V2" />
       <arg value="tomcat.nsi" />
     </exec>
     <exec dir="${tomcat.dist}" executable="wine" osfamily="unix">
       <arg value="${nsis.exe}" />
       <arg value="/DNSISDIR=${nsis.home}" />
+      <arg value="/V2" />
       <arg value="tomcat.nsi" />
     </exec>
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index eefbfdca3..6be8b9281 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -55,6 +55,10 @@
       <update>
         Update optional CheckStyle library to 5.3. (markt)
       </update>
+      <fix>
+        <bug>50911</bug>: Reduce noise generated during the build of the Windows
+        installer so warnings are more obvious. Patch provided by sebb. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>