Permalink
Browse files

Fixed build problems when no JRE present.

  • Loading branch information...
1 parent 1210ba9 commit 4bbb6b39d217eda4a9d740f221ef19e6ef5f4c4c @ralfbiedert ralfbiedert committed Mar 31, 2013
Showing with 6 additions and 3 deletions.
  1. +6 −3 build.xml
View
@@ -19,7 +19,6 @@
<attribute name="name"/>
<sequential>
<property name="absolute.destfile" location="@{destfile}"/>
- <echo message="${absolute.destfile}"/>
<exec executable="zip" dir="@{sourcedir}"
failonerror="false"
failifexecutionfails="false">
@@ -81,14 +80,18 @@
<!-- Only does something on MacOS / Linux -->
<chmod file="dist/${dist}/processing-py.sh" perm="755"/>
<chmod file="dist/${dist}/processing-py.app/Contents/MacOS/processing-py" perm="755"/>
- <chmod file="dist/${dist}/JREs/jre7.mac/bin/java" perm="755"/>
<!-- I did mention already that Ant is an abomination? Anyway, here we have to check
if zip is installed and use this instead of the internal zip. Otherwise the executable
flags will not be preserved. Oh, and thanks Ant for providing an integrated if/else task! -->
<if>
<available file="/usr/bin/zip"/>
- <then>
+ <then>
+ <!--how can one tool be so utterly fucked up? chmod ignoremissing="true" failifexecutionfails="false" failonerror="false" file="dist/${dist}/JREs/jre7.mac/bin/java" perm="755"/-->
+ <exec executable="chmod" dir="dist/${dist}/" failonerror="false" failifexecutionfails="false">
+ <arg line="755 JREs/jre7.mac/bin/java" />
+ </exec>
+
<zipdir sourcedir="dist/" name="${dist}" destfile="dist/${dist}.zip"/>
</then>
<else>

0 comments on commit 4bbb6b3

Please sign in to comment.