Makefiles and info.xml updated, #132

IBMStreams · Nov 12, 2020 · 71eb19f · 71eb19f
1 parent bba34f3
commit 71eb19f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/demos/HDFSBinary/Makefile b/demos/HDFSBinary/Makefile
@@ -11,9 +11,13 @@ STREAMS_HDFS_TOOLKIT ?= $(shell ([ -e "../../$(TOOLKIT_NAME)/toolkit.xml" ] && e
 			         ([ -e "../$(TOOLKIT_NAME)/toolkit.xml" ] && echo ../$(TOOLKIT_NAME)) ||\
 			           echo $(STREAMS_INSTALL)/toolkits/$(TOOLKIT_NAME))
 
-SPLC_FLAGS = -a --data-directory data
+ifdef STREAMS_BUILDSERVICE
+  STREAMS_HDFS_TOOLKIT = ../toolkits:$(STREAMS_INSTALL)/toolkits
+endif
 
-SPL_CMD_ARGS ?= -t $(STREAMS_HDFS_TOOLKIT)
+SPLC_FLAGS = -a -t $(STREAMS_HDFS_TOOLKIT) --data-directory data
+
+SPL_CMD_ARGS ?= 
 
 SPLC = $(STREAMS_INSTALL)/bin/sc
 SPL_COMP1NAME=HDFSBinaryRead
@@ -32,6 +36,7 @@ data:
 clean: 
 	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE1) --output-dir ./$(BUILD_OUTPUT_DIR)/$(SPL_COMP1NAME)
 	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE2) --output-dir ./$(BUILD_OUTPUT_DIR)/$(SPL_COMP2NAME)
-	-rm -rf toolkit.xml
+	-rm -f toolkit.xml
 	-rm -rf data/FileContents.txt
 	-rm -rf data/FileContentsInputPort.txt
+	-rm -rf output
diff --git a/demos/HDFSBinary/info.xml b/demos/HDFSBinary/info.xml
@@ -3,13 +3,13 @@
   <info:identity>
     <info:name>HDFSBinary</info:name>
     <info:description></info:description>
-    <info:version>1.0.0</info:version>
+    <info:version>1.0.1</info:version>
     <info:requiredProductVersion>4.0.0.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.hdfs</common:name>
-      <common:version>[2.0.0,4.0.0)</common:version>
+      <common:version>[2.0.0,6.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
-</info:toolkitInfoModel>
+</info:toolkitInfoModel>
diff --git a/demos/HDFSParallelFileSink/Makefile b/demos/HDFSParallelFileSink/Makefile
@@ -15,9 +15,13 @@ STREAMS_HDFS_TOOLKIT ?= $(shell ([ -e "../../$(TOOLKIT_NAME)/toolkit.xml" ] && e
 			         ([ -e "../$(TOOLKIT_NAME)/toolkit.xml" ] && echo ../$(TOOLKIT_NAME)) ||\
 			           echo $(STREAMS_INSTALL)/toolkits/$(TOOLKIT_NAME))
 
-SPLC_FLAGS = -a --data-directory data
+ifdef STREAMS_BUILDSERVICE
+  STREAMS_HDFS_TOOLKIT = ../toolkits:$(STREAMS_INSTALL)/toolkits
+endif
 
-SPL_CMD_ARGS ?= -t $(STREAMS_HDFS_TOOLKIT)
+SPLC_FLAGS = -a -t $(STREAMS_HDFS_TOOLKIT) --data-directory data
+
+SPL_CMD_ARGS ?= 
 
 SPLC = $(STREAMS_INSTALL)/bin/sc
 SPL_MAIN_COMPOSITE = parallelwrite::Main
@@ -31,4 +35,4 @@ data:
 	mkdir data
 clean: 
 	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE) --output-dir ./$(BUILD_OUTPUT_DIR)
-
+	-rm -rf output
diff --git a/demos/HDFSParallelFileSink/info.xml b/demos/HDFSParallelFileSink/info.xml
@@ -9,13 +9,13 @@
   <info:identity>
     <info:name>HDFSParallelSink</info:name>
     <info:description>ParallelSink example</info:description>
-    <info:version>1.0.0</info:version>
+    <info:version>1.0.1</info:version>
     <info:requiredProductVersion>3.2.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.hdfs</common:name>
-      <common:version>[2.0.0,4.0.0)</common:version>
+      <common:version>[2.0.0,6.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>