Corrections to build scripts for versioning labels on packages.

Author: smaillet

Build-All.ps1

@@ -42,12 +42,6 @@ try
     {
         .\Build-Docs.ps1 -BuildInfo $BuildInfo
     }
-
-    # AppVeyor specific artifact push. (Should be part of YML so scripts are build infra neutral...)
-    if( $env:APPVEYOR_PULL_REQUEST_NUMBER )
-    {
-        Get-ChildItem  -Filter *.binlog $BuildPaths.BinLogsPath | %{ Push-AppveyorArtifact $_.FullName }
-    }
 }
 finally
 {

Build-Source.ps1

@@ -40,7 +40,7 @@ try
     Invoke-MSBuild -Targets 'Restore;Build' -Project src\Llvm.NET.sln -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$buildLogPath") )
 
     pushd $BuildPaths.NuGetOutputPath
-    Compress-Archive -Path *.* -DestinationPath (join-path $BuildPaths.BuildOutputPath Nuget.Packages.zip)
+    Compress-Archive -Force -Path *.* -DestinationPath (join-path $BuildPaths.BuildOutputPath Nuget.Packages.zip)
 }
 finally
 {

Directory.Build.props

@@ -40,13 +40,8 @@
         <BuildOutputPackagesDir Condition="'$(BuildOutputPackagesDir)'==''">$(BaseBuildOutputPath)packages\</BuildOutputPackagesDir>
 
         <BuildVersionXml Condition="'$(BuildVersionXmlFile)'==''">$(MSBuildThisFileDirectory)BuildVersion.xml</BuildVersionXml>
-        <IsAutomatedBuild Condition="'$(IsAutomatedBuild)'=='' AND '$(CI)'!=''">true</IsAutomatedBuild>
         <IsAutomatedBuild Condition="'$(IsAutomatedBuild)'==''">false</IsAutomatedBuild>
-
-        <IsPullRequestBuild Condition="'$(IsPullRequestBuild)'=='' AND '$(APPVEYOR_PULL_REQUEST_NUMBER)'!=''">true</IsPullRequestBuild>
         <IsPullRequestBuild Condition="'$(IsPullRequestBuild)'==''">false</IsPullRequestBuild>
-
-        <IsReleaseBuild Condition="'$(IsReleaseBuild)'=='' AND '$(APPVEYOR_REPO_TAG)'=='true' AND '$(APPVEYOR_PULL_REQUEST_NUMBER)'==''">true</IsReleaseBuild>
         <IsReleaseBuild Condition="'$(IsReleaseBuild)'==''">false</IsReleaseBuild>
         <BuildTime Condition="'$(BuildTime)'=='' AND '$(APPVEYOR_REPO_COMMIT_TIMESTAMP)'!=''">$(APPVEYOR_REPO_COMMIT_TIMESTAMP)</BuildTime>
         <LlvmVersionMajor Condition="'$(LlvmVersionMajor)'==''">8</LlvmVersionMajor>

buildutils.ps1

@@ -393,11 +393,6 @@ function Get-CurrentBuildKind
         }
     }
 
-    # set/reset legacy environment vars for non-script tools (i.e. msbuild.exe)
-    $env:IsAutomatedBuild = $global:CurrentBuildKind -ne [BuildKind]::LocalBuild
-    $env:IsPullRequestBuild = $global:CurrentBuildKind -eq [BuildKind]::PullRequestBuild
-    $env:IsReleaseBuild = $global:CurrentBuildKind -eq [BuildKind]::ReleaseBuild
-
     return $currentBuildKind
 }
 
@@ -410,6 +405,20 @@ function Initialize-BuildEnvironment
     # Script code should ALWAYS use the global CurrentBuildKind
     $global:CurrentBuildKind = Get-CurrentBuildKind
 
+    # set/reset legacy environment vars for non-script tools (i.e. msbuild.exe)
+    $env:IsAutomatedBuild = $global:CurrentBuildKind -ne [BuildKind]::LocalBuild
+    $env:IsPullRequestBuild = $global:CurrentBuildKind -eq [BuildKind]::PullRequestBuild
+    $env:IsReleaseBuild = $global:CurrentBuildKind -eq [BuildKind]::ReleaseBuild
+
+    switch($global:CurrentBuildKind)
+    {
+        ([BuildKind]::LocalBuild) { $env:CiBuildName = 'ZZZ' }
+        ([BuildKind]::PullRequestBuild) { $env:CiBuildName = 'PRQ' }
+        ([BuildKind]::CiBuild) { $env:CiBuildName = 'BLD' }
+        ([BuildKind]::ReleaseBuild) { $env:CiBuildName = '' }
+        default { throw "Invalid build kind" }
+    }
+
     # get the ISO-8601 formatted time stamp of the HEAD commit or the current UTC time for local builds
     if(!$env:BuildTime -or $FullInit)
     {
@@ -434,11 +443,14 @@ function Initialize-BuildEnvironment
         $env:Path = "$env:Path;$($msbuild.BinPath)"
     }
 
-    if($FullInit)
+    if($FullInit -or !$global:BuildPaths -or !$global:BuildInfo)
     {
         $global:BuildPaths = Get-BuildPaths $PSScriptRoot
         $global:BuildInfo = Get-BuildInformation $BuildPaths
+    }
 
+    if($FullInit)
+    {
         Write-Information 'Build Paths:'
         Write-Information ($global:BuildPaths | Format-Table | Out-String)