From 010d578e8f411da002067493aea394759fc66832 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Mon, 21 Dec 2020 18:08:23 -0800
Subject: [PATCH] sym file

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 scripts/mk_nuget_task.py | 18 ++++++++----------
 scripts/nightly.yaml     |  7 +++++++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py
index 28e090f44..8eae84de7 100644
--- a/scripts/mk_nuget_task.py
+++ b/scripts/mk_nuget_task.py
@@ -54,26 +54,27 @@ def unpack(packages, symbols):
     #    +- debian.8-x64
     #    +- macos
     # +
+    tmp = "tmp" if not symbols else "tmpsym"
     for f in os.listdir(packages):
         print(f)
         if f.endswith(".zip") and classify_package(f):
             os_name, package_dir, ext, dst = classify_package(f)
             path = os.path.abspath(os.path.join(packages, f))
             zip_ref = zipfile.ZipFile(path, 'r')
-            zip_ref.extract(f"{package_dir}/bin/libz3.{ext}", "tmp")
+            zip_ref.extract(f"{package_dir}/bin/libz3.{ext}", f"{tmp}")
             mk_dir(f"out/runtimes/{dst}/native")
-            replace(f"tmp/{package_dir}/bin/libz3.{ext}", f"out/runtimes/{dst}/native/libz3.{ext}")            
+            replace(f"{tmp}/{package_dir}/bin/libz3.{ext}", f"out/runtimes/{dst}/native/libz3.{ext}")            
             if "x64-win" in f:
                 mk_dir("out/lib/netstandard1.4/")
                 if symbols:
-                    zip_ref.extract(f"{package_dir}/bin/libz3.pdb", "tmp")
-                    replace(f"tmp/{package_dir}/bin/libz3.pdb", f"out/runtimes/{dst}/native/libz3.pdb") 
+                    zip_ref.extract(f"{package_dir}/bin/libz3.pdb", f"{tmp}")
+                    replace(f"{tmp}/{package_dir}/bin/libz3.pdb", f"out/runtimes/{dst}/native/libz3.pdb") 
                 files = ["Microsoft.Z3.dll"]                
                 if symbols:
                     files += ["Microsoft.Z3.pdb"]
                 for b in files:
-                    zip_ref.extract(f"{package_dir}/bin/{b}", "tmp")
-                    replace(f"tmp/{package_dir}/bin/{b}", f"out/lib/netstandard1.4/{b}")
+                    zip_ref.extract(f"{package_dir}/bin/{b}", f"{tmp}")
+                    replace(f"{tmp}/{package_dir}/bin/{b}", f"out/lib/netstandard1.4/{b}")
 
 def mk_targets(source_root):
     mk_dir("out/build")
@@ -111,9 +112,7 @@ Linux Dependencies:
     </metadata>
 </package>""".format(version, repo, branch, commit)
     print(contents)
-    sym = ""
-    if symbols:
-        sym = "sym."
+    sym = "sym." if symbols else ""
     file = f"out/Microsoft.Z3.x64.{sym}nuspec"
     print(file)
     with open(file, 'w') as f:
@@ -131,7 +130,6 @@ def main():
         print(sys.argv[7])
     if len(sys.argv) > 7 and "symbols" == sys.argv[7]:
         symbols = True
-    print(symbols)
     print(packages)
     mk_dir(packages)
     unpack(packages, symbols)
diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index b8633142d..57ab85291 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -222,30 +222,37 @@ stages:
     displayName: "Deploy into GitHub"
     steps:
     - task: DownloadPipelineArtifact@2
+      displayName: "Download windows32"
       inputs:
         artifactName: 'Windows32'
         targetPath: tmp
     - task: DownloadPipelineArtifact@2
+      displayName: "Download windows64"
       inputs:
         artifactName: 'Windows64'
         targetPath: tmp
     - task: DownloadPipelineArtifact@2
+      displayName: "Download Mac"
       inputs:
         artifactName: 'Mac'
         targetPath: tmp
     - task: DownloadPipelineArtifact@2
+      displayName: "Download Ubuntu"
       inputs:
         artifactName: 'Ubuntu'
         targetPath: tmp
     - task: DownloadPipelineArtifact@2
+      displayName: "Download Python"
       inputs:
         artifactName: 'Python packages'
         targetPath: tmp
     - task: DownloadPipelineArtifact@2
+      displayName: "Download NuGet"
       inputs:
         artifactName: 'NuGet'
         targetPath: tmp
     - task: DownloadPipelineArtifact@2
+      displayName: "Download SNuGet - with symbols"
       inputs:
         artifactName: 'SNuGet'
         targetPath: tmp