diff options
Diffstat (limited to 'make/build-newt.xml')
| -rw-r--r-- | make/build-newt.xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index c6d67b85c..8bbfde2ae 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -520,24 +520,13 @@ </antcall> <antcall target="c.manifest" inheritRefs="true" /> - <!-- Create the Java Web Start jar file for the built native code --> - <jar destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true"> - <fileset dir="${obj.newt}"> - <include name="*.${native.library.suffix}" /> - </fileset> - </jar> - <jar destfile="${build.newt}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true"> - <fileset dir="${obj.newt}"> - <include name="*.${native.library.suffix-cdc}" /> - </fileset> - </jar> </target> <!-- ================================================================== --> <!-- - Build the newt.jar files. --> - <target name="jar" depends="java.compile,build-jars-javase,build-jars-cdc"/> + <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" /> <target name="setup-manifestfile"> <condition property="manifestfile" value="newtRIversion"> @@ -678,6 +667,11 @@ <fileset dir="${classes}" includes="${java.part.core}"/> </jar> + <jar manifest="tempversion" destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true"> + <fileset dir="${obj.newt}"> + <include name="*.${native.library.suffix}" /> + </fileset> + </jar> <delete file="tempversion"/> </target> @@ -686,6 +680,12 @@ <fileset dir="${classes-cdc}" includes="${java.part.core}"/> </jar> + <jar manifest="tempversion-cdc" destfile="${build.newt}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true"> + <fileset dir="${obj.newt}"> + <include name="*.${native.library.suffix-cdc}" /> + </fileset> + </jar> + <delete file="tempversion-cdc"/> </target> <!-- ================================================================== --> @@ -756,7 +756,7 @@ <!-- - Build everything. --> - <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,jar,c.build.newt,generate.version.txt" /> + <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,java.compile,c.build.newt,build-jars,generate.version.txt" /> <target name="generate.version.txt" depends="init"> <!-- Create a version.txt file indicating which version we just built --> |