From d56ceec6c61335ba7481ca83f567462d69f1ff17 Mon Sep 17 00:00:00 2001
From: jofleish <jofleish@microsoft.com>
Date: Wed, 23 Mar 2022 16:20:22 -0400
Subject: [PATCH] test tweak version in unix, et al

---
 scripts/mk_util.py   | 9 +++++++++
 scripts/nightly.yaml | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/scripts/mk_util.py b/scripts/mk_util.py
index e2d4aa53d..282b54036 100644
--- a/scripts/mk_util.py
+++ b/scripts/mk_util.py
@@ -687,6 +687,7 @@ def parse_options():
     global DOTNET_CORE_ENABLED, DOTNET_KEY_FILE, JAVA_ENABLED, ML_ENABLED, STATIC_LIB, STATIC_BIN, PREFIX, GMP, PYTHON_PACKAGE_DIR, GPROF, GIT_HASH, GIT_DESCRIBE, PYTHON_INSTALL_ENABLED, PYTHON_ENABLED
     global LINUX_X64, SLOW_OPTIMIZE, LOG_SYNC, SINGLE_THREADED
     global GUARD_CF, ALWAYS_DYNAMIC_BASE
+    global VER_MAJOR, VER_MINOR, VER_BUILD, VER_TWEAK
     try:
         options, remainder = getopt.gnu_getopt(sys.argv[1:],
                                                'b:df:sxhmcvtnp:gj',
@@ -762,6 +763,14 @@ def parse_options():
         elif opt == '--guardcf':
             GUARD_CF = True
             ALWAYS_DYNAMIC_BASE = True # /GUARD:CF requires /DYNAMICBASE
+        elif opt == '--major':
+            VER_MAJOR = arg
+        elif opt == '--minor':
+            VER_MINOR = arg
+        elif opt == '--patch':
+            VER_BUILD = arg
+        elif opt == '--revision':
+            VER_TWEAK = arg            
         else:
             print("ERROR: Invalid command line option '%s'" % opt)
             display_help(1)
diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index 89405113f..a3b9622f8 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -15,7 +15,7 @@ stages:
     pool:
       vmImage: "macOS-latest"
     steps:
-    - script: $(MacFlags) python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk
+    - script: $(MacFlags) python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --major=$(Major) --minor=$(Minor) --patch=$(Patch) --revision=$(Build.BuildId)
     - script: git clone https://github.com/z3prover/z3test z3test
     - script: python z3test/scripts/test_benchmarks.py build-dist/z3 z3test/regressions/smt2    
     - script: cp dist/*.zip $(Build.ArtifactStagingDirectory)/.
@@ -29,7 +29,7 @@ stages:
     pool:
       vmImage: "ubuntu-latest"
     steps:
-    - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk
+    - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --major=$(Major) --minor=$(Minor) --patch=$(Patch) --revision=$(Build.BuildId)
     - script: git clone https://github.com/z3prover/z3test z3test
     - script: python z3test/scripts/test_benchmarks.py build-dist/z3 z3test/regressions/smt2    
     - script: cp dist/*.zip $(Build.ArtifactStagingDirectory)/.
@@ -80,7 +80,7 @@ stages:
     variables:
       python: "/opt/python/cp37-cp37m/bin/python"
     steps:
-    - script: $(python) scripts/mk_unix_dist.py --nodotnet --nojava
+    - script: $(python) scripts/mk_unix_dist.py --nodotnet --nojava --major=$(Major) --minor=$(Minor) --patch=$(Patch) --revision=$(Build.BuildId) 
     - script: git clone https://github.com/z3prover/z3test z3test
     - script: $(python) z3test/scripts/test_benchmarks.py build-dist/z3 z3test/regressions/smt2
     - script: cp dist/*.zip $(Build.ArtifactStagingDirectory)/