diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py index 00f96f660..4604b2bfc 100644 --- a/scripts/mk_nuget_task.py +++ b/scripts/mk_nuget_task.py @@ -2,7 +2,7 @@ # Copyright (c) 2018 Microsoft Corporation # -# 1. download releases from github +# 1. copy over dlls # 2. copy over libz3.dll for the different architectures # 3. copy over Microsoft.Z3.dll from suitable distribution # 4. copy nuspec file from packages @@ -16,8 +16,6 @@ import sys import os.path import shutil import subprocess -import mk_util -import mk_project def mk_dir(d): if not os.path.exists(d): @@ -59,7 +57,7 @@ def unpack(packages): zip_ref = zipfile.ZipFile(path, 'r') zip_ref.extract("%s/bin/libz3.%s" % (package_dir, ext), "tmp") mk_dir("out/runtimes/%s/native" % dst) - shutil.move("tmp/%s/bin/libz3.%s" % (package_dir, ext), "out/runtimes/%s/native/." % dst, "/y") + shutil.move("tmp/%s/bin/libz3.%s" % (package_dir, ext), "out/runtimes/%s/native/." % dst) if "x64-win" in f: mk_dir("out/lib/netstandard1.4/") for b in ["Microsoft.Z3.dll"]: @@ -70,7 +68,7 @@ def mk_targets(): mk_dir("out/build") shutil.copy("../src/api/dotnet/Microsoft.Z3.targets.in", "out/build/Microsoft.Z3.targets") -def create_nuget_spec(): +def create_nuget_spec(release_version, release_commit): contents = """ @@ -156,13 +154,15 @@ def sign_nuget_package(): def main(): packages = sys.argv[1] + release_version = sys.argv[2] + release_commit = sys.argv[3] print(packages) mk_dir(packages) unpack(packages) mk_targets() - create_nuget_spec() + create_nuget_spec(release_version, release_commit) create_nuget_package() - sign_nuget_package() + sign_nuget_package(release_version) main() diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index bf141b4fd..d24a6bce2 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -90,7 +90,7 @@ jobs: targetPath: tmp - script: | cd scripts - python mk_nuget_task.py ../tmp + python mk_nuget_task.py ../tmp 4.8.7 3424ffa cd .. - job: Python