Build script sets Code Pulse version

Steve Salas · Steve Salas · commit be054ccedb9c · 2018-03-16T22:57:11.000-04:00
diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 val baseSettings = Seq(
 	organization := "com.codedx",
-	version := "2.0.0-SNAPSHOT",
-	BuildKeys.releaseDate := "SNAPSHOT"
+	version := "UNVERSIONED",
+	BuildKeys.releaseDate := "N/A"
 )
 
 val scalaSettings = Seq(
diff --git a/codepulse/src/main/resources/toserve/common/UpdateController.js b/codepulse/src/main/resources/toserve/common/UpdateController.js
@@ -86,6 +86,9 @@
 		/** checks `release`, firing off the appropriate events as necessary */
 		function checkRelease(release) {
 			getVersion(function (ourVersion) {
+                if (ourVersion == "UNVERSIONED") {
+                    return;
+                }
 				var releaseVersion = release.tag_name.replace(/^v/, '')
 				self.releaseVersion = releaseVersion
 
diff --git a/installers/Linux/build.ps1 b/installers/Linux/build.ps1
@@ -2,7 +2,9 @@
 # This script creates the Linux Code Pulse package
 #
 param (
-	[switch] $forceTracerRebuild
+	[switch] $forceTracerRebuild,
+	$version='1.0.0.0',
+    $releaseDate=([DateTime]::Now.ToShortDateString())
 )
 
 Set-PSDebug -Strict
@@ -23,13 +25,14 @@ if ($forceTracerRebuild -or (-not (Test-DotNetTracer $codePulsePath $buildConfig
 }
 
 Invoke-CodePulsePackaging `
-    $codePulseVersion `
+    $version `
+    $releaseDate `
     $PSScriptRoot `
     $codePulsePath `
     'Linux' `
     'linux-x64' `
     'packageEmbeddedLinuxX64' `
-    "CodePulse-$($codePulseVersion)-SNAPSHOT-linux-x64.zip" `
+    "CodePulse-$($version)-linux-x64.zip" `
     'dotnet-symbol-service' `
     'SymbolService' `
     'agent.jar'
@@ -38,7 +41,7 @@ Invoke-CodePulseZip `
     $PSScriptRoot `
     'Linux' `
     'Linux-x64' `
-    $codePulseVersion `
+    $version `
     $zipFilePath `
     'Files\Linux'
 
diff --git a/installers/Scripts/common.ps1 b/installers/Scripts/common.ps1
@@ -16,6 +16,7 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem
 
 function Invoke-CodePulsePackaging(
     [string] $codePulseVersion,
+    [datetime] $codePulseReleaseDate,
     [string] $scriptRoot, 
     [string] $codePulsePath, 
     [string] $osName, 
@@ -51,6 +52,13 @@ function Invoke-CodePulsePackaging(
 
     Push-Location $codePulsePath
 
+    write-verbose "Editing build.sbt for version $codePulseVersion and release date $codePulseReleaseDate..."
+    $buildSbtPath = join-path (get-location) 'build.sbt'
+    $buildSbt = gc $buildSbtPath
+    $buildSbtNew = $buildSbt | % { $_ -replace 'version\ :=\ "UNVERSIONED"',"version := `"$codePulseVersion`"" }
+    $buildSbtNew = $buildSbtNew | % { $_ -replace 'BuildKeys\.releaseDate\ :=\ "N/A"',"BuildKeys.releaseDate := `"$codePulseReleaseDate`"" }
+    Set-TextContent $buildSbtPath $buildSbtNew
+
     write-verbose "Editing application.conf for $osName packaging..."
     $applicationConfPath = join-path (get-location) 'codepulse\src\main\resources\application.conf'
     $applicationConf = gc $applicationConfPath
@@ -66,14 +74,20 @@ function Invoke-CodePulsePackaging(
     }
 
     write-verbose "Packaging Code Pulse ($osRID)..."
-    Invoke-Sbt $packageCommand
+    if (-not (Invoke-Sbt $packageCommand 3 ([timespan]::FromMinutes(1)))) {
+        write-verbose 'Packaging failed'
+        exit 1
+    }
 
     write-verbose "Unzipping Code Pulse package ($osName)..."
     [io.compression.zipfile]::ExtractToDirectory($codePulsePackagePath, $filesFolderPath)
 
     write-verbose "Restoring original '$applicationConfPath' contents..."
     Set-TextContent $applicationConfPath $applicationConf
 
+    write-verbose 'Restoring original build.sbt contents...'
+    Set-TextContent $buildSbtPath $buildSbt
+
     write-verbose 'Moving Java agent (Linux)...'
     move-item (join-path $filesFolderCodePulsePath $agentJarRelativePath) $filesFolderJavaTracerPath
 
@@ -174,6 +188,5 @@ $dotNetSymbolServicePath = join-path $codePulsePath 'dotnet-symbol-service'
 $dotNetTracerPath = join-path $codePulsePath 'dotnet-tracer'
 $dotNetTracerMainPath = join-path $dotNetTracerPath 'main'
 
-$codePulseVersion = '2.0.0'
 $buildConfiguration = 'Release'
 
diff --git a/installers/Scripts/sbt.ps1 b/installers/Scripts/sbt.ps1
@@ -15,13 +15,30 @@ function Get-SbtPath() {
     }
 }
 
-function Invoke-Sbt([string] $packageName) {
-    try {
-        c:\windows\system32\cmd.exe /c "`"$(Get-SbtPath)`" $packageName"
-    }
-    catch {
-        if ($_.Exception.Message -ne 'Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=256m; support was removed in 8.0') {
-            exit $lastexitcode
+function Invoke-Sbt([string] $packageName, [byte] $retryCount=0, [timespan] $retryWait=([timespan]::FromMilliSeconds(0))) {
+
+    $try = 0
+    do
+    {
+        if ($try -ne 0) {
+            Write-Verbose "Retrying (retry number $try) after waiting for $($retryWait.TotalMilliseconds) milliseconds..."
+            sleep -Milliseconds $retryWait.TotalMilliseconds
+        }
+        $try++
+
+        try {
+            c:\windows\system32\cmd.exe /c `"$(Get-SbtPath)`" $packageName
+            if ($lastexitcode -eq 0) {
+                return $true
+            }
+        }
+        catch {
+            if ($_.Exception.Message -eq 'Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=256m; support was removed in 8.0') {
+                return $true
+            }
         }
     }
+    while ($try -le $retryCount)
+
+    $false
 }
diff --git a/installers/Windows/build.ps1 b/installers/Windows/build.ps1
@@ -4,7 +4,8 @@
 param (
 	[switch] $forceTracerRebuild,
     [switch] $signOutput,
-	$version='1.0.0.0'
+	$version='1.0.0.0',
+    $releaseDate=([DateTime]::Now.ToShortDateString())
 )
 
 Set-PSDebug -Strict
@@ -31,13 +32,14 @@ $productNew = $product | % { $_ -replace ([System.Text.RegularExpressions.Regex]
 Set-TextContent $productPath $productNew
 
 Invoke-CodePulsePackaging `
-    $codePulseVersion `
+    $version `
+    $releaseDate `
     $PSScriptRoot `
     $codePulsePath `
     'Win64' `
     'win-x64' `
     'packageEmbeddedWin64' `
-    "CodePulse-$($codePulseVersion)-SNAPSHOT-win64.zip" `
+    "CodePulse-$($version)-win64.zip" `
     '..\dotnet-symbol-service' `
     'SymbolService.exe' `
     'agent.jar'
@@ -86,7 +88,7 @@ Invoke-CodePulseZip `
     $PSScriptRoot `
     'Windows' `
     'Windows-x64' `
-    $codePulseVersion `
+    $version `
     $zipFilePath `
     "CodePulse.Installer.Win64\bin\$buildConfiguration"
 
diff --git a/installers/build.ps1 b/installers/build.ps1
@@ -13,7 +13,8 @@ param (
 	[switch] $skipMac,
 	[switch] $skipLinux,
     [switch] $signOutput,
-	$version='1.0.0.0'
+	$version='1.0.0.0',
+    $releaseDate=([DateTime]::Now.ToShortDateString())
 )
 
 Set-PSDebug -Strict
@@ -88,7 +89,7 @@ Press Enter *after* you have signed the bundle...
 
 if (-not $skipWindows) {
     Write-Verbose 'Starting Windows build...'
-    .\Windows\build.ps1 -version $version -signOutput:$signOutput
+    .\Windows\build.ps1 -version $version -releaseDate $releaseDate -signOutput:$signOutput
     if ($lastexitcode -ne 0) {
         Write-Verbose 'Aborting Windows build...'
         exit $lastexitcode
@@ -97,7 +98,7 @@ if (-not $skipWindows) {
 
 if (-not $skipMac) {
     Write-Verbose 'Starting macOS build...'
-    .\macOS\build.ps1 -signOutput:$signOutput
+    .\macOS\build.ps1 -version $version -releaseDate $releaseDate -signOutput:$signOutput
     if ($lastexitcode -ne 0) {
         Write-Verbose 'Aborting macOS build...'
         exit $lastexitcode
@@ -106,7 +107,7 @@ if (-not $skipMac) {
 
 if (-not $skipLinux) {
     Write-Verbose 'Starting Linux build...'
-    .\Linux\build.ps1
+    .\Linux\build.ps1 -version $version -releaseDate $releaseDate
     if ($lastexitcode -ne 0) {
         Write-Verbose 'Aborting Linux build...'
         exit $lastexitcode
diff --git a/installers/macOS/build.ps1 b/installers/macOS/build.ps1
@@ -3,7 +3,9 @@
 #
 param (
     [switch] $forceTracerRebuild,
-    [switch] $signOutput
+    [switch] $signOutput,
+	$version='1.0.0.0',
+    $releaseDate=([DateTime]::Now.ToShortDateString())
 )
 
 Set-PSDebug -Strict
@@ -24,13 +26,14 @@ if ($forceTracerRebuild -or (-not (Test-DotNetTracer $codePulsePath $buildConfig
 }
 
 Invoke-CodePulsePackaging `
-    $codePulseVersion `
+    $version `
+    $releaseDate `
     $PSScriptRoot `
     $codePulsePath `
     'macOS' `
     'osx-x64' `
     'packageEmbeddedOsx' `
-    "CodePulse-$($codePulseVersion)-SNAPSHOT-osx.zip" `
+    "CodePulse-$($version)-osx.zip" `
     'Code Pulse.app\Contents\Resources\app.nw\dotnet-symbol-service' `
     'SymbolService' `
     'Code Pulse.app\Contents\Resources\app.nw\agent.jar'
@@ -70,7 +73,7 @@ Invoke-CodePulseZip `
     $PSScriptRoot `
     'macOS' `
     'macOS-x64' `
-    $codePulseVersion `
+    $version `
     $zipFilePath `
     'Files\macOS'
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`val baseSettings = Seq(`
`2`	`2`	`organization := "com.codedx",`
`3`		`- version := "2.0.0-SNAPSHOT",`
`4`		`- BuildKeys.releaseDate := "SNAPSHOT"`
	`3`	`+ version := "UNVERSIONED",`
	`4`	`+ BuildKeys.releaseDate := "N/A"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`val scalaSettings = Seq(`