Skip to content

Commit

Permalink
Correct condition name (#320)
Browse files Browse the repository at this point in the history
  • Loading branch information
byrnHDF authored Aug 20, 2024
1 parent 0ca0e60 commit 683e02d
Showing 1 changed file with 4 additions and 39 deletions.
43 changes: 4 additions & 39 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1373,7 +1373,7 @@
<condition property="isSignXMac" else="false">
<and>
<equals arg1="${isMac}" arg2="true" />
<equals arg1="${sign_state}" arg2="true" />
<equals arg1="${sign.enable}" arg2="true" />
<equals arg1="${XPackage}" arg2="true" />
</and>
</condition>
Expand Down Expand Up @@ -1418,7 +1418,7 @@
<condition property="isSignXWindows" else="false">
<and>
<equals arg1="${isWindows}" arg2="true" />
<equals arg1="${sign_state}" arg2="true" />
<equals arg1="${sign.enable}" arg2="true" />
<equals arg1="${XPackage}" arg2="true" />
</and>
</condition>
Expand All @@ -1428,7 +1428,7 @@
<and>
<equals arg1="${isMac}" arg2="true" />
<not>
<equals arg1="${sign_state}" arg2="true" />
<equals arg1="${sign.enable}" arg2="true" />
</not>
<not>
<equals arg1="${XPackage}" arg2="true" />
Expand All @@ -1440,7 +1440,7 @@
<condition property="isSignAppMac" else="false">
<and>
<equals arg1="${isMac}" arg2="true" />
<equals arg1="${sign_state}" arg2="true" />
<equals arg1="${sign.enable}" arg2="true" />
<not>
<equals arg1="${XPackage}" arg2="true" />
</not>
Expand Down Expand Up @@ -1632,41 +1632,6 @@

<echo message="xxxx Staple notary ID to dmg xxxx"/>
<antcall target="staple-notary" />

<echo message="xxxx Package the mac dmg binary xxxx"/>
<!-- Copy over license file -->
<copy tofile="${dist.dir}/COPYING.txt">
<fileset dir="${basedir}" includes="COPYING" />
</copy>

<exec executable="uname" outputproperty="uname.os">
<arg value="-s" />
</exec>

<exec executable="uname" outputproperty="uname.version">
<arg value="-r" />
</exec>

<exec dir="${dist.dir}" executable="hdiutil">
<arg value="verify" />
<arg value="${ant.project.name}-${app.version}.dmg" />
</exec>

<echo message="xxxx Compress the mac dmg binary xxxx"/>
<!-- Copy over license file -->
<copy tofile="${dist.dir}/COPYING.txt">
<fileset dir="${basedir}" includes="COPYING" />
</copy>

<!-- Compress everything into one tar.gz file -->
<tar destfile="${dist.dir}/${ant.project.name}-${app.version}-${uname.os}.tar.gz" compression="gzip">
<tarfileset dir="${dist.dir}" filemode="755">
<include name="COPYING.txt" />
<include name="README.txt" />
<include name="${ant.project.name}-${app.version}.dmg" />
</tarfileset>
</tar>

</target>

<!-- =================================================================
Expand Down

0 comments on commit 683e02d

Please sign in to comment.