diff options
| author | Xerxes Rånby <[email protected]> | 2012-08-22 11:35:35 +0200 |
|---|---|---|
| committer | Xerxes Rånby <[email protected]> | 2012-08-22 11:35:35 +0200 |
| commit | 71b204eb577bc6e5e9fb6cf29c5f76e52a6c9726 (patch) | |
| tree | 23db5da8b19f1c811ce5c5c91e4d6cb88e7276d2 /jnlp-files | |
| parent | 4abaf513bcc91a2d4b3ec4842c532807cbe66167 (diff) | |
JNLP: Cache jogl-all-natives and jogl-cg-natives for linux-armv6 and linux-armv6hf.
Gluegen commit gluegen/commit/422d7a5eb53fca6642ebf4e8910d8b0311bb2597
Change/Lower ARM Requierements for GNU/Linux
changed the *native-linux-arm* jar names; update jnlp-files accordingly.
Due to the lack of OS Arch and ABI detection in JNLP launchers
force us download both armv6 armel and armv6hf armhf ABI jars on ARM.
Diffstat (limited to 'jnlp-files')
| -rw-r--r-- | jnlp-files/jogl-all-awt-cg.jnlp | 12 | ||||
| -rw-r--r-- | jnlp-files/jogl-all-awt.jnlp | 6 | ||||
| -rw-r--r-- | jnlp-files/jogl-all-mobile.jnlp | 6 | ||||
| -rw-r--r-- | jnlp-files/jogl-all-noawt.jnlp | 6 |
4 files changed, 20 insertions, 10 deletions
diff --git a/jnlp-files/jogl-all-awt-cg.jnlp b/jnlp-files/jogl-all-awt-cg.jnlp index 24c22c290..ab4c1cd64 100644 --- a/jnlp-files/jogl-all-awt-cg.jnlp +++ b/jnlp-files/jogl-all-awt-cg.jnlp @@ -69,12 +69,16 @@ <nativelib href = "jar/atomic/jogl-cg-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> - <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> - <nativelib href = "jar/atomic/jogl-cg-natives-linux-armv7.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6hf.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-linux-armv6.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-linux-armv6hf.jar" /> </resources> <resources os="Linux" arch="armv7"> - <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> - <nativelib href = "jar/atomic/jogl-cg-natives-linux-armv7.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6hf.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-linux-armv6.jar" /> + <nativelib href = "jar/atomic/jogl-cg-natives-linux-armv6hf.jar" /> </resources> <resources os="Mac OS X" arch="i386"> <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" /> diff --git a/jnlp-files/jogl-all-awt.jnlp b/jnlp-files/jogl-all-awt.jnlp index 4e05f8dac..a666eb4dd 100644 --- a/jnlp-files/jogl-all-awt.jnlp +++ b/jnlp-files/jogl-all-awt.jnlp @@ -56,10 +56,12 @@ <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> - <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6hf.jar" /> </resources> <resources os="Linux" arch="armv7"> - <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6hf.jar" /> </resources> <resources os="Mac OS X" arch="i386"> <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" /> diff --git a/jnlp-files/jogl-all-mobile.jnlp b/jnlp-files/jogl-all-mobile.jnlp index 43b9b3b09..710f74ab4 100644 --- a/jnlp-files/jogl-all-mobile.jnlp +++ b/jnlp-files/jogl-all-mobile.jnlp @@ -56,10 +56,12 @@ <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> - <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6hf.jar" /> </resources> <resources os="Linux" arch="armv7"> - <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6hf.jar" /> </resources> <resources os="Mac OS X" arch="i386"> <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" /> diff --git a/jnlp-files/jogl-all-noawt.jnlp b/jnlp-files/jogl-all-noawt.jnlp index eed6749c1..802b9b929 100644 --- a/jnlp-files/jogl-all-noawt.jnlp +++ b/jnlp-files/jogl-all-noawt.jnlp @@ -56,10 +56,12 @@ <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> - <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6hf.jar" /> </resources> <resources os="Linux" arch="armv7"> - <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6hf.jar" /> </resources> <resources os="Mac OS X" arch="i386"> <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" /> |