From d0bda416c08de9438f8e8c463f1505cef642b332 Mon Sep 17 00:00:00 2001
From: "Richard Peach (RPEA)" <Richard.Peach@softwareag.com>
Date: Tue, 1 May 2018 10:05:32 +0100
Subject: [PATCH] Adding cdp bundle

---
 build.ps1                  | 10 +++++++---
 bundles/BundleTemplate.bnd |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.ps1 b/build.ps1
index cc8fac1..6d549d8 100644
--- a/build.ps1
+++ b/build.ps1
@@ -41,15 +41,19 @@ rm "$output\code\initialization.yaml"
 cp -r "$PSScriptRoot\docs" "$output\docs"
 
 # Create the bundle
-$files = & "$apamaBin\engine_deploy" --outputList stdout src | %{$_ -replace ".*\\src\\lambdas\\",""} | %{$_ -replace "\\","/"}
+$files = & "$apamaBin\engine_deploy" --outputList stdout src | %{$_ -replace ".*\\src\\lambdas\\","code/lambdas/"} | %{$_ -replace "\\","/"}
 $bundleFileList = $files | %{$_ -replace "(.+)","`t`t`t<include name=`"`$1`"/>"} | Out-String
 $bundleResult = cat "$PSScriptRoot\bundles\BundleTemplate.bnd"
 $bundleResult = $bundleResult | %{$_ -replace "<%date%>", (Get-Date -UFormat "%Y-%m-%d")}
 $bundleResult = $bundleResult | %{$_ -replace "<%version%>", $version}
-$bundleResult = $bundleResult | %{$_ -replace "<%fileList%>",$bundleFileList}
+
+$cdpBundle = $bundleResult | %{$_ -replace "<%fileList%>","`t`t`t<include name=`"cdp/Lambdas.cdp`"/>"} | %{$_ -replace "<%displayName%>", "Lambdas CDP"}
+$sourceBundle = $bundleResult | %{$_ -replace "<%fileList%>",$bundleFileList} | %{$_ -replace "<%displayName%>", "Lambdas"}
+
 md "$output\bundles" | out-null
 # Write out utf8 (no BOM)
-[IO.File]::WriteAllLines("$output\bundles\lambdas.bnd", $bundleResult)
+[IO.File]::WriteAllLines("$output\bundles\lambdas-CDP.bnd", $cdpBundle)
+[IO.File]::WriteAllLines("$output\bundles\lambdas.bnd", $sourceBundle)
 
 cp -r "$PSScriptRoot\misc" "$output\misc"
 mv "$output\misc\deploy.bat" "$output\deploy.bat"
diff --git a/bundles/BundleTemplate.bnd b/bundles/BundleTemplate.bnd
index 0dd0718..98310e4 100644
--- a/bundles/BundleTemplate.bnd
+++ b/bundles/BundleTemplate.bnd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bundle name="Lambdas" display-name="Lambdas" type="monitorscript" singleton="true">
+<bundle name="Lambdas" display-name="<%displayName%>" type="monitorscript" singleton="true">
 	<version>
 		<id><%version%></id>
 		<date><%date%></date>
@@ -10,7 +10,7 @@
 		Functional Lambdas for EPL
 	</description>
 	<monitors>
-		<fileset dir="${LAMBDAS_HOME}/code/lambdas">
+		<fileset dir="${LAMBDAS_HOME}">
 <%fileList%>
 		</fileset>
 	</monitors>