From a78bf916f7140cdbcd1d54a1a7618233a932e2d4 Mon Sep 17 00:00:00 2001
From: James Struga <jstruga@rocketsoftware.com>
Date: Mon, 8 Feb 2021 15:26:25 -0500
Subject: [PATCH 1/6] run test during build

Signed-off-by: James Struga <jstruga@rocketsoftware.com>
---
 production.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/production.xml b/production.xml
index 57894ba..4a9e404 100644
--- a/production.xml
+++ b/production.xml
@@ -41,6 +41,7 @@
 	  
     <ant antfile="build.xml" dir="${capstone}/../dist/${buildRel}" inheritAll="false">
       <target name="deploy"/>
+	  <target name="test"/>
       <target name="build"/>
       <target name="removeSource"/>
       <property name="plugins" value="${plugins}"/>

From 5e376d0595ec6d4de6365d2801e0dd14e14d2bc6 Mon Sep 17 00:00:00 2001
From: James Struga <jstruga@rocketsoftware.com>
Date: Mon, 8 Feb 2021 15:30:27 -0500
Subject: [PATCH 2/6] fix order

Signed-off-by: James Struga <jstruga@rocketsoftware.com>
---
 production.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/production.xml b/production.xml
index 4a9e404..390f01e 100644
--- a/production.xml
+++ b/production.xml
@@ -41,8 +41,8 @@
 	  
     <ant antfile="build.xml" dir="${capstone}/../dist/${buildRel}" inheritAll="false">
       <target name="deploy"/>
-	  <target name="test"/>
       <target name="build"/>
+	  <target name="test"/>
       <target name="removeSource"/>
       <property name="plugins" value="${plugins}"/>
     </ant>

From 3df4d2c74e698c17cfdba22d78e9eebf308e2289 Mon Sep 17 00:00:00 2001
From: James Struga <jstruga@rocketsoftware.com>
Date: Mon, 8 Feb 2021 15:32:10 -0500
Subject: [PATCH 3/6] fix orders

Signed-off-by: James Struga <jstruga@rocketsoftware.com>
---
 production.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/production.xml b/production.xml
index 390f01e..444cb37 100644
--- a/production.xml
+++ b/production.xml
@@ -42,7 +42,7 @@
     <ant antfile="build.xml" dir="${capstone}/../dist/${buildRel}" inheritAll="false">
       <target name="deploy"/>
       <target name="build"/>
-	  <target name="test"/>
+      <target name="test"/>
       <target name="removeSource"/>
       <property name="plugins" value="${plugins}"/>
     </ant>

From f454f0bdfc12d5a25ee11fc60e538e9ca59f440b Mon Sep 17 00:00:00 2001
From: James Struga <jstruga@rocketsoftware.com>
Date: Wed, 10 Feb 2021 13:57:03 -0500
Subject: [PATCH 4/6] test

Signed-off-by: James Struga <jstruga@rocketsoftware.com>
---
 production.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/production.xml b/production.xml
index 444cb37..8181308 100644
--- a/production.xml
+++ b/production.xml
@@ -42,8 +42,6 @@
     <ant antfile="build.xml" dir="${capstone}/../dist/${buildRel}" inheritAll="false">
       <target name="deploy"/>
       <target name="build"/>
-      <target name="test"/>
-      <target name="removeSource"/>
       <property name="plugins" value="${plugins}"/>
     </ant>
   </target>

From a7de3382567b1d5a64a348057a1cf1509de07a42 Mon Sep 17 00:00:00 2001
From: James Struga <jstruga@rocketsoftware.com>
Date: Mon, 1 Mar 2021 12:10:06 -0500
Subject: [PATCH 5/6] re added removeSource in production

Signed-off-by: James Struga <jstruga@rocketsoftware.com>
---
 production.xml |  1 +
 testing.xml    | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 testing.xml

diff --git a/production.xml b/production.xml
index 8181308..fedc518 100644
--- a/production.xml
+++ b/production.xml
@@ -42,6 +42,7 @@
     <ant antfile="build.xml" dir="${capstone}/../dist/${buildRel}" inheritAll="false">
       <target name="deploy"/>
       <target name="build"/>
+	  <target name="removeSource"/>
       <property name="plugins" value="${plugins}"/>
     </ant>
   </target>
diff --git a/testing.xml b/testing.xml
new file mode 100644
index 0000000..8181308
--- /dev/null
+++ b/testing.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+
+<!-- 
+  This program and the accompanying materials are
+  made available under the terms of the Eclipse Public License v2.0 which accompanies
+  this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
+  
+  SPDX-License-Identifier: EPL-2.0
+  
+  Copyright Contributors to the Zowe Project.
+-->
+<project default="setup-dist" xmlns:if="ant:if" xmlns:unless="ant:unless">
+  <property file="core-plugins.properties"/>
+  <property name="version_string" value="${PRODUCT_MAJOR_VERSION}.${PRODUCT_MINOR_VERSION}.${PRODUCT_REVISION}+${version.date}"/>
+
+  <target name="setup-dist">
+    <!--To Do add in configurable dist directory-->
+    <delete dir="${capstone}/../dist"/>
+    <mkdir dir="${capstone}/../dist"/>
+   
+    <exec executable="sh" if:set="isZos">
+      <arg line="-c 'cp -pR .. ${capstone}/../dist/'"/>
+    </exec>
+	   
+    <exec executable="sh" if:set="isUnix">
+      <arg line="-c 'cp -pR .. ${capstone}/../dist/'"/>
+    </exec>
+
+    <copy todir="${capstone}/../dist/" if:set="isWindows">
+      <fileset dir="../"/>
+    </copy>
+
+    <for param="plugindef" list="${CORE_PLUGINS}" trim="true">
+      <sequential>
+	<replace file="${capstone}/../dist/@{plugindef}">
+	  <replacefilter token="0.0.0-zlux.version.replacement"
+			 value="${version_string}"/>
+        </replace>
+      </sequential>
+    </for>
+	  
+    <ant antfile="build.xml" dir="${capstone}/../dist/${buildRel}" inheritAll="false">
+      <target name="deploy"/>
+      <target name="build"/>
+      <property name="plugins" value="${plugins}"/>
+    </ant>
+  </target>
+ 
+  <target name="publishVersion">
+    <fail unless="version.date"/>
+    <echo file="fullVersion.properties" message="PRODUCT_FULL_VERSION=${version_string}"/>
+  </target>
+
+</project>
+
+<!-- 
+  This program and the accompanying materials are
+  made available under the terms of the Eclipse Public License v2.0 which accompanies
+  this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
+  
+  SPDX-License-Identifier: EPL-2.0
+  
+  Copyright Contributors to the Zowe Project.
+-->

From 63a4b0d5183ffde5569c21119eac0ae0a69eecf8 Mon Sep 17 00:00:00 2001
From: James Struga <jstruga@rocketsoftware.com>
Date: Mon, 1 Mar 2021 12:19:14 -0500
Subject: [PATCH 6/6] Added testing.xml

Signed-off-by: James Struga <jstruga@rocketsoftware.com>
---
 build.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 35b6616..896030c 100644
--- a/build.xml
+++ b/build.xml
@@ -34,7 +34,11 @@
   <target name="production">
     <ant antfile="production.xml" dir="."/>
   </target>
-
+  
+  <target name="testing">
+	<ant antfile="testing.xml" dir="."/>
+  </target>
+	
   <target name="getVersion">
     <ant antfile="production.xml" dir="." target="publishVersion"/>
   </target>