Makefiles updated for Streams build service

markheger · markheger · commit 3b7c62fe3077 · 2020-11-09T11:24:17.000Z
diff --git a/General/SensorMonitor/Makefile b/General/SensorMonitor/Makefile
@@ -23,21 +23,23 @@
 # end_generated_IBM_copyright_prolog
 .PHONY: all distributed clean
 
-SPLC_FLAGS = -a -t   $(STREAMS_INSTALL)/toolkits/com.ibm.streamsx.json:$(STREAMS_INSTALL)/toolkits/com.ibm.streams.cep:$(STREAMS_INSTALL)/toolkits/com.ibm.streamsx.messagehub
+SPLC_FLAGS = -a -t $(STREAMS_INSTALL)/toolkits/com.ibm.streamsx.json:$(STREAMS_INSTALL)/toolkits/com.ibm.streams.cep:$(STREAMS_INSTALL)/toolkits/com.ibm.streamsx.messagehub
+ifdef STREAMS_BUILDSERVICE
+  SPLC_FLAGS = -a -t ../toolkits:$(STREAMS_INSTALL)/toolkits
+endif
 SPLC = $(STREAMS_INSTALL)/bin/sc
 
 SPL_CMD_ARGS ?=
-SPL_DATA_DIR ?= --data-directory ./data
 SPL_MAIN_COMPOSITE_MHUB = application::SensorMonitorMain_NoMHub
 SPL_MAIN_COMPOSITE_PUBLISH_MHUB = application::PublishData
 SPL_MAIN_COMPOSITE_SIMPLE = application::SensorMonitorMain
 
 all: distributed
 
 distributed: 
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE_MHUB) $(SPL_DATA_DIR) $(SPL_CMD_ARGS)
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE_SIMPLE) $(SPL_DATA_DIR) $(SPL_CMD_ARGS)
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE_PUBLISH_MHUB) $(SPL_DATA_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE_MHUB) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE_SIMPLE) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE_PUBLISH_MHUB) $(SPL_CMD_ARGS)
 
 clean:
 	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE_SIMPLE)
diff --git a/ReadAndStoreData/TwitterSmackdown/Makefile b/ReadAndStoreData/TwitterSmackdown/Makefile
@@ -24,11 +24,15 @@
 .PHONY: all clean 
 
 SPLC = $(STREAMS_INSTALL)/bin/sc
-SPLC_FLAGS = -a -t $(STREAMS_INSTALL)/toolkits/com.ibm.streamsx.inet
+SPL_PATH = $(STREAMS_INSTALL)/toolkits/com.ibm.streamsx.inet
+ifdef STREAMS_BUILDSERVICE
+    SPL_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+endif
 SAMPLE_TWITTERSTREAM = sample::TwitterStream
 SAMPLE_SMACKDOWN = sample::Smackdown
 SPL_DATA_DIR ?= /tmp
 SPL_CMD_ARGS ?=
+SPLC_FLAGS = -a -t $(SPL_PATH)
 
 all: distributed
 
diff --git a/TextAnalysis/BigInsightsStarterKitApp/Makefile b/TextAnalysis/BigInsightsStarterKitApp/Makefile
@@ -10,6 +10,13 @@ ifeq ($(STREAMS_STUDIO_BUILDING), 1)
   SPLC = $(STREAMS_STUDIO_SC_PATH)
   SPL_PATH = $(STREAMS_STUDIO_SPL_PATH)
   OUTPUT_DIR = $(STREAMS_STUDIO_OUTPUT_DIRECTORY)
+else ifdef STREAMS_BUILDSERVICE
+    $(info Building using buildservice)
+    ifeq ($(STREAMS_INSTALL),)
+        $(error error: environment variable STREAMS_INSTALL has to be set)
+    endif
+    SPLC = $(STREAMS_INSTALL)/bin/sc
+    SPL_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
 else
   # Building outside of Streams Studio...
   ifeq ($(STREAMS_INSTALL),)
diff --git a/TextAnalysis/TextAnalyticsToGo/Makefile b/TextAnalysis/TextAnalyticsToGo/Makefile
@@ -12,6 +12,19 @@ ifeq ($(STREAMS_STUDIO_BUILDING), 1)
   SPLC = $(STREAMS_STUDIO_SC_PATH)
   SPL_PATH = $(STREAMS_STUDIO_SPL_PATH)
   OUTPUT_DIR = $(STREAMS_STUDIO_OUTPUT_DIRECTORY)
+  SPLC_OUT1 = $(OUTPUT_DIR)
+  SPLC_OUT2 = $(OUTPUT_DIR)
+  SPLC_OUT3 = $(OUTPUT_DIR) 
+else ifdef STREAMS_BUILDSERVICE
+    $(info Building using buildservice)
+    ifeq ($(STREAMS_INSTALL),)
+        $(error error: environment variable STREAMS_INSTALL has to be set)
+    endif
+    SPLC = $(STREAMS_INSTALL)/bin/sc
+    SPL_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    SPLC_OUT1 = $(OUTPUT_DIR)
+    SPLC_OUT2 = $(OUTPUT_DIR)
+    SPLC_OUT3 = $(OUTPUT_DIR) 
 else
   # Building outside of Streams Studio...
   ifeq ($(STREAMS_INSTALL),)
diff --git a/timeseries/AnomalyDetectorSample/Makefile b/timeseries/AnomalyDetectorSample/Makefile
@@ -10,6 +10,13 @@ ifeq ($(STREAMS_STUDIO_BUILDING), 1)
   SPLC = $(STREAMS_STUDIO_SC_PATH)
   SPL_PATH = $(STREAMS_STUDIO_SPL_PATH)
   OUTPUT_DIR = $(STREAMS_STUDIO_OUTPUT_DIRECTORY)
+else ifdef STREAMS_BUILDSERVICE
+    $(info Building using buildservice)
+    ifeq ($(STREAMS_INSTALL),)
+        $(error error: environment variable STREAMS_INSTALL has to be set)
+    endif
+    SPLC = $(STREAMS_INSTALL)/bin/sc
+    SPL_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
 else
   # Building outside of Streams Studio...
   ifeq ($(STREAMS_INSTALL),)
diff --git a/timeseries/AutoForecasterSamples/Makefile b/timeseries/AutoForecasterSamples/Makefile
@@ -10,6 +10,13 @@ ifeq ($(STREAMS_STUDIO_BUILDING), 1)
   SPLC = $(STREAMS_STUDIO_SC_PATH)
   SPL_PATH = $(STREAMS_STUDIO_SPL_PATH)
   OUTPUT_DIR = $(STREAMS_STUDIO_OUTPUT_DIRECTORY)
+else ifdef STREAMS_BUILDSERVICE
+    $(info Building using buildservice)
+    ifeq ($(STREAMS_INSTALL),)
+        $(error error: environment variable STREAMS_INSTALL has to be set)
+    endif
+    SPLC = $(STREAMS_INSTALL)/bin/sc
+    SPL_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
 else
   # Building outside of Streams Studio...
   ifeq ($(STREAMS_INSTALL),)
diff --git a/timeseries/DSPFilterBandpassExample/Makefile b/timeseries/DSPFilterBandpassExample/Makefile
@@ -10,6 +10,13 @@ ifeq ($(STREAMS_STUDIO_BUILDING), 1)
   SPLC = $(STREAMS_STUDIO_SC_PATH)
   SPL_PATH = $(STREAMS_STUDIO_SPL_PATH)
   OUTPUT_DIR = $(STREAMS_STUDIO_OUTPUT_DIRECTORY)
+else ifdef STREAMS_BUILDSERVICE
+    $(info Building using buildservice)
+    ifeq ($(STREAMS_INSTALL),)
+        $(error error: environment variable STREAMS_INSTALL has to be set)
+    endif
+    SPLC = $(STREAMS_INSTALL)/bin/sc
+    SPL_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
 else
   # Building outside of Streams Studio...
   ifeq ($(STREAMS_INSTALL),)
diff --git a/timeseries/DSPFilterFiniteSample/Makefile b/timeseries/DSPFilterFiniteSample/Makefile
@@ -10,6 +10,13 @@ ifeq ($(STREAMS_STUDIO_BUILDING), 1)
   SPLC = $(STREAMS_STUDIO_SC_PATH)
   SPL_PATH = $(STREAMS_STUDIO_SPL_PATH)
   OUTPUT_DIR = $(STREAMS_STUDIO_OUTPUT_DIRECTORY)
+else ifdef STREAMS_BUILDSERVICE
+    $(info Building using buildservice)
+    ifeq ($(STREAMS_INSTALL),)
+        $(error error: environment variable STREAMS_INSTALL has to be set)
+    endif
+    SPLC = $(STREAMS_INSTALL)/bin/sc
+    SPL_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
 else
   # Building outside of Streams Studio...
   ifeq ($(STREAMS_INSTALL),)
diff --git a/timeseries/KMeansClusteringControlSignalSample/Makefile b/timeseries/KMeansClusteringControlSignalSample/Makefile
@@ -10,6 +10,13 @@ ifeq ($(STREAMS_STUDIO_BUILDING), 1)
   SPLC = $(STREAMS_STUDIO_SC_PATH)
   SPL_PATH = $(STREAMS_STUDIO_SPL_PATH)
   OUTPUT_DIR = $(STREAMS_STUDIO_OUTPUT_DIRECTORY)
+else ifdef STREAMS_BUILDSERVICE
+    $(info Building using buildservice)
+    ifeq ($(STREAMS_INSTALL),)
+        $(error error: environment variable STREAMS_INSTALL has to be set)
+    endif
+    SPLC = $(STREAMS_INSTALL)/bin/sc
+    SPL_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
 else
   # Building outside of Streams Studio...
   ifeq ($(STREAMS_INSTALL),)
diff --git a/timeseries/STD2Samples/Makefile b/timeseries/STD2Samples/Makefile
@@ -10,6 +10,13 @@ ifeq ($(STREAMS_STUDIO_BUILDING), 1)
   SPLC = $(STREAMS_STUDIO_SC_PATH)
   SPL_PATH = $(STREAMS_STUDIO_SPL_PATH)
   OUTPUT_DIR = $(STREAMS_STUDIO_OUTPUT_DIRECTORY)
+else ifdef STREAMS_BUILDSERVICE
+    $(info Building using buildservice)
+    ifeq ($(STREAMS_INSTALL),)
+        $(error error: environment variable STREAMS_INSTALL has to be set)
+    endif
+    SPLC = $(STREAMS_INSTALL)/bin/sc
+    SPL_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
 else
   # Building outside of Streams Studio...
   ifeq ($(STREAMS_INSTALL),)
