From f105f0b52867033aa378c3d305cade14dab8c35c Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Thu, 13 Jun 2019 12:01:55 -0400 Subject: [PATCH] Don't create outDir subfolder for user build --- Build/zAppBuild/build.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Build/zAppBuild/build.groovy b/Build/zAppBuild/build.groovy index 0bb75bd8..3eb766b8 100644 --- a/Build/zAppBuild/build.groovy +++ b/Build/zAppBuild/build.groovy @@ -302,7 +302,9 @@ def populateBuildProperties(String[] args) { props.applicationBuildLabel = "build.${props.startTime}" as String props.applicationCollectionName = ((props.applicationCurrentBranch) ? "${props.application}-${props.applicationCurrentBranch}" : "${props.application}") as String props.applicationOutputsCollectionName = "${props.applicationCollectionName}-outputs" as String - props.buildOutDir = "${props.outDir}/${props.applicationBuildLabel}" as String + + // do not create a subfolder for user builds + props.buildOutDir = ((props.userBuild) ? "${props.outDir}" : "${props.outDir}/${props.applicationBuildLabel}") as String if (props.verbose) { println("java.version="+System.getProperty("java.runtime.version"))