Skip to content

server build does not need separate flow engine jar #846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-matthewb merged 4 commits into from
Feb 26, 2025
Merged

server build does not need separate flow engine jar #846

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a115484
server build does not need flow engine
labkey-matthewb Feb 25, 2025
b77be6e
include flow engine directly in flow module jar
labkey-matthewb Feb 25, 2025
dccedeb
Update flow/build.gradle
labkey-matthewb Feb 26, 2025
92d37f7
new dir for standalone lib
labkey-matthewb Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions flow/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ plugins {
}

sourceSets {
main {
java {
srcDirs = ['./src', './enginesrc', "${BuildUtils.getBuildDirPath(project)}/xb"]
}
}
engine {
java {
srcDirs = ['./enginesrc', "${BuildUtils.getBuildDirPath(project)}/xb"]
Expand Down Expand Up @@ -35,10 +40,9 @@ project.tasks.register("engineJar", Jar) {
jar.archiveClassifier.set("engine")
jar.from project.sourceSets.engine.output
jar.archiveBaseName.set("${project.name}_engine")
jar.destinationDirectory.set(project.file(project.labkey.explodedModuleLibDir))
jar.dependsOn(project.tasks.schemasCompile)
}

project.tasks.named('engineJar').configure { dependsOn(project.engineClasses) }
project.tasks.named('assemble').configure { dependsOn(project.tasks.engineJar) }
project.tasks.named('module').configure { dependsOn(project.tasks.engineJar) }
// The server build directly includes enginesrc (aka flow_engine.jar).
// However, it is a useful tool for a labkey flow developer for inspecting workspaces and FCS files
project.tasks.named('engineJar').configure { dependsOn(project.engineClasses) }