diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/make/build.xml b/make/build.xml index 0df5cf6..534f122 100644 --- a/make/build.xml +++ b/make/build.xml @@ -484,11 +484,12 @@ <antcall target="c.manifest" inheritRefs="true" /> - <jar destfile="${build}/gluegen-rt-natives-${os.and.arch}.jar" manifest="${build}/Manifest-rt-natives.temp"> - <fileset dir="${build}/obj"> - <include name="*gluegen-rt.${native.library.suffix}" /> - </fileset> - </jar> + <native.tag.jar objdir="${build}/obj" + nativejarfile="${build}/gluegen-rt-natives-${os.and.arch}.jar" + manifestfile="${build}/Manifest-rt-natives.temp" + module="common" + includelibs="*gluegen-rt.${native.library.suffix}" /> + <!-- Produce duplicates for different configurations, since non-native-jar aliasing (Bug 1023/Bug 1024) --> <copy file="${build}/gluegen-rt-natives-${os.and.arch}.jar" tofile="${build}/gluegen-rt-android-natives-${os.and.arch}.jar"/> </target> @@ -752,7 +753,7 @@ </copy> <!-- Build gluegen.jar. --> - <jar destfile="${build}/gluegen.jar" manifest="${build}/Manifest.temp"> + <jar destfile="${build}/gluegen.jar" manifest="${build}/Manifest.temp" filesonly="true"> <service type="javax.annotation.processing.Processor"> <provider classname="com.jogamp.gluegen.structgen.CStructAnnotationProcessor"/> </service> @@ -805,7 +806,7 @@ </copy> <!-- Build gluegen-rt.jar. --> - <jar destfile="${build}/gluegen-rt.jar" manifest="${build}/Manifest-rt.temp"> + <jar destfile="${build}/gluegen-rt.jar" manifest="${build}/Manifest-rt.temp" filesonly="true"> <fileset dir="${classes}"> <include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/common/**" /> @@ -880,7 +881,7 @@ </copy> <!-- Build gluegen-rt-android.jar. --> - <jar destfile="${build}/gluegen-rt-android.jar" manifest="${build}/Manifest-rt-android.temp"> + <jar destfile="${build}/gluegen-rt-android.jar" manifest="${build}/Manifest-rt-android.temp" filesonly="true"> <fileset dir="${classes}"> <include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/common/**" /> @@ -938,7 +939,7 @@ </filterset> </copy> - <jar destfile="${build}/jogamp-android-launcher.jar" manifest="${build}/Manifest-android-launcher.temp"> + <jar destfile="${build}/jogamp-android-launcher.jar" manifest="${build}/Manifest-android-launcher.temp" filesonly="true"> <fileset dir="${classes}"> <include name="${jogamp-android-launcher.classes}" /> </fileset> |