Skip to content

Commit

Permalink
Merge pull request #274 from tannergooding/v13.0.0
Browse files Browse the repository at this point in the history
Updating to Clang v13.0.0
  • Loading branch information
tannergooding authored Oct 10, 2021
2 parents 20d281c + aecf317 commit 38747b8
Show file tree
Hide file tree
Showing 203 changed files with 488 additions and 255 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.13)

project(ClangSharp VERSION 12.0.0)
project(ClangSharp VERSION 13.0.0)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<ContinuousIntegrationBuild Condition="'$(BUILD_BUILDNUMBER)' != ''">true</ContinuousIntegrationBuild>
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
<Product>ClangSharp</Product>
<VersionPrefix>12.0.0</VersionPrefix>
<VersionSuffix>beta3</VersionSuffix>
<VersionPrefix>13.0.0</VersionPrefix>
<VersionSuffix>beta1</VersionSuffix>
<VersionSuffix Condition="'$(BUILD_REASON)' == 'PullRequest'">pr</VersionSuffix>
</PropertyGroup>

Expand Down
8 changes: 4 additions & 4 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@

<!-- Package versions for package references across all projects -->
<ItemGroup>
<PackageReference Update="libClang" Version="12.0.0" />
<PackageReference Update="libClangSharp" Version="12.0.0-beta1" />
<PackageReference Update="libClang" Version="13.0.1" />
<PackageReference Update="libClangSharp" Version="13.0.0-beta1" />
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
<PackageReference Update="System.CommandLine" Version="2.0.0-beta1.21216.1" />
<PackageReference Update="System.CommandLine" Version="2.0.0-beta1.21308.1" />
<PackageReference Update="System.Memory" Version="4.5.4" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Building this requires [CMake 3.13 or later](https://cmake.org/download/) as wel

To succesfully build `libClangSharp` you must first build Clang (https://clang.llvm.org/get_started.html). The process done on Windows is roughly:
```cmd
git clone --single-branch --branch llvmorg-12.0.0 https://github.com/llvm/llvm-project
git clone --single-branch --branch llvmorg-13.0.0 https://github.com/llvm/llvm-project
cd llvm-project
mkdir artifacts/bin
cd artifacts/bin
Expand All @@ -90,7 +90,7 @@ git clone https://github.com/microsoft/clangsharp
cd clangsharp
mkdir artifacts/bin/native
cd artifacts/bin/native
cmake -DPATH_TO_LLVM=/usr/lib/llvm/12/ ../../..
cmake -DPATH_TO_LLVM=/usr/lib/llvm/13/ ../../..
make
```

Expand All @@ -100,7 +100,7 @@ git clone https://github.com/microsoft/clangsharp
cd clangsharp
mkdir artifacts/bin/native
cd artifacts/bin/native
cmake -DPATH_TO_LLVM=/usr/lib/llvm/12/ -G Ninja ../../..
cmake -DPATH_TO_LLVM=/usr/lib/llvm/13/ -G Ninja ../../..
ninja
```

Expand All @@ -110,7 +110,7 @@ This program will take a given set of C or C++ header files and generate C# bind

The simplest and recommended setup is to install the generator as a .NET tool and then use response files:
```
dotnet tool install --global ClangSharpPInvokeGenerator --version 12.0.0-beta1
dotnet tool install --global ClangSharpPInvokeGenerator --version 13.0.0-beta1
ClangSharpPInvokeGenerator @generate.rsp
```

Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.freebsd.11-x64</id>
<version>12.0.0-beta1</version>
<id>libClangSharp.runtime.freebsd.12-x64</id>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">NCSA</license>
<projectUrl>https://github.com/microsoft/clangsharp</projectUrl>
<description>freebsd 11 x64 native library for libClangSharp.</description>
<description>freebsd 12 x64 native library for libClangSharp.</description>
<copyright>Copyright © Microsoft and Contributors</copyright>
<repository type="git" url="https://github.com/microsoft/clangsharp" branch="main" />
</metadata>
<files>
<file src="..\libClangSharp\LICENSE.TXT" target="LICENSE.TXT" />
<file src="..\libClangSharp\NOTICE.TXT" target="NOTICE.TXT" />
<file src="libClangSharp.so" target="runtimes\freebsd.11-x64\native\libClangSharp.so" />
<file src="libClangSharp.so" target="runtimes\freebsd.12-x64\native\libClangSharp.so" />
</files>
</package>
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.freebsd.11-x86</id>
<version>12.0.0-beta1</version>
<id>libClangSharp.runtime.freebsd.12-x86</id>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">NCSA</license>
<projectUrl>https://github.com/microsoft/clangsharp</projectUrl>
<description>freebsd 11 x86 native library for libClangSharp.</description>
<description>freebsd 12 x86 native library for libClangSharp.</description>
<copyright>Copyright © Microsoft and Contributors</copyright>
<repository type="git" url="https://github.com/microsoft/clangsharp" branch="main" />
</metadata>
<files>
<file src="..\libClangSharp\LICENSE.TXT" target="LICENSE.TXT" />
<file src="..\libClangSharp\NOTICE.TXT" target="NOTICE.TXT" />
<file src="libClangSharp.so" target="runtimes\freebsd.11-x86\native\libClangSharp.so" />
<file src="libClangSharp.so" target="runtimes\freebsd.12-x86\native\libClangSharp.so" />
</files>
</package>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.freebsd.13-x64</id>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">NCSA</license>
<projectUrl>https://github.com/microsoft/clangsharp</projectUrl>
<description>freebsd 13 x64 native library for libClangSharp.</description>
<copyright>Copyright © Microsoft and Contributors</copyright>
<repository type="git" url="https://github.com/microsoft/clangsharp" branch="main" />
</metadata>
<files>
<file src="..\libClangSharp\LICENSE.TXT" target="LICENSE.TXT" />
<file src="..\libClangSharp\NOTICE.TXT" target="NOTICE.TXT" />
<file src="libClangSharp.so" target="runtimes\freebsd.13-x64\native\libClangSharp.so" />
</files>
</package>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.freebsd.13-x86</id>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">NCSA</license>
<projectUrl>https://github.com/microsoft/clangsharp</projectUrl>
<description>freebsd 13 x86 native library for libClangSharp.</description>
<copyright>Copyright © Microsoft and Contributors</copyright>
<repository type="git" url="https://github.com/microsoft/clangsharp" branch="main" />
</metadata>
<files>
<file src="..\libClangSharp\LICENSE.TXT" target="LICENSE.TXT" />
<file src="..\libClangSharp\NOTICE.TXT" target="NOTICE.TXT" />
<file src="libClangSharp.so" target="runtimes\freebsd.13-x86\native\libClangSharp.so" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.linux-arm</id>
<version>12.0.0-beta1</version>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.linux-arm64</id>
<version>12.0.0-beta1</version>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.osx-x64</id>
<version>12.0.0-beta1</version>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.ubuntu.18.04-x64</id>
<version>12.0.0-beta1</version>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.ubuntu.20.04-x64</id>
<version>12.0.0-beta1</version>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.ubuntu.21.04-x64</id>
<version>12.0.0-beta1</version>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.win-arm64</id>
<version>12.0.0-beta1</version>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.win-x64</id>
<version>12.0.0-beta1</version>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp.runtime.win-x86</id>
<version>12.0.0-beta1</version>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down
2 changes: 1 addition & 1 deletion packages/libClangSharp/libClangSharp/libClangSharp.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libClangSharp</id>
<version>12.0.0-beta1</version>
<version>13.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down
36 changes: 23 additions & 13 deletions packages/libClangSharp/libClangSharp/runtime.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,68 @@
{
"runtimes": {
"freebsd.11-x64": {
"freebsd.12-x64": {
"libClangSharp": {
"libClangSharp.runtime.freebsd.11-x64": "12.0.0-beta1"
"libClangSharp.runtime.freebsd.12-x64": "13.0.0-beta1"
}
},
"freebsd.11-x86": {
"freebsd.12-x86": {
"libClangSharp": {
"libClangSharp.runtime.freebsd.11-x86": "12.0.0-beta1"
"libClangSharp.runtime.freebsd.12-x86": "13.0.0-beta1"
}
},
"freebsd.13-x64": {
"libClangSharp": {
"libClangSharp.runtime.freebsd.13-x64": "13.0.0-beta1"
}
},
"freebsd.13-x86": {
"libClangSharp": {
"libClangSharp.runtime.freebsd.13-x86": "13.0.0-beta1"
}
},
"linux-arm": {
"libClangSharp": {
"libClangSharp.runtime.linux-arm": "12.0.0-beta1"
"libClangSharp.runtime.linux-arm": "13.0.0-beta1"
}
},
"linux-arm64": {
"libClangSharp": {
"libClangSharp.runtime.linux-arm64": "12.0.0-beta1"
"libClangSharp.runtime.linux-arm64": "13.0.0-beta1"
}
},
"osx-x64": {
"libClangSharp": {
"libClangSharp.runtime.osx-x64": "12.0.0-beta1"
"libClangSharp.runtime.osx-x64": "13.0.0-beta1"
}
},
"ubuntu.18.04-x64": {
"libClangSharp": {
"libClangSharp.runtime.ubuntu.18.04-x64": "12.0.0-beta1"
"libClangSharp.runtime.ubuntu.18.04-x64": "13.0.0-beta1"
}
},
"ubuntu.20.04-x64": {
"libClangSharp": {
"libClangSharp.runtime.ubuntu.20.04-x64": "12.0.0-beta1"
"libClangSharp.runtime.ubuntu.20.04-x64": "13.0.0-beta1"
}
},
"ubuntu.21.04-x64": {
"libClangSharp": {
"libClangSharp.runtime.ubuntu.21.04-x64": "12.0.0-beta1"
"libClangSharp.runtime.ubuntu.21.04-x64": "13.0.0-beta1"
}
},
"win-arm64": {
"libClangSharp": {
"libClangSharp.runtime.win-arm64": "12.0.0-beta1"
"libClangSharp.runtime.win-arm64": "13.0.0-beta1"
}
},
"win-x64": {
"libClangSharp": {
"libClangSharp.runtime.win-x64": "12.0.0-beta1"
"libClangSharp.runtime.win-x64": "13.0.0-beta1"
}
},
"win-x86": {
"libClangSharp": {
"libClangSharp.runtime.win-x86": "12.0.0-beta1"
"libClangSharp.runtime.win-x86": "13.0.0-beta1"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libclang.runtime.freebsd.11-x64</id>
<version>12.0.0</version>
<id>libclang.runtime.freebsd.12-x64</id>
<version>13.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
<projectUrl>https://github.com/microsoft/clangsharp</projectUrl>
<description>freebsd 11 x64 native library for libclang.</description>
<description>freebsd 12 x64 native library for libclang.</description>
<copyright>Copyright © LLVM Project</copyright>
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-12.0.0" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-13.0.0" />
</metadata>
<files>
<file src="..\libclang\LICENSE.TXT" target="LICENSE.TXT" />
<file src="libclang.so" target="runtimes\freebsd.11-x64\native\libclang.so" />
<file src="libclang.so" target="runtimes\freebsd.12-x64\native\libclang.so" />
</files>
</package>
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libclang.runtime.freebsd.11-x86</id>
<version>12.0.0</version>
<id>libclang.runtime.freebsd.12-x86</id>
<version>13.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
<projectUrl>https://github.com/microsoft/clangsharp</projectUrl>
<description>freebsd 11 x86 native library for libclang.</description>
<description>freebsd 12 x86 native library for libclang.</description>
<copyright>Copyright © LLVM Project</copyright>
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-12.0.0" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-13.0.0" />
</metadata>
<files>
<file src="..\libclang\LICENSE.TXT" target="LICENSE.TXT" />
<file src="libclang.so" target="runtimes\freebsd.11-x86\native\libclang.so" />
<file src="libclang.so" target="runtimes\freebsd.12-x86\native\libclang.so" />
</files>
</package>
Loading

0 comments on commit 38747b8

Please sign in to comment.