mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-08 16:25:48 +00:00
Code Activity

nit fixes

Browse source
This commit is contained in:
jofleish 2022-08-23 11:43:50 -04:00
parent 1e3709d737
commit 5854bcb92f
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/mk_util.py
View file

@ -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.') 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): 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 # We need to give the assembly a build specific version
# global version overrides local default expression # global version overrides local default expression
if not ASSEMBLY_VERSION is None: if ASSEMBLY_VERSION is not None:
versionSplits = ASSEMBLY_VERSION.split('.') versionSplits = ASSEMBLY_VERSION.split('.')
if len(versionSplits) > 3: if len(versionSplits) > 3:
VER_MAJOR = versionSplits[0] VER_MAJOR = versionSplits[0]
@ -1718,7 +1718,7 @@ class DotNetDLLComponent(Component):
version = get_version_string(4) 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"> core_csproj_str = f"""<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>

6
scripts/mk_win_dist.py
View file

@ -63,7 +63,7 @@ def display_help():
print(" -s, --silent do not print verbose messages.") 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(" -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(" -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(" --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(" --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.") 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] opts = ["python", os.path.join('scripts', 'mk_make.py'), parallel, "-b", path]
if DOTNET_CORE_ENABLED: if DOTNET_CORE_ENABLED:
opts.append('--dotnet') opts.append('--dotnet')
if not DOTNET_KEY_FILE is None: if DOTNET_KEY_FILE is not None:
opts.append('--dotnet-key=' + DOTNET_KEY_FILE) 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) opts.append('--assembly-version='+ASSEMBLY_VERSION)
if JAVA_ENABLED: if JAVA_ENABLED:
opts.append('--java') opts.append('--java')

4
scripts/nightly.yaml
View file

@ -8,7 +8,6 @@ variables:
stages: stages:
- stage: Build - stage: Build
jobs: jobs:
- job: Mac - job: Mac
displayName: "Mac Build" displayName: "Mac Build"
pool: pool:
@ -23,7 +22,6 @@ stages:
artifactName: 'Mac' artifactName: 'Mac'
targetPath: $(Build.ArtifactStagingDirectory) targetPath: $(Build.ArtifactStagingDirectory)
- job: MacArm64 - job: MacArm64
displayName: "Mac ARM64 Build" displayName: "Mac ARM64 Build"
pool: pool:
@ -37,7 +35,6 @@ stages:
artifactName: 'MacArm64' artifactName: 'MacArm64'
targetPath: $(Build.ArtifactStagingDirectory) targetPath: $(Build.ArtifactStagingDirectory)
- job: Ubuntu - job: Ubuntu
displayName: "Ubuntu build" displayName: "Ubuntu build"
pool: pool:
@ -124,7 +121,6 @@ stages:
# artifactName: '$(name)Build' # artifactName: '$(name)Build'
# targetPath: $(Build.ArtifactStagingDirectory) # targetPath: $(Build.ArtifactStagingDirectory)
- job: Windows32 - job: Windows32
displayName: "Windows 32-bit build" displayName: "Windows 32-bit build"
pool: pool: