mirror of
https://github.com/Z3Prover/z3
synced 2025-05-07 15:55:46 +00:00
nit fixes
This commit is contained in:
parent
1e3709d737
commit
5854bcb92f
3 changed files with 6 additions and 10 deletions
|
@ -541,11 +541,11 @@ def find_c_compiler():
|
|||
raise MKException('C compiler was not found. Try to set the environment variable CC with the C compiler available in your system.')
|
||||
|
||||
def set_version(major, minor, build, revision):
|
||||
global ASSEMBLY_VERSION,VER_MAJOR, VER_MINOR, VER_BUILD, VER_TWEAK, GIT_DESCRIBE
|
||||
global ASSEMBLY_VERSION, VER_MAJOR, VER_MINOR, VER_BUILD, VER_TWEAK, GIT_DESCRIBE
|
||||
|
||||
# We need to give the assembly a build specific version
|
||||
# global version overrides local default expression
|
||||
if not ASSEMBLY_VERSION is None:
|
||||
if ASSEMBLY_VERSION is not None:
|
||||
versionSplits = ASSEMBLY_VERSION.split('.')
|
||||
if len(versionSplits) > 3:
|
||||
VER_MAJOR = versionSplits[0]
|
||||
|
@ -1718,7 +1718,7 @@ class DotNetDLLComponent(Component):
|
|||
|
||||
version = get_version_string(4)
|
||||
|
||||
print(f'Version output to csproj: {version}')
|
||||
print(f"Version output to csproj: {version}")
|
||||
|
||||
core_csproj_str = f"""<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
|
|
|
@ -63,7 +63,7 @@ def display_help():
|
|||
print(" -s, --silent do not print verbose messages.")
|
||||
print(" -b <sudir>, --build=<subdir> subdirectory where x86 and x64 Z3 versions will be built (default: build-dist).")
|
||||
print(" -f, --force force script to regenerate Makefiles.")
|
||||
print(" --assembly-version assembly version for dll")
|
||||
print(" --assembly-version assembly version for dll")
|
||||
print(" --nodotnet do not include .NET bindings in the binary distribution files.")
|
||||
print(" --dotnet-key=<file> strongname sign the .NET assembly with the private key in <file>.")
|
||||
print(" --nojava do not include Java bindings in the binary distribution files.")
|
||||
|
@ -136,9 +136,9 @@ def mk_build_dir(path, x64):
|
|||
opts = ["python", os.path.join('scripts', 'mk_make.py'), parallel, "-b", path]
|
||||
if DOTNET_CORE_ENABLED:
|
||||
opts.append('--dotnet')
|
||||
if not DOTNET_KEY_FILE is None:
|
||||
if DOTNET_KEY_FILE is not None:
|
||||
opts.append('--dotnet-key=' + DOTNET_KEY_FILE)
|
||||
if not ASSEMBLY_VERSION is None:
|
||||
if ASSEMBLY_VERSION is not None:
|
||||
opts.append('--assembly-version='+ASSEMBLY_VERSION)
|
||||
if JAVA_ENABLED:
|
||||
opts.append('--java')
|
||||
|
|
|
@ -8,7 +8,6 @@ variables:
|
|||
stages:
|
||||
- stage: Build
|
||||
jobs:
|
||||
|
||||
- job: Mac
|
||||
displayName: "Mac Build"
|
||||
pool:
|
||||
|
@ -23,7 +22,6 @@ stages:
|
|||
artifactName: 'Mac'
|
||||
targetPath: $(Build.ArtifactStagingDirectory)
|
||||
|
||||
|
||||
- job: MacArm64
|
||||
displayName: "Mac ARM64 Build"
|
||||
pool:
|
||||
|
@ -37,7 +35,6 @@ stages:
|
|||
artifactName: 'MacArm64'
|
||||
targetPath: $(Build.ArtifactStagingDirectory)
|
||||
|
||||
|
||||
- job: Ubuntu
|
||||
displayName: "Ubuntu build"
|
||||
pool:
|
||||
|
@ -124,7 +121,6 @@ stages:
|
|||
# artifactName: '$(name)Build'
|
||||
# targetPath: $(Build.ArtifactStagingDirectory)
|
||||
|
||||
|
||||
- job: Windows32
|
||||
displayName: "Windows 32-bit build"
|
||||
pool:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue