Skip to content

Commit f41cc66

Browse files
committed
Prevent unnecessary inclusion of other platform jars
1 parent 4b88714 commit f41cc66

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

build.sbt

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,42 +22,39 @@ netLogoClassManager := "org.nlogo.extensions.vid.VidExtension"
2222
netLogoVersion := "7.0.0-2486d1e"
2323
netLogoZipExtras ++= Seq(baseDirectory.value / "README.md")
2424

25-
// settings for the `sbt-javacpp` sbt plugin
26-
javaCppVersion := "1.5.7"
27-
// opencv depends on openblas so get those platform-specific binaries, too
28-
javaCppPresetLibs ++= Seq("opencv" -> "4.5.5", "openblas" -> "0.3.19")
29-
// only include the supported NetLogo platforms
30-
javaCppPlatform := {
25+
// only include the target platform to reduce the size of the final zip (Isaac B 1/8/26)
26+
val javaCppPlatform: String = {
3127
(System.getProperty("os.name"), System.getProperty("os.arch")) match {
3228
case (name, arch) if name.startsWith("Linux") =>
3329
if (arch.contains("x86")) {
34-
Seq("linux-x86")
30+
"linux-x86"
3531
} else {
36-
Seq("linux-x86_64")
32+
"linux-x86_64"
3733
}
3834

3935
case (name, arch) if name.startsWith("Mac") =>
4036
if (arch.contains("aarch64")) {
41-
Seq("macosx-arm64")
37+
"macosx-arm64"
4238
} else {
43-
Seq("macosx-x86_64")
39+
"macosx-x86_64"
4440
}
4541

4642
case (name, arch) if name.startsWith("Windows") =>
4743
if (arch.contains("x86")) {
48-
Seq("windows-x86")
44+
"windows-x86"
4945
} else {
50-
Seq("windows-x86_64")
46+
"windows-x86_64"
5147
}
5248

5349
case _ => throw new Exception("Unknown platform!")
5450
}
5551
}
5652

5753
libraryDependencies ++= Seq(
58-
// only include `javacv` and not `javacv-platform` as we manually specify the native libraries
59-
// throught the `sbt-javacpp` sbt plugin
60-
"org.bytedeco" % "javacv" % "1.5.7"
54+
"org.bytedeco" % "opencv" % "4.5.5-1.5.7" classifier javaCppPlatform
55+
, "org.bytedeco" % "javacpp" % "1.5.7" classifier javaCppPlatform
56+
, "org.bytedeco" % "openblas" % "0.3.19-1.5.7" classifier javaCppPlatform
57+
, "org.bytedeco" % "javacv" % "1.5.7"
6158
, "org.jcodec" % "jcodec" % "0.1.9"
6259
, "org.jcodec" % "jcodec-javase" % "0.1.9"
6360
)

project/plugins.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ resolvers ++= Seq(
55

66
addSbtPlugin("org.nlogo" % "netlogo-extension-plugin" % "7.0.2")
77
addSbtPlugin("org.nlogo" % "netlogo-extension-documentation" % "0.8.3")
8-
addSbtPlugin("org.bytedeco" % "sbt-javacpp" % "1.17")

0 commit comments

Comments
 (0)