summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-jogl.xml35
-rw-r--r--make/build-nativewindow.xml22
-rw-r--r--make/build-newt.xml22
-rw-r--r--make/build-oculusvr.xml22
-rw-r--r--make/build.xml24
-rw-r--r--make/joglversion-all-natives19
-rw-r--r--make/joglversion-natives19
-rw-r--r--make/nativewindowversion-natives19
-rw-r--r--make/newtversion-natives19
-rw-r--r--make/oculusvrversion-natives19
-rw-r--r--make/scripts/tests.sh4
11 files changed, 190 insertions, 34 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 64e1c4508..4efe992de 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1741,6 +1741,18 @@
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
</copy>
+ <copy file="${manifestfile}-natives"
+ tofile="${build.jogl}/manifest-natives.mf"
+ overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="${jogamp.version}"/>
+ <filter token="BUILD_VERSION" value="${jogl.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
+ <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+ <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
+ </filterset>
+ </copy>
</target>
<target name="build-jars-os-desktop-javase" depends="setup-manifestfile">
@@ -1857,17 +1869,18 @@
<fileset dir="${classes}"
includes="${java.part.nv-cg}"/>
</jar>
- <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true">
- <fileset dir="${obj.jogl}">
- <include name="*.${native.library.suffix}" />
- <exclude name="*jogl_cg.${native.library.suffix}" />
- </fileset>
- </jar>
- <jar manifest="${build.jogl}/manifest.mf" destfile="${build.jogl}/jogl-cg-natives-${os.and.arch}.jar" filesonly="true">
- <fileset dir="${obj.jogl}">
- <include name="*jogl_cg.${native.library.suffix}" />
- </fileset>
- </jar>
+ <native.tag.jar objdir="${obj.jogl}"
+ nativejarfile="${build.jogl}/jogl-natives-${os.and.arch}.jar"
+ manifestfile="${build.jogl}/manifest-natives.mf"
+ module="opengl"
+ includelibs="*.${native.library.suffix}"
+ excludelibs="*jogl_cg.${native.library.suffix}" />
+
+ <native.tag.jar objdir="${obj.jogl}"
+ nativejarfile="${build.jogl}/jogl-cg-natives-${os.and.arch}.jar"
+ manifestfile="${build.jogl}/manifest-natives.mf"
+ module="cg"
+ includelibs="*jogl_cg.${native.library.suffix}" />
</target>
<!-- ================================================================== -->
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 881e322d5..76fc5a287 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -795,6 +795,18 @@
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
</copy>
+ <copy file="${manifestfile}-natives"
+ tofile="${build.nativewindow}/manifest-natives.mf"
+ overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="${jogamp.version}"/>
+ <filter token="BUILD_VERSION" value="${jogl.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
+ <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+ <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
+ </filterset>
+ </copy>
</target>
<target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
@@ -832,11 +844,11 @@
includes="${java.part.core}"
excludes="${java.part.awt} ${java.part.x11} ${java.part.windows}"/>
</jar>
- <jar manifest="${build.nativewindow}/manifest.mf" destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" filesonly="true">
- <fileset dir="${obj.nativewindow}">
- <include name="*.${native.library.suffix}" />
- </fileset>
- </jar>
+ <native.tag.jar objdir="${obj.nativewindow}"
+ nativejarfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar"
+ manifestfile="${build.nativewindow}/manifest-natives.mf"
+ module="nativewindow"
+ includelibs="*.${native.library.suffix}" />
</target>
<!-- ================================================================== -->
diff --git a/make/build-newt.xml b/make/build-newt.xml
index d9d2e6645..4a5997b02 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -745,6 +745,18 @@
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
</copy>
+ <copy file="${manifestfile}-natives"
+ tofile="${build.newt}/manifest-natives.mf"
+ overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="${jogamp.version}"/>
+ <filter token="BUILD_VERSION" value="${jogl.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
+ <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+ <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
+ </filterset>
+ </copy>
</target>
<target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
@@ -829,11 +841,11 @@
</target>
<target name="build-jars-native" depends="gluegen.cpptasks.detect.os,setup-manifestfile">
- <jar manifest="${build.newt}/manifest.mf" destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true">
- <fileset dir="${obj.newt}">
- <include name="*.${native.library.suffix}" />
- </fileset>
- </jar>
+ <native.tag.jar objdir="${obj.newt}"
+ nativejarfile="${build.newt}/newt-natives-${os.and.arch}.jar"
+ manifestfile="${build.newt}/manifest-natives.mf"
+ module="newt"
+ includelibs="*.${native.library.suffix}" />
</target>
<!-- ================================================================== -->
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml
index 22b442328..aa0308365 100644
--- a/make/build-oculusvr.xml
+++ b/make/build-oculusvr.xml
@@ -640,6 +640,18 @@
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
</copy>
+ <copy file="${manifestfile}-natives"
+ tofile="${build.oculusvr}/manifest-natives.mf"
+ overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="${jogamp.version}"/>
+ <filter token="BUILD_VERSION" value="${jogl.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
+ <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+ <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
+ </filterset>
+ </copy>
</target>
<target name="build-jars-javase" depends="setup-manifestfile">
@@ -648,11 +660,11 @@
includes="${java.part.oculusvr} ${java.part.opengl.oculusvr}"
excludes="${java.part.oculusvr.exclude}"/>
</jar>
- <jar manifest="${build.oculusvr}/manifest.mf" destfile="${build.oculusvr}/oculusvr-natives-${os.and.arch}.jar" filesonly="true">
- <fileset dir="${obj.oculusvr}">
- <include name="*oculusvr.${native.library.suffix}" />
- </fileset>
- </jar>
+ <native.tag.jar objdir="${obj.oculusvr}"
+ nativejarfile="${build.oculusvr}/oculusvr-natives-${os.and.arch}.jar"
+ manifestfile="${build.oculusvr}/manifest-natives.mf"
+ module="oculusvr"
+ includelibs="*oculusvr.${native.library.suffix}" />
</target>
<!-- ================================================================== -->
diff --git a/make/build.xml b/make/build.xml
index 50a0cfc28..f572ee5d5 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -115,6 +115,18 @@
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
</copy>
+ <copy file="joglversion-all-natives"
+ tofile="${build}/manifest-all-natives.mf"
+ overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="${jogamp.version}"/>
+ <filter token="BUILD_VERSION" value="${jogl.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
+ <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+ <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
+ </filterset>
+ </copy>
</target>
<target name="one.jar.dir.android" depends="one.jar.dir.prep" if="android-jars.available" unless="one.dir.skip">
@@ -160,12 +172,12 @@
</zips>
</archives>
</jar>
- <jar manifest="${build}/manifest-all.mf" destfile="${jar}/jogl-all-natives-${os.and.arch}.jar" filesonly="true">
- <fileset dir="${lib}">
- <include name="*.${native.library.suffix}" />
- <exclude name="*jogl_cg.${native.library.suffix}" />
- </fileset>
- </jar>
+ <native.tag.jar objdir="${lib}"
+ nativejarfile="${jar}/jogl-all-natives-${os.and.arch}.jar"
+ manifestfile="${build}/manifest-all-natives.mf"
+ module="opengl"
+ includelibs="*.${native.library.suffix}"
+ excludelibs="*jogl_cg.${native.library.suffix}" />
<!-- 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" />
diff --git a/make/joglversion-all-natives b/make/joglversion-all-natives
new file mode 100644
index 000000000..a45262a3f
--- /dev/null
+++ b/make/joglversion-all-natives
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Application-Name: Java Bindings for OpenGL
+Specification-Title: Java Bindings for OpenGL API Specification
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp Community
+Implementation-Title: Java Bindings for OpenGL Runtime Environment
+Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
+Implementation-Vendor: JogAmp Community
+Implementation-URL: http://jogamp.org/
+Extension-Name: jogamp.nativetag.opengl
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
+Permissions: all-permissions
+Application-Library-Allowable-Codebase: *
+@JAR_CODEBASE_TAG@
+
diff --git a/make/joglversion-natives b/make/joglversion-natives
new file mode 100644
index 000000000..a45262a3f
--- /dev/null
+++ b/make/joglversion-natives
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Application-Name: Java Bindings for OpenGL
+Specification-Title: Java Bindings for OpenGL API Specification
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp Community
+Implementation-Title: Java Bindings for OpenGL Runtime Environment
+Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
+Implementation-Vendor: JogAmp Community
+Implementation-URL: http://jogamp.org/
+Extension-Name: jogamp.nativetag.opengl
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
+Permissions: all-permissions
+Application-Library-Allowable-Codebase: *
+@JAR_CODEBASE_TAG@
+
diff --git a/make/nativewindowversion-natives b/make/nativewindowversion-natives
new file mode 100644
index 000000000..ccdfbe197
--- /dev/null
+++ b/make/nativewindowversion-natives
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Application-Name: Native Window Interface
+Specification-Title: Native Window Interface API Specification
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp Community
+Implementation-Title: Native Window Interface Runtime Environment
+Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
+Implementation-Vendor: JogAmp Community
+Implementation-URL: http://jogamp.org/
+Extension-Name: jogamp.nativetag.nativewindow
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
+Permissions: all-permissions
+Application-Library-Allowable-Codebase: *
+@JAR_CODEBASE_TAG@
+
diff --git a/make/newtversion-natives b/make/newtversion-natives
new file mode 100644
index 000000000..c05845114
--- /dev/null
+++ b/make/newtversion-natives
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Application-Name: NEWT
+Specification-Title: NEWT API Specification
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp Community
+Implementation-Title: NEWT Runtime Environment
+Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
+Implementation-Vendor: JogAmp Community
+Implementation-URL: http://jogamp.org/
+Extension-Name: jogamp.nativetag.newt
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
+Permissions: all-permissions
+Application-Library-Allowable-Codebase: *
+@JAR_CODEBASE_TAG@
+
diff --git a/make/oculusvrversion-natives b/make/oculusvrversion-natives
new file mode 100644
index 000000000..25e3c2f64
--- /dev/null
+++ b/make/oculusvrversion-natives
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Application-Name: Java Bindings for OculusVR
+Specification-Title: Java Bindings for OculusVR API Specification
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp Community
+Implementation-Title: Java Bindings for OculusVR Runtime Environment
+Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
+Implementation-Vendor: JogAmp Community
+Implementation-URL: http://jogamp.org/
+Extension-Name: jogamp.nativetag.oculusvr
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
+Permissions: all-permissions
+Application-Library-Allowable-Codebase: *
+@JAR_CODEBASE_TAG@
+
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index ad79a95bc..730c50955 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -382,7 +382,7 @@ function testawtswt() {
#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $*
#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
+testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
#testawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtCanvasAWTDemo $*
#testawt com.jogamp.opengl.test.junit.jogl.awt.ManualHiDPIBufferedImage01AWT $*
@@ -480,7 +480,7 @@ function testawtswt() {
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListNEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListNEWT2 $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES1NEWT $*
-testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT0 $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT0 $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT1 $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT2 $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT3 $*
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 20:52:53 +0000