vs: add CLI x64 to scripts

.github/workflows/vs-win.yml

@@ -35,31 +35,38 @@ jobs:
 
       - name: Prepare files for packaging
         shell: powershell
-        run: powershell -ExecutionPolicy Bypass -NoProfile -File .\msvc-build.ps1 PackageTmp
+        run: powershell -ExecutionPolicy Bypass -NoProfile -File .\msvc-build.ps1 PackageArtifacts
 
-      - name: Upload foobar2000 component artifact
+      # upload to "actions" tab artifacts (can only make a single .zip from a dir's files)
+      - name: Upload foobar2000 component 32-bit artifact
         uses: actions/upload-artifact@v3
         with:
           name: foo_input_vgmstream.fb2k-component
-          path: ${{github.workspace}}\tmp\fb2k
+          path: ${{github.workspace}}\bin\artifacts\foobar2000-x32
 
-      - name: Upload CLI tools artifact
+      - name: Upload CLI tools 32-bit artifact
         uses: actions/upload-artifact@v3
         with:
           name: vgmstream-win
-          path: ${{github.workspace}}\tmp\cli
+          path: ${{github.workspace}}\bin\artifacts\cli-x32
 
-      - name: Upload foobar2000 component debug symbols artifact
+      - name: Upload CLI tools 64-bit artifact
         uses: actions/upload-artifact@v3
         with:
-          name: foo_input_vgmstream.pdb
-          path: ${{github.workspace}}\tmp\fb2k-p
+          name: vgmstream-win64
+          path: ${{github.workspace}}\bin\artifacts\cli-x64
 
-      - name: Upload CLI tools debug symbols artifact
+      - name: debug symbols artifact
         uses: actions/upload-artifact@v3
         with:
-          name: vgmstream-win.pdb
-          path: ${{github.workspace}}\tmp\cli-p
+          name: debug-symbols-pdb-32
+          path: ${{github.workspace}}\bin\artifacts\pdb-x32
+
+      - name: debug symbols artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: debug-symbols-pdb-64
+          path: ${{github.workspace}}\bin\artifacts\pdb-x64
 
       # uploads current assets to vgmstream-releases (token only works on merges)
       - name: Upload artifacts to vgmstream-releases

msvc-build.ps1

@@ -1,7 +1,7 @@
 [CmdletBinding()]
 Param(
     [Parameter(Position=0, mandatory=$true)]
-    [ValidateSet("Init", "Build", "Rebuild", "Clean", "Package", "PackageTmp")]
+    [ValidateSet("Init", "Build", "Rebuild", "Clean", "Package", "PackageArtifacts")]
     [string]$Task
 )
 
@@ -184,9 +184,9 @@ function Clean
 
     Remove-Item -Path "Debug" -Recurse -ErrorAction Ignore
     Remove-Item -Path "Release" -Recurse -ErrorAction Ignore
+    Remove-Item -Path "x64" -Recurse -ErrorAction Ignore
 
     Remove-Item -Path "bin" -Recurse -ErrorAction Ignore
-    Remove-Item -Path "tmp" -Recurse -ErrorAction Ignore
 
     Remove-Item "msvc-build.log" -ErrorAction Ignore
 }
@@ -268,20 +268,26 @@ function MakePackage
 }
 
 
-# for github actions/artifact uploads, that use a dir with files
-function MakePackageTmp
+# github actions/artifact uploads config, that need a dir with files to make an .zip artifact (don't allow single/pre-zipped files)
+function MakePackageArtifacts
 {
-    MakePackage
+    #MakePackage
 
-    mkdir -Force tmp/cli
-    mkdir -Force tmp/fb2k
-    mkdir -Force tmp/cli-p
-    mkdir -Force tmp/fb2k-p
+    mkdir -Force bin/artifacts/cli-x32
+    mkdir -Force bin/artifacts/cli-x64
+    mkdir -Force bin/artifacts/foobar2000-x32
+    #mkdir -Force bin/artifacts/foobar2000-x64
+    mkdir -Force bin/artifacts/pdb-x32
+    mkdir -Force bin/artifacts/pdb-x64
 
-    Copy-Item $cliFiles32 tmp/cli/ -Recurse -Force
-    Copy-Item $fb2kFiles32 tmp/fb2k/ -Recurse -Force
-    Copy-Item $cliPdbFiles tmp/cli-p/ -Recurse -Force
-    Copy-Item $fb2kPdbFiles tmp/fb2k-p/ -Recurse -Force
+    Copy-Item $cliFiles32 bin/artifacts/cli-x32/ -Recurse -Force
+    Copy-Item $cliFiles64 bin/artifacts/cli-x64/ -Recurse -Force
+    Copy-Item $fb2kFiles32 bin/artifacts/foobar2000-x32/ -Recurse -Force
+    #Copy-Item $fb2kFiles64 bin/artifacts/foobar2000-x64/ -Recurse -Force
+    Copy-Item $cliPdbFiles32 bin/artifacts/pdb-x32/ -Recurse -Force
+    Copy-Item $fb2kPdbFiles32 bin/artifacts/pdb-x32/ -Recurse -Force
+    Copy-Item $cliPdbFiles64 bin/artifacts/pdb-x64/ -Recurse -Force
+    #Copy-Item $fb2kPdbFiles64 bin/artifacts/pdb-x64/ -Recurse -Force
 }
 
 
@@ -292,5 +298,5 @@ switch ($Task)
     "Rebuild" { Rebuild }
     "Clean" { Clean }
     "Package" { MakePackage }
-    "PackageTmp" { MakePackageTmp }
+    "PackageArtifacts" { MakePackageArtifacts }
 }