moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-23 16:28:51 -05:00
Code Issues Releases Wiki Activity

Simplify MWS build

Browse Source
This commit is contained in:
Reinhard Pointner 2018-06-21 17:28:22 +07:00
parent c3aa5d6f19
commit 58947e3850
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build.xml
View File

@ -544,31 +544,13 @@
<target name="appx" description="Build Windows 10 package" depends="revision"> <target name="appx" description="Build Windows 10 package" depends="revision">
<antcall target="appx-arch"> <property name="dir.staging" location="${dir.dist}/appx" />
<param name="arch" value="x64" />
<param name="arch.env" value="AMD64" />
<param name="arch.jre" value="x64" />
</antcall>
<!-- 32-bit Windows is not supported by Oracle JDK so there are no JRE builds -->
<!--
<antcall target="appx-arch">
<param name="arch" value="x86" />
<param name="arch.env" value="x86" />
<param name="arch.jre" value="i586" />
</antcall>
-->
</target>
<target name="appx-arch">
<property name="dir.staging" location="${dir.dist}/appx/${arch}" />
<copy todir="${dir.staging}"> <copy todir="${dir.staging}">
<fileset dir="${dir.installer}/appx" includes="*.exe, **/*.png" /> <fileset dir="${dir.installer}/appx" includes="*.exe, **/*.png" />
</copy> </copy>
<copy todir="${dir.staging}/lib"> <copy todir="${dir.staging}/lib">
<fileset dir="${dir.lib}/native/win32-${arch}" /> <fileset dir="${dir.lib}/native/win32-x64" />
</copy> </copy>
<copy todir="${dir.staging}/jar"> <copy todir="${dir.staging}/jar">
<fileset dir="${dir.dist}/lib" includes="*.jar" /> <fileset dir="${dir.dist}/lib" includes="*.jar" />
@ -596,7 +578,7 @@
<arg line="new /o /pr . /cf priconfig.xml /in ${microsoft.application.name}" /> <arg line="new /o /pr . /cf priconfig.xml /in ${microsoft.application.name}" />
</exec> </exec>
<exec executable="makeappx" dir="${dir.dist}" failonerror="yes"> <exec executable="makeappx" dir="${dir.dist}" failonerror="yes">
<arg line="pack /v /o /d ${dir.staging} /p ${release}_r${revision}_${arch}.appx" /> <arg line="pack /v /o /d ${dir.staging} /p ${release}_r${revision}_x64.appx" />
</exec> </exec>
</target> </target>