Use the same *.exe binaries in both Windows builds

This commit is contained in:
Reinhard Pointner 2018-06-29 03:37:14 +07:00
parent e9c24efc42
commit fba4e8127d
5 changed files with 4 additions and 61 deletions

View File

@ -253,7 +253,7 @@
<property name="dir.staging" location="${dir.dist}/appx" />
<copy todir="${dir.staging}">
<fileset dir="${dir.installer}/appx" includes="*.exe, **/*.png" />
<fileset dir="${dir.installer}/msi" includes="filebot.exe, filebot.launcher.exe" />
</copy>
<copy todir="${dir.staging}/lib">
<fileset dir="${dir.lib}/native/win32-x64" />
@ -261,6 +261,9 @@
<copy todir="${dir.staging}/jar">
<fileset dir="${dir.dist}/lib" includes="*.jar" />
</copy>
<copy todir="${dir.staging}">
<fileset dir="${dir.installer}/appx" includes="**/*.png" />
</copy>
<!-- copy files and resolve ant variables -->
<copy-replace todir="${dir.staging}">

Binary file not shown.

View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<launch4jConfig>
<dontWrapJar>true</dontWrapJar>
<headerType>console</headerType>
<jar></jar>
<outfile>filebot.exe</outfile>
<errTitle></errTitle>
<cmdLine></cmdLine>
<chdir></chdir>
<priority>normal</priority>
<downloadUrl></downloadUrl>
<supportUrl></supportUrl>
<stayAlive>false</stayAlive>
<restartOnCrash>false</restartOnCrash>
<manifest></manifest>
<icon>icon.ico</icon>
<classPath>
<mainClass>net.filebot.Main</mainClass>
<cp>%EXEDIR%\jar\*.jar</cp>
</classPath>
<jre>
<path>jre</path>
<bundledJre64Bit>true</bundledJre64Bit>
<bundledJreAsFallback>false</bundledJreAsFallback>
<minVersion></minVersion>
<maxVersion></maxVersion>
<jdkPreference>jreOnly</jdkPreference>
<runtimeBits>64</runtimeBits>
</jre>
</launch4jConfig>

Binary file not shown.

View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<launch4jConfig>
<dontWrapJar>true</dontWrapJar>
<headerType>gui</headerType>
<jar></jar>
<outfile>filebot.launcher.exe</outfile>
<errTitle></errTitle>
<cmdLine></cmdLine>
<chdir></chdir>
<priority>normal</priority>
<downloadUrl></downloadUrl>
<supportUrl></supportUrl>
<stayAlive>true</stayAlive>
<restartOnCrash>false</restartOnCrash>
<manifest></manifest>
<icon>icon.ico</icon>
<classPath>
<mainClass>net.filebot.Main</mainClass>
<cp>%EXEDIR%\jar\*.jar</cp>
</classPath>
<jre>
<path>jre</path>
<bundledJre64Bit>true</bundledJre64Bit>
<bundledJreAsFallback>false</bundledJreAsFallback>
<minVersion></minVersion>
<maxVersion></maxVersion>
<jdkPreference>jreOnly</jdkPreference>
<runtimeBits>64</runtimeBits>
</jre>
</launch4jConfig>