commit 78c62497eb63aeba510bcf99d687c1840950bd8d Author: iwakeh <iwakeh@torproject.org> Date: Wed Jan 4 17:45:34 2017 +0100 squash! squash! Corrected source-jar contents, enabled additonal target execution before signing using a new property, and cleaned up jar-task. Corrected path for javadoc-jar. Add Main-Class attribute only to executable jar. --- java/base.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/java/base.xml b/java/base.xml index c11dd74..feba6b0 100644 --- a/java/base.xml +++ b/java/base.xml @@ -230,11 +230,6 @@ <manifest file="${manifestattributes}" > <attribute name="Main-Class" value="${project-main-class}" /> </manifest> - <condition property="manifestfile" - value="${manifestattributes}" - else="${emptymanifest}" > - <isset property="project-main-class"/> - </condition> <condition property="jarpattern" value="${jarpatternprop}" else="runtime" > @@ -248,7 +243,6 @@ <param name="uselibpath" value="${libs}" /> <param name="uselibpattern" value="${jarpattern}" /> </antcall> - <property name="manifestfile" value="${emptymanifest}" /> <antcall target="jarring" > <param name="destfile" value="${dist}/${jarsourcesfile}" /> <param name="usebase" value="${testsources}" /> @@ -268,6 +262,14 @@ </target> <target name="jarring" > + <condition property="manifestfile" + value="${manifestattributes}" + else="${emptymanifest}" > + <and> + <equals arg1="${destfile}" arg2="${dist}/${jarfile}" /> + <isset property="project-main-class"/> + </and> + </condition> <jar destfile="${destfile}" basedir="${usebase}" manifest="${manifestfile}" >