Author: markt Date: Tue Apr 28 12:58:38 2015 New Revision: 1676525 URL: http://svn.apache.org/r1676525 Log: Fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57707 Clearer error message when trying to build a full release build on a non-Windows platform without Wine.
Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1676525&r1=1676524&r2=1676525&view=diff ============================================================================== --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Apr 28 12:58:38 2015 @@ -2119,9 +2119,27 @@ Apache Tomcat ${version} native binaries </copy> </target> + <target name="-installer-pre-init"> + <property environment="env" /> + <condition property="wine.ok"> + <or> + <os family="windows" /> + <available file="wine" filepath="${env.PATH}" /> + <isset property="skip.installer"/> + </or> + </condition> + </target> + + <target name="-installer-init" depends="-installer-pre-init" unless="${wine.ok}"> + <fail message="The executable wine was not found on the current path. +Wine is required to build the Windows installer when running a release build on +a non-Windows platform. To skip building the Windows installer, set the +skip.installer property in build.properties" /> + </target> + <target name="-installer-prep" description="Prepares file structure required to build installer" - unless="skip.installer" depends="dist-static"> + unless="skip.installer" depends="dist-static,-installer-init"> <copy todir="${tomcat.dist}"> <fileset dir="res"> <include name="INSTALLLICENSE" /> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org