Skip to content

Commit 804fa67

Browse files
committed
Add properties for more platform naming schemes
Specifically: we add properties for: * jogamp style - used by e.g. org.jogamp.jogl:jogl * javacpp style - used by e.g. com.bytedeco:ffmpeg
1 parent 32ed0b7 commit 804fa67

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

pom.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,14 @@
222222
<!--
223223
Classifier name for referencing platform-specific artifacts.
224224
By default, this matches the scijava/native-lib-loader naming scheme.
225+
But properties are also defined for other popular naming schemes.
225226
-->
226227
<scijava.platform.arch>${os.arch}</scijava.platform.arch>
228+
<scijava.platform.arch.javacpp>${os.arch}</scijava.platform.arch.javacpp>
229+
<scijava.platform.arch.jogamp>${os.arch}</scijava.platform.arch.jogamp>
227230
<scijava.natives.classifier>natives-${scijava.platform.family.medium}_${scijava.platform.arch}</scijava.natives.classifier>
231+
<scijava.natives.classifier.javacpp>natives-${scijava.platform.family.longest}-${scijava.platform.arch.javacpp}</scijava.natives.classifier.javacpp>
232+
<scijava.natives.classifier.jogamp>natives-${scijava.platform.family.longest}-${scijava.platform.arch.jogamp}</scijava.natives.classifier.jogamp>
228233

229234
<!--
230235
NB: The javadoc.runtimeAccessPackages property allows downstream
@@ -2098,6 +2103,8 @@
20982103
</activation>
20992104
<properties>
21002105
<scijava.platform.arch>32</scijava.platform.arch>
2106+
<scijava.platform.arch.javacpp>x86</scijava.platform.arch.javacpp>
2107+
<scijava.platform.arch.jogamp>i586</scijava.platform.arch.jogamp>
21012108
</properties>
21022109
</profile>
21032110
<profile>
@@ -2109,6 +2116,8 @@
21092116
</activation>
21102117
<properties>
21112118
<scijava.platform.arch>32</scijava.platform.arch>
2119+
<scijava.platform.arch.javacpp>x86</scijava.platform.arch.javacpp>
2120+
<scijava.platform.arch.jogamp>i586</scijava.platform.arch.jogamp>
21122121
</properties>
21132122
</profile>
21142123
<profile>
@@ -2120,6 +2129,8 @@
21202129
</activation>
21212130
<properties>
21222131
<scijava.platform.arch>32</scijava.platform.arch>
2132+
<scijava.platform.arch.javacpp>x86</scijava.platform.arch.javacpp>
2133+
<scijava.platform.arch.jogamp>i586</scijava.platform.arch.jogamp>
21232134
</properties>
21242135
</profile>
21252136
<profile>
@@ -2131,6 +2142,8 @@
21312142
</activation>
21322143
<properties>
21332144
<scijava.platform.arch>32</scijava.platform.arch>
2145+
<scijava.platform.arch.javacpp>x86</scijava.platform.arch.javacpp>
2146+
<scijava.platform.arch.jogamp>i586</scijava.platform.arch.jogamp>
21342147
</properties>
21352148
</profile>
21362149
<profile>
@@ -2142,6 +2155,8 @@
21422155
</activation>
21432156
<properties>
21442157
<scijava.platform.arch>32</scijava.platform.arch>
2158+
<scijava.platform.arch.javacpp>x86</scijava.platform.arch.javacpp>
2159+
<scijava.platform.arch.jogamp>i586</scijava.platform.arch.jogamp>
21452160
</properties>
21462161
</profile>
21472162
<profile>
@@ -2153,6 +2168,8 @@
21532168
</activation>
21542169
<properties>
21552170
<scijava.platform.arch>64</scijava.platform.arch>
2171+
<scijava.platform.arch.javacpp>x86_64</scijava.platform.arch.javacpp>
2172+
<scijava.platform.arch.jogamp>amd64</scijava.platform.arch.jogamp>
21562173
</properties>
21572174
</profile>
21582175
<profile>
@@ -2164,6 +2181,8 @@
21642181
</activation>
21652182
<properties>
21662183
<scijava.platform.arch>64</scijava.platform.arch>
2184+
<scijava.platform.arch.javacpp>x86_64</scijava.platform.arch.javacpp>
2185+
<scijava.platform.arch.jogamp>amd64</scijava.platform.arch.jogamp>
21672186
</properties>
21682187
</profile>
21692188
<profile>
@@ -2192,6 +2211,7 @@
21922211
<scijava.platform.family.medium>osx</scijava.platform.family.medium>
21932212
<scijava.platform.family.long>macos</scijava.platform.family.long>
21942213
<scijava.platform.family.longest>macosx</scijava.platform.family.longest>
2214+
<scijava.platform.arch.jogamp>universal</scijava.platform.arch.jogamp>
21952215
</properties>
21962216
</profile>
21972217
<profile>

0 commit comments

Comments
 (0)