Merge pull request #45 from markheger/samples

update samples, makefiles added, add appconfig param

Author: markheger

samples/Makefile

@@ -0,0 +1,17 @@
+# Licensed Materials - Property of IBM
+# ObjectStorage Toolkit for IBM Streams
+# (c) Copyright IBM Corp. 2019
+# All rights reserved.                              
+.PHONY: all clean
+
+all: 
+	for dir in $(shell ls -d -1 */); do\
+		make -C $$dir || exit 1; \
+	done
+
+clean:
+	for dir in $(shell ls -d -1 */); do\
+		make -C $$dir clean || exit 1; \
+	done
+
+

samples/com.ibm.streamsx.slack.sample.CustomIconEmoji/Makefile

@@ -0,0 +1,49 @@
+# Copyright (C)2019, International Business Machines Corporation and  
+# others. All Rights Reserved.                        
+
+.PHONY: all clean
+
+# determine pathes
+ifeq ($(STREAMS_STUDIO_BUILDING), 1)
+  # Building from Streams Studio, use env vars set by studio
+  SPLC = $(STREAMS_STUDIO_SC_PATH)
+  SPL_PATH = $(STREAMS_STUDIO_SPL_PATH)
+  OUTPUT_DIR = $(STREAMS_STUDIO_OUTPUT_DIRECTORY)
+else
+  # Building outside of Streams Studio...
+  ifeq ($(STREAMS_INSTALL),)
+    $(error error: environment variable STREAMS_INSTALL has to be set)
+  endif
+  # Set the SLACK_TOOLKIT_HOME variable if the toolkit or sample location changed
+  ifeq ($(SLACK_TOOLKIT_HOME),)
+    ifneq ($(realpath ../../com.ibm.streamsx.slack),)
+      SLACK_TOOLKIT_HOME = ../../com.ibm.streamsx.slack
+    endif
+    ifneq ($(realpath $(STREAMS_INSTALL)/toolkits/com.ibm.streamsx.slack),)
+      SLACK_TOOLKIT_HOME = $(STREAMS_INSTALL)/toolkits/com.ibm.streamsx.slack
+    endif
+  endif
+  SPLC = $(STREAMS_INSTALL)/bin/sc
+  SPL_PATH = $(STREAMS_INSTALL)/toolkits/com.ibm.streamsx.json:$(SLACK_TOOLKIT_HOME)
+endif
+
+SPL_NAMESPACE = com.ibm.streamsx.slack.sample.CustomIconEmoji
+SPL_MAIN_COMPOSITE = $(SPL_NAMESPACE)::Main
+SPLC_FLAGS  = -a -t $(SPL_PATH)
+SPL_CMD_ARGS ?= 
+OUTPUT_DIR = output
+
+all:
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) --output-directory $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+
+clean:
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE) --output-directory $(OUTPUT_DIR)
+	-rm -rf $(OUTPUT_DIR)
+	-rm -rf toolkit.xml
+	-rm -rf .toolkitList
+
+configure:
+	-streamtool rmappconfig --noprompt slack
+	streamtool mkappconfig --property slackUrl=$(SLACK_URL) slack
+
+

samples/com.ibm.streamsx.slack.sample.CustomIconEmoji/com.ibm.streamsx.slack.sample.CustomIconEmoji/Main.spl

@@ -64,7 +64,8 @@ public composite Main
 		() as SendMessage = SendSlackMessage(JSONMessage)
 		{
 			param
-				slackUrl : getSubmissionTimeValue("slackUrl") ;
+				slackUrl : getSubmissionTimeValue("slackUrl", "");
+				slackConfiguration : getSubmissionTimeValue("slackConfiguration", "slack");
 		}
 
 }

samples/com.ibm.streamsx.slack.sample.HelloWorld/Makefile

@@ -0,0 +1,49 @@
+# Copyright (C)2019, International Business Machines Corporation and  
+# others. All Rights Reserved.                        
+
+.PHONY: all clean
+
+# determine pathes
+ifeq ($(STREAMS_STUDIO_BUILDING), 1)
+  # Building from Streams Studio, use env vars set by studio
+  SPLC = $(STREAMS_STUDIO_SC_PATH)
+  SPL_PATH = $(STREAMS_STUDIO_SPL_PATH)
+  OUTPUT_DIR = $(STREAMS_STUDIO_OUTPUT_DIRECTORY)
+else
+  # Building outside of Streams Studio...
+  ifeq ($(STREAMS_INSTALL),)
+    $(error error: environment variable STREAMS_INSTALL has to be set)
+  endif
+  # Set the SLACK_TOOLKIT_HOME variable if the toolkit or sample location changed
+  ifeq ($(SLACK_TOOLKIT_HOME),)
+    ifneq ($(realpath ../../com.ibm.streamsx.slack),)
+      SLACK_TOOLKIT_HOME = ../../com.ibm.streamsx.slack
+    endif
+    ifneq ($(realpath $(STREAMS_INSTALL)/toolkits/com.ibm.streamsx.slack),)
+      SLACK_TOOLKIT_HOME = $(STREAMS_INSTALL)/toolkits/com.ibm.streamsx.slack
+    endif
+  endif
+  SPLC = $(STREAMS_INSTALL)/bin/sc
+  SPL_PATH = $(SLACK_TOOLKIT_HOME)
+endif
+
+SPL_NAMESPACE = com.ibm.streamsx.slack.sample.HelloWorld
+SPL_MAIN_COMPOSITE = $(SPL_NAMESPACE)::Main
+SPLC_FLAGS  = -a -t $(SPL_PATH)
+SPL_CMD_ARGS ?= 
+OUTPUT_DIR = output
+
+all:
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) --output-directory $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+
+clean:
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE) --output-directory $(OUTPUT_DIR)
+	-rm -rf $(OUTPUT_DIR)
+	-rm -rf toolkit.xml
+	-rm -rf .toolkitList
+
+configure:
+	-streamtool rmappconfig --noprompt slack
+	streamtool mkappconfig --property slackUrl=$(SLACK_URL) slack
+
+

samples/com.ibm.streamsx.slack.sample.HelloWorld/com.ibm.streamsx.slack.sample.HelloWorld/Main.spl

@@ -34,7 +34,8 @@ public composite Main
 		() as SendMessage = SendSlackMessage(GenerateMessage)
 		{
 			param
-				slackUrl : getSubmissionTimeValue("slackUrl") ;
+				slackUrl : getSubmissionTimeValue("slackUrl", "");
+				slackConfiguration : getSubmissionTimeValue("slackConfiguration", "slack");
 		}
 
 }