Skip to content

Commit

Permalink
replaced the sample scanner hack with a conveyor hack
Browse files Browse the repository at this point in the history
  • Loading branch information
ennerf committed Sep 25, 2023
1 parent 7ab0a11 commit 6d3ab84
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 293 deletions.
15 changes: 11 additions & 4 deletions chartfx-samples/conveyor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ app {
long-fsname = chartfx-sampler
rdns-name = io.fair_acc.${app.fsname}
version = 11.3.0
revision = 1
revision = 0

// Note: true shows console output for debugging
windows.console = false
Expand All @@ -28,9 +28,7 @@ app {
icons = "src/assets/icons/icon-rounded*"
windows.manifests.msix.background-color = "#ffffff"
inputs = [
// The samples.jar overwrites the fxsampler.util.SampleScanner class to work
// with Conveyor, so the jar needs to be renamed to be searched first (alphabetical order)
"target/samples-master-SNAPSHOT.jar" -> aa-samples.jar
"target/samples-master-SNAPSHOT.jar"
"target/lib/*.jar"
]

Expand Down Expand Up @@ -74,6 +72,15 @@ app {
"--add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED"
"--add-opens=javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED"
]

// The FXSampler project only searches for jars/classes in directories
// at or below the working directory. Conveyor packages app contents
// in a sibling directory, so nothing gets found. We can work around
// this by manually setting the working directory. The '&&' token
// is an undocumented token that means "the place where the exe is
// found"
system-properties.user.dir = "&&/../"

}

// Release using GitHub Releases
Expand Down
289 changes: 0 additions & 289 deletions chartfx-samples/src/main/java/fxsampler/util/SampleScanner.java

This file was deleted.

0 comments on commit 6d3ab84

Please sign in to comment.