From 817a44fa1d8575a804f0033824fa083f9a7955d8 Mon Sep 17 00:00:00 2001 From: Michael Ferris Date: Mon, 6 Aug 2018 15:22:26 -0700 Subject: [PATCH] Make Buddy build the same as official builds for drop folder structure --- Build/scripts/init_build.ps1 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Build/scripts/init_build.ps1 b/Build/scripts/init_build.ps1 index c6904c2ee1d..2b98780300a 100644 --- a/Build/scripts/init_build.ps1 +++ b/Build/scripts/init_build.ps1 @@ -152,13 +152,7 @@ if ($BranchName -eq "master") { $ShortBranch = $BranchName.replace("release/","") } -# unless it is a build branch, subdivide the output directory by month -if ($BranchPath.StartsWith("build")) { - $YearAndMonth = "" -} else { - $YearAndMonth = (Get-Date $buildPushDate -Format yyMM) + "\" -} - +$YearAndMonth = (Get-Date $buildPushDate -Format yyMM) + "\" $BuildIdentifier = "${buildPushIdString}_${PushDate}_${Username}_${CommitHash}" $ComputedDropPathSegment = "${BranchPath}\${YearAndMonth}${BuildIdentifier}" $ObjectDirectory = "${BinariesDirectory}\obj\${BuildPlatform}_${BuildConfiguration}"