Skip to content
Snippets Groups Projects
Commit dedd640e authored by Adam Laskowski's avatar Adam Laskowski
Browse files

SSDM-13365: fixed V3 api copy path

parent a28bf3ec
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
...@@ -198,14 +198,15 @@ task untarGwt(type: Copy) { ...@@ -198,14 +198,15 @@ task untarGwt(type: Copy) {
into gwtBuildDir into gwtBuildDir
} }
task copyOpenbisStaticResources(type: Copy) {
task copyOpenbisStaticResources(type: Copy, dependsOn: [':api-openbis-javascript:bundleOpenbisStaticResources']) {
dependsOn 'untarGwt' dependsOn 'untarGwt'
from "${project(':server-application-server').projectDir}/source/java/ch/systemsx/cisd/openbis/public" from "${project(':server-application-server').projectDir}/source/java/ch/systemsx/cisd/openbis/public"
into gwtModuleBuildDir into gwtModuleBuildDir
from("${project(':api-openbis-javascript').projectDir}/src/v3") { }
into "${gwtModuleBuildDir}/resources/api"
} task copyV3ApiResources(type: Copy, dependsOn: [copyOpenbisStaticResources, ':api-openbis-javascript:bundleOpenbisStaticResources']) {
from("${project(':api-openbis-javascript').projectDir}/src/v3")
into "${gwtModuleBuildDir}/resources/api/v3"
} }
ext.classpathEntries = files( ext.classpathEntries = files(
...@@ -259,9 +260,9 @@ task checkFilesExist { ...@@ -259,9 +260,9 @@ task checkFilesExist {
} }
} }
war.dependsOn untarGwt war.dependsOn untarGwt
war.dependsOn copyOpenbisStaticResources war.dependsOn copyOpenbisStaticResources
war.dependsOn copyV3ApiResources
war.dependsOn checkFilesExist war.dependsOn checkFilesExist
war.dependsOn copyJarsForWebStart war.dependsOn copyJarsForWebStart
war { war {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment