Skip to content

Commit 426e4d8

Browse files
committed
Introduce scijava.platform.arch property
And get rid of scijava.platform.bits, which is rather useless. This property defaults to the same value as os.arch, except that it tries to unify synonyms, according to the native-lib-loader scheme. Notably, this scheme collapses x86 32-bit and x86 64-bit platforms to simply "32" and "64" respectively. While I'm not convinced that the native-lib-loader scheme is a *good* scheme, it is what we are using in practice, at least for projects such as flimlib:flimlib. Closes #30.
1 parent d449ea1 commit 426e4d8

File tree

1 file changed

+47
-13
lines changed

1 file changed

+47
-13
lines changed

pom.xml

Lines changed: 47 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@
220220
Classifier name for referencing platform-specific artifacts.
221221
By default, this matches the scijava/native-lib-loader naming scheme.
222222
-->
223-
<scijava.natives.classifier>natives-${scijava.platform.family.medium}_${scijava.platform.bits}</scijava.natives.classifier>
223+
<scijava.platform.arch>${os.arch}</scijava.platform.arch>
224+
<scijava.natives.classifier>natives-${scijava.platform.family.medium}_${scijava.platform.arch}</scijava.natives.classifier>
224225

225226
<!--
226227
NB: The javadoc.runtimeAccessPackages property allows downstream
@@ -2070,47 +2071,80 @@
20702071
</profile>
20712072

20722073
<profile>
2073-
<id>scijava-platform-amd64</id>
2074+
<id>scijava-platform-x86</id>
20742075
<activation>
20752076
<os>
2076-
<arch>amd64</arch>
2077+
<arch>x86</arch>
20772078
</os>
20782079
</activation>
20792080
<properties>
2080-
<scijava.platform.bits>64</scijava.platform.bits>
2081+
<scijava.platform.arch>32</scijava.platform.arch>
20812082
</properties>
20822083
</profile>
20832084
<profile>
2084-
<id>scijava-platform-arm64</id>
2085+
<id>scijava-platform-i386</id>
20852086
<activation>
20862087
<os>
2087-
<arch>arm64</arch>
2088+
<arch>i386</arch>
20882089
</os>
20892090
</activation>
20902091
<properties>
2091-
<scijava.platform.bits>64</scijava.platform.bits>
2092+
<scijava.platform.arch>32</scijava.platform.arch>
20922093
</properties>
20932094
</profile>
20942095
<profile>
2095-
<id>scijava-platform-x86_64</id>
2096+
<id>scijava-platform-i486</id>
20962097
<activation>
20972098
<os>
2098-
<arch>x86_64</arch>
2099+
<arch>i486</arch>
20992100
</os>
21002101
</activation>
21012102
<properties>
2102-
<scijava.platform.bits>64</scijava.platform.bits>
2103+
<scijava.platform.arch>32</scijava.platform.arch>
21032104
</properties>
21042105
</profile>
21052106
<profile>
2106-
<id>scijava-platform-x86</id>
2107+
<id>scijava-platform-i586</id>
21072108
<activation>
21082109
<os>
2109-
<arch>x86</arch>
2110+
<arch>i586</arch>
2111+
</os>
2112+
</activation>
2113+
<properties>
2114+
<scijava.platform.arch>32</scijava.platform.arch>
2115+
</properties>
2116+
</profile>
2117+
<profile>
2118+
<id>scijava-platform-i686</id>
2119+
<activation>
2120+
<os>
2121+
<arch>i686</arch>
2122+
</os>
2123+
</activation>
2124+
<properties>
2125+
<scijava.platform.arch>32</scijava.platform.arch>
2126+
</properties>
2127+
</profile>
2128+
<profile>
2129+
<id>scijava-platform-amd64</id>
2130+
<activation>
2131+
<os>
2132+
<arch>amd64</arch>
2133+
</os>
2134+
</activation>
2135+
<properties>
2136+
<scijava.platform.arch>64</scijava.platform.arch>
2137+
</properties>
2138+
</profile>
2139+
<profile>
2140+
<id>scijava-platform-x86_64</id>
2141+
<activation>
2142+
<os>
2143+
<arch>x86_64</arch>
21102144
</os>
21112145
</activation>
21122146
<properties>
2113-
<scijava.platform.bits>32</scijava.platform.bits>
2147+
<scijava.platform.arch>64</scijava.platform.arch>
21142148
</properties>
21152149
</profile>
21162150
<profile>

0 commit comments

Comments
 (0)