WiP: tweak versioning in windows builds

scripts/mk_project.py

@@ -7,12 +7,17 @@
 ############################################
 from mk_util import *
 
-def init_version():
-    set_version(4, 8, 16, 0)
+DEFAULT_major = 4;
+DEFAULT_minor = 8
+DEFAULT_patch = 16
+DEFAULT_tweak = 0
+
+def init_version(major=DEFAULT_major, minor=DEFAULT_minor, patch=DEFAULT_patch, revision=DEFAULT_tweak):
+    set_version(major, minor, patch, revision)
     
 # Z3 Project definition
 def init_project_def():
-    init_version()
+    init_version(VER_MAJOR, VER_MINOR, VER_BUILD, VER_TWEAK)
     add_lib('util', [], includes2install = ['z3_version.h'])
     add_lib('polynomial', ['util'], 'math/polynomial')
     add_lib('interval', ['util'], 'math/interval')

scripts/mk_win_dist.py

@@ -74,7 +74,7 @@ def display_help():
 
 # Parse configuration option for mk_make script
 def parse_options():
-    global FORCE_MK, JAVA_ENABLED, ZIP_BUILD_OUTPUTS, GIT_HASH, DOTNET_CORE_ENABLED, DOTNET_KEY_FILE, PYTHON_ENABLED, X86ONLY, X64ONLY
+    global FORCE_MK, JAVA_ENABLED, ZIP_BUILD_OUTPUTS, GIT_HASH, DOTNET_CORE_ENABLED, DOTNET_KEY_FILE, PYTHON_ENABLED, X86ONLY, X64ONLY, VER_MAJOR, VER_MINOR, VER_BUILD, VER_TWEAK
     path = BUILD_DIR
     options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:hsf', ['build=',
                                                                    'help',
@@ -116,6 +116,14 @@ def parse_options():
             X86ONLY = True
         elif opt == '--x64-only' and not X86ONLY:
             X64ONLY = True
+        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:
             raise MKException("Invalid command line option '%s'" % opt)
     set_build_dir(path)

scripts/nightly.yaml

@@ -102,6 +102,10 @@ stages:
             --x86-only
             --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk
             --zip
+            --major=$(Major)
+            --minor=$(Minor)
+            --patch=$(Patch)
+            --revision=$(Build.BuildId)
     - task: CopyFiles@2
       inputs:
         sourceFolder: dist
@@ -125,6 +129,10 @@ stages:
             --x64-only
             --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk
             --zip
+                --major=$(Major)
+            --minor=$(Minor)
+            --patch=$(Patch)
+            --revision=$(Build.BuildId)
     - task: CopyFiles@2
       inputs:
         sourceFolder: dist
@@ -474,8 +482,6 @@ stages:
     steps:
     - task: NuGetAuthenticate@0
       displayName: 'NuGet Authenticate'
-      inputs:
-        nuGetServiceConnections: Z3NightlyNuget
     - task: NuGetToolInstaller@0
       inputs:
         versionSpec: 5.x
@@ -494,14 +500,15 @@ stages:
       displayName: 'NuGet Nightly x64 push'
       inputs:
         command: push
-        publishVstsFeed: 'Z3 Public Nuget/Z3-Public-Nightly'
+        publishVstsFeed: 'Z3-Public-Nightly'
         packagesToPush: $(Agent.TempDirectory)/x64/*.nupkg
         allowPackageConflicts: true
+        continueOnError: true 
     - task: NuGetCommand@2
       displayName: 'NuGet Nightly x86 push'
       inputs:
         command: push
-        publishVstsFeed: 'Z3 Public Nuget/Z3-Public-Nightly'
+        publishVstsFeed: 'z3Build/Z3-Public-Nightly'
         packagesToPush: $(Agent.TempDirectory)/x86/*.nupkg
         allowPackageConflicts: true