Browse Source

Make Buddy build the same as official builds for drop folder structure

Michael Ferris 7 years ago
parent
commit
817a44fa1d
1 changed files with 1 additions and 7 deletions
  1. 1 7
      Build/scripts/init_build.ps1

+ 1 - 7
Build/scripts/init_build.ps1

@@ -152,13 +152,7 @@ if ($BranchName -eq "master") {
     $ShortBranch = $BranchName.replace("release/","")
     $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}"
 $BuildIdentifier = "${buildPushIdString}_${PushDate}_${Username}_${CommitHash}"
 $ComputedDropPathSegment = "${BranchPath}\${YearAndMonth}${BuildIdentifier}"
 $ComputedDropPathSegment = "${BranchPath}\${YearAndMonth}${BuildIdentifier}"
 $ObjectDirectory = "${BinariesDirectory}\obj\${BuildPlatform}_${BuildConfiguration}"
 $ObjectDirectory = "${BinariesDirectory}\obj\${BuildPlatform}_${BuildConfiguration}"