Skip to content

Commit afa7c60

Browse files
ctruedenctrueden
committed
Improve management of JogAmp project components
It is now consistent with JavaCPP, with dedicated native classifier properties. And we now manage all non-mobile-platform component options.
1 parent 4268ae5 commit afa7c60

1 file changed

Lines changed: 119 additions & 11 deletions

File tree

‎pom.xml‎

Lines changed: 119 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,16 +1768,41 @@
17681768
<jocl.version>2.0.4</jocl.version>
17691769
<org.jocl.jocl.version>${jocl.version}</org.jocl.jocl.version>
17701770

1771-
<!-- JOGL - https://jogamp.org/jogl/ -->
1772-
<jogl.version>2.3.2</jogl.version>
1773-
<gluegen-rt-main.version>${jogl.version}</gluegen-rt-main.version>
1774-
<joal-main.version>${jogl.version}</joal-main.version>
1775-
<jocl-main.version>${jogl.version}</jocl-main.version>
1776-
<jogl-all-main.version>${jogl.version}</jogl-all-main.version>
1777-
<org.jogamp.gluegen.gluegen-rt-main.version>${gluegen-rt-main.version}</org.jogamp.gluegen.gluegen-rt-main.version>
1778-
<org.jogamp.joal.joal-main.version>${joal-main.version}</org.jogamp.joal.joal-main.version>
1779-
<org.jogamp.jocl.jocl-main.version>${jocl-main.version}</org.jogamp.jocl.jocl-main.version>
1780-
<org.jogamp.jogl.jogl-all-main.version>${jogl-all-main.version}</org.jogamp.jogl.jogl-all-main.version>
1771+
<!-- JogAmp - https://jogamp.org/ -->
1772+
1773+
<jogamp.version>2.3.2</jogamp.version>
1774+
1775+
<gluegen.version>${jogamp.version}</gluegen.version>
1776+
<gluegen-rt.version>${jogamp.version}</gluegen-rt.version>
1777+
<gluegen-rt-main.version>${jogamp.version}</gluegen-rt-main.version>
1778+
<joal.version>${jogamp.version}</joal.version>
1779+
<joal-main.version>${jogamp.version}</joal-main.version>
1780+
<!--<jocl.version>${jogamp.version}</jocl.version>--> <!-- NB: Avoid short name clash with org.jocl:jocl. -->
1781+
<jocl-main.version>${jogamp.version}</jocl-main.version>
1782+
<jogl.version>${jogamp.version}</jogl.version>
1783+
<jogl-main.version>${jogamp.version}</jogl-main.version>
1784+
<jogl-all.version>${jogamp.version}</jogl-all.version>
1785+
<jogl-all-main.version>${jogamp.version}</jogl-all-main.version>
1786+
<jogl-all-noawt.version>${jogamp.version}</jogl-all-noawt.version>
1787+
<jogl-all-noawt-main.version>${jogamp.version}</jogl-all-noawt-main.version>
1788+
<org.jogamp.gluegen.gluegen.version>${jogamp.version}</org.jogamp.gluegen.gluegen.version>
1789+
<org.jogamp.gluegen.gluegen-rt.version>${jogamp.version}</org.jogamp.gluegen.gluegen-rt.version>
1790+
<org.jogamp.gluegen.gluegen-rt-main.version>${jogamp.version}</org.jogamp.gluegen.gluegen-rt-main.version>
1791+
<org.jogamp.joal.joal.version>${jogamp.version}</org.jogamp.joal.joal.version>
1792+
<org.jogamp.joal.joal-main.version>${jogamp.version}</org.jogamp.joal.joal-main.version>
1793+
<org.jogamp.jocl.jocl.version>${jogamp.version}</org.jogamp.jocl.jocl.version>
1794+
<org.jogamp.jocl.jocl-main.version>${jogamp.version}</org.jogamp.jocl.jocl-main.version>
1795+
<org.jogamp.jogl.jogl.version>${jogamp.version}</org.jogamp.jogl.jogl.version>
1796+
<org.jogamp.jogl.jogl-main.version>${jogamp.version}</org.jogamp.jogl.jogl-main.version>
1797+
<org.jogamp.jogl.jogl-all.version>${jogamp.version}</org.jogamp.jogl.jogl-all.version>
1798+
<org.jogamp.jogl.jogl-all-main.version>${jogamp.version}</org.jogamp.jogl.jogl-all-main.version>
1799+
<org.jogamp.jogl.jogl-all-noawt.version>${jogamp.version}</org.jogamp.jogl.jogl-all-noawt.version>
1800+
<org.jogamp.jogl.jogl-all-noawt-main.version>${jogamp.version}</org.jogamp.jogl.jogl-all-noawt-main.version>
1801+
1802+
<scijava.natives.classifier.gluegen>${scijava.natives.classifier.jogamp}</scijava.natives.classifier.gluegen>
1803+
<scijava.natives.classifier.joal>${scijava.natives.classifier.jogamp}</scijava.natives.classifier.joal>
1804+
<scijava.natives.classifier.jocl>${scijava.natives.classifier.jogamp}</scijava.natives.classifier.jocl>
1805+
<scijava.natives.classifier.jogl>${scijava.natives.classifier.jogamp}</scijava.natives.classifier.jogl>
17811806

17821807
<!-- JOML - https://joml-ci.github.io/JOML/ -->
17831808
<joml.version>1.10.2</joml.version>
@@ -4826,27 +4851,110 @@
48264851
<version>${org.jocl.jocl.version}</version>
48274852
</dependency>
48284853

4829-
<!-- JOGL - https://jogamp.org/jogl/ -->
4854+
<!-- JogAmp - https://jogamp.org/ -->
4855+
4856+
<dependency>
4857+
<groupId>org.jogamp.gluegen</groupId>
4858+
<artifactId>gluegen</artifactId>
4859+
<version>${org.jogamp.gluegen.gluegen.version}</version>
4860+
</dependency>
4861+
<dependency>
4862+
<groupId>org.jogamp.gluegen</groupId>
4863+
<artifactId>gluegen-rt</artifactId>
4864+
<version>${org.jogamp.gluegen.gluegen-rt.version}</version>
4865+
</dependency>
48304866
<dependency>
48314867
<groupId>org.jogamp.gluegen</groupId>
48324868
<artifactId>gluegen-rt-main</artifactId>
48334869
<version>${org.jogamp.gluegen.gluegen-rt-main.version}</version>
48344870
</dependency>
4871+
<dependency>
4872+
<groupId>org.jogamp.joal</groupId>
4873+
<artifactId>joal</artifactId>
4874+
<version>${org.jogamp.joal.joal.version}</version>
4875+
</dependency>
48354876
<dependency>
48364877
<groupId>org.jogamp.joal</groupId>
48374878
<artifactId>joal-main</artifactId>
48384879
<version>${org.jogamp.joal.joal-main.version}</version>
48394880
</dependency>
4881+
<dependency>
4882+
<groupId>org.jogamp.jocl</groupId>
4883+
<artifactId>jocl</artifactId>
4884+
<version>${org.jogamp.jocl.jocl.version}</version>
4885+
</dependency>
48404886
<dependency>
48414887
<groupId>org.jogamp.jocl</groupId>
48424888
<artifactId>jocl-main</artifactId>
48434889
<version>${org.jogamp.jocl.jocl-main.version}</version>
48444890
</dependency>
4891+
<dependency>
4892+
<groupId>org.jogamp.jogl</groupId>
4893+
<artifactId>jogl</artifactId>
4894+
<version>${org.jogamp.jogl.jogl.version}</version>
4895+
</dependency>
4896+
<dependency>
4897+
<groupId>org.jogamp.jogl</groupId>
4898+
<artifactId>jogl-main</artifactId>
4899+
<version>${org.jogamp.jogl.jogl-main.version}</version>
4900+
</dependency>
4901+
<dependency>
4902+
<groupId>org.jogamp.jogl</groupId>
4903+
<artifactId>jogl-all</artifactId>
4904+
<version>${org.jogamp.jogl.jogl-all.version}</version>
4905+
</dependency>
48454906
<dependency>
48464907
<groupId>org.jogamp.jogl</groupId>
48474908
<artifactId>jogl-all-main</artifactId>
48484909
<version>${org.jogamp.jogl.jogl-all-main.version}</version>
48494910
</dependency>
4911+
<dependency>
4912+
<groupId>org.jogamp.jogl</groupId>
4913+
<artifactId>jogl-all-noawt</artifactId>
4914+
<version>${org.jogamp.jogl.jogl-all-noawt.version}</version>
4915+
</dependency>
4916+
<dependency>
4917+
<groupId>org.jogamp.jogl</groupId>
4918+
<artifactId>jogl-all-noawt-main</artifactId>
4919+
<version>${org.jogamp.jogl.jogl-all-noawt-main.version}</version>
4920+
</dependency>
4921+
4922+
<dependency>
4923+
<groupId>org.jogamp.gluegen</groupId>
4924+
<artifactId>gluegen-rt</artifactId>
4925+
<version>${org.jogamp.gluegen.gluegen-rt.version}</version>
4926+
<classifier>${scijava.natives.classifier.gluegen}</classifier>
4927+
</dependency>
4928+
<dependency>
4929+
<groupId>org.jogamp.joal</groupId>
4930+
<artifactId>joal</artifactId>
4931+
<version>${org.jogamp.joal.joal.version}</version>
4932+
<classifier>${scijava.natives.classifier.joal}</classifier>
4933+
</dependency>
4934+
<dependency>
4935+
<groupId>org.jogamp.jocl</groupId>
4936+
<artifactId>jocl</artifactId>
4937+
<version>${org.jogamp.jocl.jocl.version}</version>
4938+
<classifier>${scijava.natives.classifier.jocl}</classifier>
4939+
</dependency>
4940+
<dependency>
4941+
<groupId>org.jogamp.jogl</groupId>
4942+
<artifactId>jogl</artifactId>
4943+
<version>${org.jogamp.jogl.jogl.version}</version>
4944+
<classifier>${scijava.natives.classifier.jogl}</classifier>
4945+
</dependency>
4946+
<dependency>
4947+
<groupId>org.jogamp.jogl</groupId>
4948+
<artifactId>jogl-all</artifactId>
4949+
<version>${org.jogamp.jogl.jogl-all.version}</version>
4950+
<classifier>${scijava.natives.classifier.jogl}</classifier>
4951+
</dependency>
4952+
<dependency>
4953+
<groupId>org.jogamp.jogl</groupId>
4954+
<artifactId>jogl-all-noawt</artifactId>
4955+
<version>${org.jogamp.jogl.jogl-all-noawt.version}</version>
4956+
<classifier>${scijava.natives.classifier.jogl}</classifier>
4957+
</dependency>
48504958

48514959
<!-- JOML - http://joml-ci.github.io/JOML/ -->
48524960
<dependency>

0 commit comments

Comments
 (0)