From 6396cfd6e7139f11a3f97fea2ad9aba113a5662e Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Wed, 1 Jun 2022 21:20:19 -0700 Subject: [PATCH] os Signed-off-by: Nikolaj Bjorner --- scripts/mk_unix_dist.py | 8 +++++++- scripts/nightly.yaml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/mk_unix_dist.py b/scripts/mk_unix_dist.py index 97de725e9..ca1d76975 100644 --- a/scripts/mk_unix_dist.py +++ b/scripts/mk_unix_dist.py @@ -28,6 +28,7 @@ JAVA_ENABLED=True GIT_HASH=False PYTHON_ENABLED=True MAKEJOBS=getenv("MAKEJOBS", '8') +OS_VERSION=None def set_verbose(flag): global VERBOSE @@ -58,13 +59,14 @@ def display_help(): print(" --dotnet-key= sign the .NET assembly with the private key in .") print(" --arch= set architecture (to arm64) to force arm64 build") print(" --nojava do not include Java bindings in the binary distribution files.") + print(" -os= set OS version.") print(" --nopython do not include Python bindings in the binary distribution files.") print(" --githash include git hash in the Zip file.") exit(0) # Parse configuration option for mk_make script def parse_options(): - global FORCE_MK, JAVA_ENABLED, GIT_HASH, DOTNET_CORE_ENABLED, DOTNET_KEY_FILE + global FORCE_MK, JAVA_ENABLED, GIT_HASH, DOTNET_CORE_ENABLED, DOTNET_KEY_FILE, OS_VERSION path = BUILD_DIR options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:hsf', ['build=', 'help', @@ -103,6 +105,8 @@ def parse_options(): mk_util.IS_ARCH_ARM64 = True else: raise MKException("Invalid architecture directive '%s'. Legal directives: arm64" % arg) + else if opt == '--os': + OS_VERSION = arg else: raise MKException("Invalid command line option '%s'" % opt) set_build_dir(path) @@ -154,6 +158,8 @@ def mk_z3(): return 1 def get_os_name(): + if OS_VERSION is not None: + return OS_VERSION import platform basic = os.uname()[0].lower() if basic == 'linux': diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index c60c92698..be071feb3 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -29,7 +29,7 @@ stages: pool: vmImage: "macOS-12" steps: - - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --arch=arm64 --nojava + - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --arch=arm64 --nojava --os=12.0 - script: git clone https://github.com/z3prover/z3test z3test - script: cp dist/*.zip $(Build.ArtifactStagingDirectory)/. - task: PublishPipelineArtifact@1