Artifact packaging

hozuki · May 30, 2020 · ab642f6 · ab642f6
1 parent 2851969
commit ab642f6
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/scripts/configure-cmake-ubuntu.ps1 b/scripts/configure-cmake-ubuntu.ps1
@@ -84,7 +84,8 @@ $cmakeParams.AddRange([System.Linq.Enumerable]::Select(
 
 $cmakeParams.AddRange([String[]]@("-DCMAKE_BUILD_TYPE=MinSizeRel", "../.."))
 
-Write-Host "CMake parameters: ${[String]::Join(" ", $cmakeParams)}"
+$cmakeParamsLit = [String]::Join(' ', $cmakeParams)
+Write-Host "CMake parameters: $cmakeParamsLit"
 
 & cmake $cmakeParams.ToArray()
 

diff --git a/scripts/configure-cmake-win.ps1 b/scripts/configure-cmake-win.ps1
@@ -85,6 +85,7 @@ else
     $cmakeParams.AddRange([String[]]@("-G", "`"$generator`"", "..\.."))
 }
 
-Write-Host "CMake parameters: ${[String]::Join(" ", $cmakeParams)}"
+$cmakeParamsLit = [String]::Join(' ', $cmakeParams)
+Write-Host "CMake parameters: $cmakeParamsLit"
 
 & cmake $cmakeParams.ToArray()
diff --git a/scripts/package-artifacts-common.ps1 b/scripts/package-artifacts-common.ps1
@@ -0,0 +1,15 @@
+function Copy-CommonTextFilesTo([String] $destDir)
+{
+    $sourceFiles = @{ }
+    $sourceFiles.Add((Join-Path $PSScriptRoot "../README.md" -Resolve), "README-libcgss.md")
+    $sourceFiles.Add((Join-Path $PSScriptRoot "../LICENSE.md" -Resolve), "LICENSE-libcgss.md")
+    $sourceFiles.Add((Join-Path $PSScriptRoot, "../lib/vgaudio-cpp/README.md" -Resolve), "README-libvgaudio.md")
+    $sourceFiles.Add((Join-Path $PSScriptRoot, "../lib/vgaudio-cpp/LICENSE.txt" -Resolve), "LICENSE-libvgaudio.txt")
+    $sourceFiles.Add((Join-Path $PSScriptRoot, "../lib/vgaudio-cpp/ext/zlib/README" -Resolve), "README-zlib")
+
+    foreach ($srcFile in $sourceFiles)
+    {
+        [String]$dstFile = Join-Path $destDir $sourceFiles[$srcFile]
+        Copy-Item $srcFile $dstFile
+    }
+}
diff --git a/scripts/package-artifacts-ubuntu.ps1 b/scripts/package-artifacts-ubuntu.ps1
@@ -19,13 +19,17 @@ function Get-UbuntuCodeName()
     return "ubuntu_unknown"
 }
 
+. (Join-Path $PSScriptRoot "package-artifacts-common.ps1" -Resolve)
+
 Set-Location $env:APPVEYOR_BUILD_FOLDER
 
 # Detected in common_defines.cmake; but Ubuntu 18.04+ only supports 64-bit apps so it's a constant
 [String]$cmakeArch = "x64"
 # Set in build.sh
 [String]$cmakeBuildType = "MinSizeRel"
 
+Copy-CommonTextFilesTo((Join-Path $PSScriptRoot "../bin/$cmakeArch/$cmakeBuildType" -Resolve))
+
 & 7z a libcgss.zip -r "bin/$cmakeArch/$cmakeBuildType/*"
 
 [String]$osCodeName = Get-UbuntuCodeName

diff --git a/scripts/package-artifacts-win.ps1 b/scripts/package-artifacts-win.ps1
@@ -39,18 +39,9 @@ switch ($workerImage)
 
 [String]$configuration = $Env:CONFIGURATION;
 
-function Invoke-CommandLine([String]$Command)
-{
-    [ScriptBlock]$script = [ScriptBlock]::Create($Command);
-    Invoke-Command -ScriptBlock $script
-}
+Copy-CommonTextFilesTo((Join-Path $PSScriptRoot "..\bin\$buildArch\$configuration" -Resolve))
 
-$7zcmd = "7z a libcgss.zip -r bin\$buildArch\$configuration\*.exe";
-Invoke-CommandLine -Command $7zcmd
-$7zcmd = "7z a libcgss.zip -r bin\$buildArch\$configuration\*.dll";
-Invoke-CommandLine -Command $7zcmd
-$7zcmd = "7z a libcgss.zip -r bin\$buildArch\$configuration\*.lib";
-Invoke-CommandLine -Command $7zcmd
+& 7z a libcgss.zip -r "bin\$buildArch\$configuration\*"
 
 [String]$buildVersion = $Env:APPVEYOR_BUILD_VERSION
 [String]$osCodeName = "win";