From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 7 Jun 2010 23:04:25 +0000 (+0000)
Subject: Do not evaluate the "execute.installer" property,
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=cbe6e77a858d9884e19b3edd8b9e338857de482a;p=tomcat7.0

Do not evaluate the "execute.installer" property,
because it is never used in this build file: "skip.installer" is used instead.

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

diff --git a/build.xml b/build.xml
index cd9bf7367..26b1b16a1 100644
--- a/build.xml
+++ b/build.xml
@@ -1177,18 +1177,6 @@
   </target>
 
   <target name="dist-prepare" depends="download-dist">
-    <!-- This is why releasing must be done on Windows / with wine:
-         otherwise this check fails and the .exe distro is not generated -->
-    <condition property="execute.installer">
-      <and>
-        <os family="windows" />
-        <available file="${nsis.exe}" />
-        <available file="${nsis.installoptions.dll}" />
-        <available file="${nsis.nsexec.dll}" />
-        <available file="${nsis.nsisdl.dll}" />
-      </and>
-    </condition>
-    
     <mkdir dir="${tomcat.dist}"/>
     <mkdir dir="${tomcat.dist}/bin"/>
     <mkdir dir="${tomcat.dist}/conf"/>