diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/make/build.xml b/make/build.xml index 9e42234f7..50a0cfc28 100644 --- a/make/build.xml +++ b/make/build.xml @@ -166,24 +166,10 @@ <exclude name="*jogl_cg.${native.library.suffix}" /> </fileset> </jar> - <jar manifest="${build}/manifest-all.mf" destfile="${jar}/jogl-all-noawt-natives-${os.and.arch}.jar" filesonly="true"> - <fileset dir="${lib}"> - <include name="*.${native.library.suffix}" /> - <exclude name="*jogl_cg.${native.library.suffix}" /> - </fileset> - </jar> - <jar manifest="${build}/manifest-all.mf" destfile="${jar}/jogl-all-mobile-natives-${os.and.arch}.jar" filesonly="true"> - <fileset dir="${lib}"> - <include name="*.${native.library.suffix}" /> - <exclude name="*jogl_cg.${native.library.suffix}" /> - </fileset> - </jar> - <jar manifest="${build}/manifest-all.mf" destfile="${jar}/jogl-all-android-natives-${os.and.arch}.jar" filesonly="true"> - <fileset dir="${lib}"> - <include name="*.${native.library.suffix}" /> - <exclude name="*jogl_cg.${native.library.suffix}" /> - </fileset> - </jar> + <!-- Produce duplicates for diff 'all' configuration, since non-native-jar aliasing (Bug 1023/Bug 1024) --> + <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-noawt-natives-${os.and.arch}.jar" /> + <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-mobile-natives-${os.and.arch}.jar" /> + <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-android-natives-${os.and.arch}.jar" /> </target> <target name="android.package.jogl.skip.check" depends="init,gluegen.cpptasks.detect.os"> @@ -265,12 +251,18 @@ <!--delete includeEmptyDirs="true" quiet="true" failonerror="false"> <fileset dir="${build}" includes="jogl-java-src.zip" /> </delete--> + <mkdir dir="${build}/oculusvr/gensrc/classes"/> <!-- just in case it was _not_ build --> <zip destfile="${build}/jogl-java-src.zip" level="0"> <fileset dir="${src}/nativewindow/classes"/> <fileset dir="${build}/nativewindow/gensrc/classes"/> <fileset dir="${src}/jogl/classes"/> <fileset dir="${build}/jogl/gensrc/classes"/> <fileset dir="${src}/newt/classes"/> + <fileset dir="${src}/oculusvr/classes"/> + <fileset dir="${build}/oculusvr/gensrc/classes"/> + </zip> + <zip destfile="${build}/jogl-test-java-src.zip" level="0"> + <fileset dir="${src}/test"/> </zip> </target> @@ -312,6 +304,7 @@ <copy todir="${archive}"> <fileset dir="${build}"> <include name="jogl-java-src.zip"/> + <include name="jogl-test-java-src.zip"/> </fileset> </copy> <archive.7z destfile="${build}/${archive.name}.7z" @@ -397,7 +390,7 @@ <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" /> <property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" /> - <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames}, ${javadoc.spec.packagenames}, com.jogamp.opengl.*, com.jogamp.nativewindow.*, com.jogamp.newt.*" /> + <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames}, ${javadoc.spec.packagenames}, com.jogamp.opengl.*, com.jogamp.nativewindow.*, com.jogamp.newt.* com.jogamp.oculusvr.*" /> <property name="javadoc.dev.packagenames" value="${javadoc.packagenames}, com.jogamp.opengl.*, com.jogamp.nativewindow.*, com.jogamp.newt.*, com.jogamp.gluegen.opengl.*, com.jogamp.gluegen.runtime.opengl.*, jogamp.nativewindow.*, jogamp.opengl.*, jogamp.newt.*" /> |