mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build issues

This commit is contained in:
Reinhard Pointner 2016-09-20 14:40:38 +08:00
parent d745be08ab
commit 2ef12d936f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build.xml
View File

@ -20,11 +20,12 @@
<property name="dir.lib" location="${basedir}/lib" /> <property name="dir.lib" location="${basedir}/lib" />
<property name="dir.website" location="${basedir}/website" /> <property name="dir.website" location="${basedir}/website" />
<property name="dir.installer" location="${basedir}/installer" /> <property name="dir.installer" location="${basedir}/installer" />
<property name="dir.cache" location="${basedir}/cache" />
<!-- define output paths --> <!-- define output paths -->
<property name="path.fatjar" location="${dir.dist}/${title}_${version}.jar" /> <property name="path.fatjar" location="${dir.dist}/${title}_${version}.jar" />
<property name="basedir.cache" location="${basedir}/cache" />
<property name="dir.cache" location="${basedir.cache}/${title}_${version}" />
<property name="basedir.release" location="${basedir}/release" /> <property name="basedir.release" location="${basedir}/release" />
<property name="dir.release" location="${basedir.release}/${title}_${version}" /> <property name="dir.release" location="${basedir.release}/${title}_${version}" />
@ -577,7 +578,7 @@
<copy todir="${dir.dist}/appx/jre"> <copy todir="${dir.dist}/appx/jre">
<tarfileset> <tarfileset>
<gzipresource> <gzipresource>
<file file="${dir.cache}/jre-${jre.major}u${jre.build}-windows-x64.tar.gz" /> <file file="${basedir.cache}/jre-${jre.major}u${jre.build}-windows-x64.tar.gz" />
</gzipresource> </gzipresource>
</tarfileset> </tarfileset>
<cutdirsmapper dirs="1" /> <cutdirsmapper dirs="1" />
@ -721,6 +722,7 @@
<mkdir dir="${dir.build}" /> <mkdir dir="${dir.build}" />
<mkdir dir="${dir.dist}" /> <mkdir dir="${dir.dist}" />
<mkdir dir="${dir.release}" /> <mkdir dir="${dir.release}" />
<mkdir dir="${dir.cache}" />
<path id="lib.classpath"> <path id="lib.classpath">
<fileset dir="${dir.lib}" includes="**/*.jar" excludes="**/*-jdk14.jar" /> <fileset dir="${dir.lib}" includes="**/*.jar" excludes="**/*-jdk14.jar" />
@ -749,12 +751,12 @@
</fileset> </fileset>
</copy> </copy>
<checksum algorithm="SHA-256" pattern="{0} {1}" todir="${dir.cache}/sha/${title}_${version}"> <checksum algorithm="SHA-256" pattern="{0} {1}" todir="${dir.cache}" fileext=".sha256">
<fileset dir="${dir.release}" /> <fileset dir="${dir.release}" />
</checksum> </checksum>
<concat destfile="${dir.release}/README.md" overwrite="true" eol="unix" outputencoding="UTF-8"> <concat destfile="${dir.release}/README.md" overwrite="true" eol="unix" outputencoding="UTF-8">
<fileset file="${dir.installer}/ant/digest.header.md" /> <fileset file="${dir.installer}/ant/digest.header.md" />
<fileset dir="${dir.cache}/sha/${title}_${version}" /> <fileset dir="${dir.cache}" includes="*.sha256" />
<fileset file="${dir.installer}/ant/digest.footer.md" /> <fileset file="${dir.installer}/ant/digest.footer.md" />
</concat> </concat>
</target> </target>
@ -814,7 +816,7 @@
<scp todir="${deploy.website}" trust="yes" verbose="true" sftp="true" keyfile="${deploy.keyfile}"> <scp todir="${deploy.website}" trust="yes" verbose="true" sftp="true" keyfile="${deploy.keyfile}">
<fileset dir="${dir.dist}/website"> <fileset dir="${dir.dist}/website">
<modified> <modified>
<param name="cache.cachefile" value="${dir.cache}/scp.cache" /> <param name="cache.cachefile" value="${basedir.cache}/scp.cache" />
</modified> </modified>
</fileset> </fileset>
</scp> </scp>
@ -881,7 +883,7 @@
<include name="data/*.txt" /> <include name="data/*.txt" />
<include name="data/*.xz" /> <include name="data/*.xz" />
<modified> <modified>
<param name="cache.cachefile" value="${dir.cache}/scp.cache" /> <param name="cache.cachefile" value="${basedir.cache}/scp.cache" />
</modified> </modified>
</fileset> </fileset>
</scp> </scp>
@ -898,6 +900,7 @@
<input addproperty="mark" message="Mark:" /> <input addproperty="mark" message="Mark:" />
<antcall target="deploy-release"> <antcall target="deploy-release">
<param name="dir.release" location="${basedir.release}/HEAD/${title}_${version}_${mark}" /> <param name="dir.release" location="${basedir.release}/HEAD/${title}_${version}_${mark}" />
<param name="dir.cache" location="${basedir.cache}/HEAD/${title}_${version}_${mark}" />
</antcall> </antcall>
</target> </target>