IBMStreams#10: Fixed gradle build script for physionet and rpeak dete…

…ct. Include buildServices in build target
chanskw · Dec 7, 2016 · 1877e06 · 1877e06
1 parent 7493b9c
commit 1877e06
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/analyze/com.ibm.streamsx.health.analytics.ecg/build.gradle b/analyze/com.ibm.streamsx.health.analytics.ecg/build.gradle
@@ -26,6 +26,7 @@ dependencies {
 
 task buildToolkit {
  doLast {
+ tasks.copyJarToImpl.execute()
  splMakeToolkit()
  }
 }
@@ -35,7 +36,7 @@ task buildIngestToolkit(type: GradleBuild) {
  tasks = ['build']
 }
 
-task buildServices(dependsOn: 'buildIngestToolkit') {
+task buildServices(dependsOn: ['buildIngestToolkit', 'buildToolkit']) {
  doLast {
  def serviceToolkitPath = jsonToolkitPath + ':' + topologyToolkitPath + ':' + healthIngestToolkitPath + ':' + timeseriesToolkitPath
  compileApp('com.ibm.streamsx.health.analysis.ecg.service', 'RPeakDetectService', serviceToolkitPath)
@@ -59,7 +60,6 @@ task deleteDeps(type: Delete) {
  delete 'impl/java/bin'
 }
 
-build.dependsOn buildToolkit
-build.finalizedBy(copyJarToImpl)
+build.dependsOn buildToolkit, buildServices
 clean.dependsOn deleteDeps, cleanToolkit
 
diff --git a/ingest/physionet/com.ibm.streamsx.health.ingest.physionet/build.gradle b/ingest/physionet/com.ibm.streamsx.health.ingest.physionet/build.gradle
@@ -51,5 +51,5 @@ task deleteDeps(type: Delete) {
  delete 'output'
 }
 
-build.dependsOn buildToolkit
+build.dependsOn buildToolkit, buildServices
 clean.dependsOn deleteDeps, cleanToolkit