From a115484f51a23a4e94a655b7bd3cbda43b534a18 Mon Sep 17 00:00:00 2001 From: labkey-matthewb Date: Mon, 24 Feb 2025 17:02:40 -0800 Subject: [PATCH 1/4] server build does not need flow engine --- flow/build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/flow/build.gradle b/flow/build.gradle index 7baa21462d..7245849d0b 100644 --- a/flow/build.gradle +++ b/flow/build.gradle @@ -40,5 +40,8 @@ project.tasks.register("engineJar", Jar) { } 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 does not need flow_engine.jar +// however it is a useful tool for a labkey flow develop for inspecting workspaces and FCS files +//project.tasks.named('assemble').configure { dependsOn(project.tasks.engineJar) } +//project.tasks.named('module').configure { dependsOn(project.tasks.engineJar) } From b77be6ef530e7afceb02ea910ce0430a36f5aa61 Mon Sep 17 00:00:00 2001 From: labkey-matthewb Date: Tue, 25 Feb 2025 14:54:07 -0800 Subject: [PATCH 2/4] include flow engine directly in flow module jar --- flow/build.gradle | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/flow/build.gradle b/flow/build.gradle index 7245849d0b..f9d04f7a9c 100644 --- a/flow/build.gradle +++ b/flow/build.gradle @@ -5,6 +5,11 @@ plugins { } sourceSets { + main { + java { + srcDirs = ['./src', './enginesrc', "${BuildUtils.getBuildDirPath(project)}/xb"] + } + } engine { java { srcDirs = ['./enginesrc', "${BuildUtils.getBuildDirPath(project)}/xb"] @@ -39,9 +44,6 @@ project.tasks.register("engineJar", Jar) { jar.dependsOn(project.tasks.schemasCompile) } -project.tasks.named('engineJar').configure { dependsOn(project.engineClasses) } - -// The server build does not need flow_engine.jar -// however it is a useful tool for a labkey flow develop for inspecting workspaces and FCS files -//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 develop for inspecting workspaces and FCS files +project.tasks.named('engineJar').configure { dependsOn(project.engineClasses) } \ No newline at end of file From dccedebd1e0622a802c66e78372978d7342accde Mon Sep 17 00:00:00 2001 From: labkey-matthewb Date: Wed, 26 Feb 2025 08:48:44 -0800 Subject: [PATCH 3/4] Update flow/build.gradle Co-authored-by: Susan Hert --- flow/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow/build.gradle b/flow/build.gradle index f9d04f7a9c..42a797da99 100644 --- a/flow/build.gradle +++ b/flow/build.gradle @@ -45,5 +45,5 @@ project.tasks.register("engineJar", Jar) { } // The server build directly includes enginesrc (aka flow_engine.jar). -// However, it is a useful tool for a labkey flow develop for inspecting workspaces and FCS files +// 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) } \ No newline at end of file From 92d37f7bb0105156ec5bd1dd0678bc351e3f65ca Mon Sep 17 00:00:00 2001 From: labkey-matthewb Date: Wed, 26 Feb 2025 09:31:05 -0800 Subject: [PATCH 4/4] new dir for standalone lib --- flow/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/flow/build.gradle b/flow/build.gradle index 42a797da99..a6651a417d 100644 --- a/flow/build.gradle +++ b/flow/build.gradle @@ -40,7 +40,6 @@ 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) }