3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-03 09:50:23 +00:00

revert print formatting for Mac build

This commit is contained in:
jofleish 2022-08-23 12:06:13 -04:00
parent 5854bcb92f
commit 9901391b8a

View file

@ -1718,9 +1718,10 @@ class DotNetDLLComponent(Component):
version = get_version_string(4) version = get_version_string(4)
print(f"Version output to csproj: {version}") print("Version output to csproj:", version)
core_csproj_str = """<Project Sdk="Microsoft.NET.Sdk">
core_csproj_str = f"""<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard1.4</TargetFramework> <TargetFramework>netstandard1.4</TargetFramework>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>
@ -1731,7 +1732,7 @@ class DotNetDLLComponent(Component):
<PackageId>Microsoft.Z3</PackageId> <PackageId>Microsoft.Z3</PackageId>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion> <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<Version>{version}</Version> <Version>%s</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Microsoft</Authors> <Authors>Microsoft</Authors>
<Company>Microsoft</Company> <Company>Microsoft</Company>
@ -1739,14 +1740,14 @@ class DotNetDLLComponent(Component):
<Description>Z3 is a satisfiability modulo theories solver from Microsoft Research.</Description> <Description>Z3 is a satisfiability modulo theories solver from Microsoft Research.</Description>
<Copyright>Copyright Microsoft Corporation. All rights reserved.</Copyright> <Copyright>Copyright Microsoft Corporation. All rights reserved.</Copyright>
<PackageTags>smt constraint solver theorem prover</PackageTags> <PackageTags>smt constraint solver theorem prover</PackageTags>
{key} %s
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\{self.to_src_dir}\*.cs;*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" /> <Compile Include="..\%s\*.cs;*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
</ItemGroup> </ItemGroup>
</Project>""" </Project>""" % (version, key, self.to_src_dir)
mk_dir(os.path.join(BUILD_DIR, 'dotnet')) mk_dir(os.path.join(BUILD_DIR, 'dotnet'))
csproj = os.path.join('dotnet', 'z3.csproj') csproj = os.path.join('dotnet', 'z3.csproj')
@ -2850,7 +2851,7 @@ def update_version():
build = VER_BUILD build = VER_BUILD
revision = VER_TWEAK revision = VER_TWEAK
print(f"UpdateVersion: {major}.{minor}.{build}.{revision}"); print("UpdateVersion:", get_full_version_string(major, minor, build, revision))
if major is None or minor is None or build is None or revision is None: if major is None or minor is None or build is None or revision is None:
raise MKException("set_version(major, minor, build, revision) must be used before invoking update_version()") raise MKException("set_version(major, minor, build, revision) must be used before invoking update_version()")