Skip to content

Commit

Permalink
Merge pull request #330 from tannergooding/main
Browse files Browse the repository at this point in the history
Regenerating bindings for v14.0.0
  • Loading branch information
tannergooding authored Apr 3, 2022
2 parents fef0a2b + 64042a7 commit ca2c4bf
Show file tree
Hide file tree
Showing 232 changed files with 699 additions and 820 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 13.0.0)
project(ClangSharp VERSION 14.0.0)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand Down
44 changes: 4 additions & 40 deletions ClangSharp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.freebsd.12
packages\libclang\libclang.runtime.freebsd.12-x64\libclang.runtime.freebsd.12-x64.nuspec = packages\libclang\libclang.runtime.freebsd.12-x64\libclang.runtime.freebsd.12-x64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.freebsd.12-x86", "libclang.runtime.freebsd.12-x86", "{C57B4A74-2791-44C3-92D3-9B8AD5993F27}"
ProjectSection(SolutionItems) = preProject
packages\libclang\libclang.runtime.freebsd.12-x86\libclang.runtime.freebsd.12-x86.nuspec = packages\libclang\libclang.runtime.freebsd.12-x86\libclang.runtime.freebsd.12-x86.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.linux-arm", "libclang.runtime.linux-arm", "{F9915660-2229-418C-B269-83FE74C1943E}"
ProjectSection(SolutionItems) = preProject
packages\libclang\libclang.runtime.linux-arm\libclang.runtime.linux-arm.nuspec = packages\libclang\libclang.runtime.linux-arm\libclang.runtime.linux-arm.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.linux-arm64", "libclang.runtime.linux-arm64", "{7D89072F-8E3E-4009-BCCD-5D3C69F88042}"
ProjectSection(SolutionItems) = preProject
packages\libclang\libclang.runtime.linux-arm64\libclang.runtime.linux-arm64.nuspec = packages\libclang\libclang.runtime.linux-arm64\libclang.runtime.linux-arm64.nuspec
Expand Down Expand Up @@ -119,16 +109,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.freeb
packages\libClangSharp\libClangSharp.runtime.freebsd.12-x64\libClangSharp.runtime.freebsd.12-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.freebsd.12-x64\libClangSharp.runtime.freebsd.12-x64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.freebsd.12-x86", "libClangSharp.runtime.freebsd.12-x86", "{47E5622B-77C6-44B7-8528-F03C3B63A217}"
ProjectSection(SolutionItems) = preProject
packages\libClangSharp\libClangSharp.runtime.freebsd.12-x86\libClangSharp.runtime.freebsd.12-x86.nuspec = packages\libClangSharp\libClangSharp.runtime.freebsd.12-x86\libClangSharp.runtime.freebsd.12-x86.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.linux-arm", "libClangSharp.runtime.linux-arm", "{B48A71F0-AF48-4010-941F-AF24FDB614F2}"
ProjectSection(SolutionItems) = preProject
packages\libClangSharp\libClangSharp.runtime.linux-arm\libClangSharp.runtime.linux-arm.nuspec = packages\libClangSharp\libClangSharp.runtime.linux-arm\libClangSharp.runtime.linux-arm.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.linux-arm64", "libClangSharp.runtime.linux-arm64", "{4F2F7171-202E-4E23-AABF-EB3501BDB0B2}"
ProjectSection(SolutionItems) = preProject
packages\libClangSharp\libClangSharp.runtime.linux-arm64\libClangSharp.runtime.linux-arm64.nuspec = packages\libClangSharp\libClangSharp.runtime.linux-arm64\libClangSharp.runtime.linux-arm64.nuspec
Expand Down Expand Up @@ -185,19 +165,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.ubuntu.20.
packages\libclang\libclang.runtime.ubuntu.20.04-x64\libclang.runtime.ubuntu.20.04-x64.nuspec = packages\libclang\libclang.runtime.ubuntu.20.04-x64\libclang.runtime.ubuntu.20.04-x64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.ubuntu.21.04-x64", "libclang.runtime.ubuntu.21.04-x64", "{F3254760-351E-4886-A243-FF3778837C40}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.ubuntu.21.10-x64", "libclang.runtime.ubuntu.21.10-x64", "{F3254760-351E-4886-A243-FF3778837C40}"
ProjectSection(SolutionItems) = preProject
packages\libclang\libclang.runtime.ubuntu.21.04-x64\libclang.runtime.ubuntu.21.04-x64.nuspec = packages\libclang\libclang.runtime.ubuntu.21.04-x64\libclang.runtime.ubuntu.21.04-x64.nuspec
packages\libclang\libclang.runtime.ubuntu.21.10-x64\libclang.runtime.ubuntu.21.10-x64.nuspec = packages\libclang\libclang.runtime.ubuntu.21.10-x64\libclang.runtime.ubuntu.21.10-x64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.win-arm64", "libclang.runtime.win-arm64", "{B3F3A831-DA09-40A2-A25C-DE47A58BB93B}"
ProjectSection(SolutionItems) = preProject
packages\libclang\libclang.runtime.win-arm64\libclang.runtime.win-arm64.nuspec = packages\libclang\libclang.runtime.win-arm64\libclang.runtime.win-arm64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.ubuntu.21.04-x64", "libClangSharp.runtime.ubuntu.21.04-x64", "{D90C3C52-DA8D-44BB-B8B0-3E4EF4CBF4DC}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.ubuntu.21.10-x64", "libClangSharp.runtime.ubuntu.21.10-x64", "{D90C3C52-DA8D-44BB-B8B0-3E4EF4CBF4DC}"
ProjectSection(SolutionItems) = preProject
packages\libClangSharp\libClangSharp.runtime.ubuntu.21.04-x64\libClangSharp.runtime.ubuntu.21.04-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.ubuntu.21.04-x64\libClangSharp.runtime.ubuntu.21.04-x64.nuspec
packages\libClangSharp\libClangSharp.runtime.ubuntu.21.10-x64\libClangSharp.runtime.ubuntu.21.10-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.ubuntu.21.10-x64\libClangSharp.runtime.ubuntu.21.10-x64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.win-arm64", "libClangSharp.runtime.win-arm64", "{69B805C6-230D-49A2-A569-3CAC2EC9F293}"
Expand All @@ -212,16 +192,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.freebsd.13
packages\libclang\libclang.runtime.freebsd.13-x64\libclang.runtime.freebsd.13-x64.nuspec = packages\libclang\libclang.runtime.freebsd.13-x64\libclang.runtime.freebsd.13-x64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.freebsd.13-x86", "libclang.runtime.freebsd.13-x86", "{E76E41C3-FD6E-47FB-BC1E-120C8F88C07C}"
ProjectSection(SolutionItems) = preProject
packages\libclang\libclang.runtime.freebsd.13-x86\libclang.runtime.freebsd.13-x86.nuspec = packages\libclang\libclang.runtime.freebsd.13-x86\libclang.runtime.freebsd.13-x86.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.freebsd.13-x86", "libClangSharp.runtime.freebsd.13-x86", "{19337D54-F5B0-4131-A753-B788EF5FE677}"
ProjectSection(SolutionItems) = preProject
packages\libClangSharp\libClangSharp.runtime.freebsd.13-x86\libClangSharp.runtime.freebsd.13-x86.nuspec = packages\libClangSharp\libClangSharp.runtime.freebsd.13-x86\libClangSharp.runtime.freebsd.13-x86.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.freebsd.13-x64", "libClangSharp.runtime.freebsd.13-x64", "{B3A22C21-0699-4963-B665-F9AA74F0AF08}"
ProjectSection(SolutionItems) = preProject
packages\libClangSharp\libClangSharp.runtime.freebsd.13-x64\libClangSharp.runtime.freebsd.13-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.freebsd.13-x64\libClangSharp.runtime.freebsd.13-x64.nuspec
Expand Down Expand Up @@ -277,8 +247,6 @@ Global
{DFACF682-2673-4AE1-8F10-816D025C2D45} = {AE6CF12F-5CC3-463B-A74B-6CCAE26EE4EF}
{C8DB18BE-701A-46C4-98F9-2524914CB5DC} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
{C90094F6-26DF-4B2C-BD61-540D4CE988A4} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
{C57B4A74-2791-44C3-92D3-9B8AD5993F27} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
{F9915660-2229-418C-B269-83FE74C1943E} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
{7D89072F-8E3E-4009-BCCD-5D3C69F88042} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
{8006B5D7-5E0E-4A0A-884F-62C5216144EE} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
{8756B75F-F244-43AD-9C79-1610059BDF36} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
Expand All @@ -287,8 +255,6 @@ Global
{EDEC2130-DA14-4415-91A3-225733FB61F8} = {AE6CF12F-5CC3-463B-A74B-6CCAE26EE4EF}
{B043C50D-8B06-4663-943A-DEBB6CFACEA6} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
{8DCBB5E9-A44C-462F-B9FE-418B18EC7E31} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
{47E5622B-77C6-44B7-8528-F03C3B63A217} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
{B48A71F0-AF48-4010-941F-AF24FDB614F2} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
{4F2F7171-202E-4E23-AABF-EB3501BDB0B2} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
{C2BE41E6-95E9-431A-9C49-923BD50692AB} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
{A04F314B-2373-496E-879F-763B5C8EAF00} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
Expand All @@ -303,8 +269,6 @@ Global
{69B805C6-230D-49A2-A569-3CAC2EC9F293} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
{AADBAAC3-45F0-484F-BCB2-9809EDF1CA82} = {732BA761-B58E-4C34-9C96-097382A55A7A}
{8FD0223B-88AD-4FA9-AE29-0B446FF17922} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
{E76E41C3-FD6E-47FB-BC1E-120C8F88C07C} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
{19337D54-F5B0-4131-A753-B788EF5FE677} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
{B3A22C21-0699-4963-B665-F9AA74F0AF08} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
{034EBD16-E96F-4530-B37D-30B16C4E9876} = {FF42B475-5025-45BA-B278-60F29B53C023}
EndGlobalSection
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<ContinuousIntegrationBuild Condition="'$(GITHUB_RUN_ID)' != ''">true</ContinuousIntegrationBuild>
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
<Product>ClangSharp</Product>
<VersionPrefix>13.0.0</VersionPrefix>
<VersionPrefix>14.0.0</VersionPrefix>
<VersionSuffix Condition="'$(EXCLUDE_SUFFIX_FROM_VERSION)' != 'true'">beta2</VersionSuffix>
<VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
</PropertyGroup>
Expand Down
10 changes: 5 additions & 5 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@

<!-- Package versions for package references across all projects -->
<ItemGroup>
<PackageReference Update="libClang" Version="13.0.1" />
<PackageReference Update="libClangSharp" Version="13.0.0-beta1" />
<PackageReference Update="libClang" Version="14.0.0" />
<PackageReference Update="libClangSharp" Version="14.0.0-beta1" />
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageReference Update="NUnit" Version="3.13.2" />
<PackageReference Update="NUnit3TestAdapter" Version="4.0.0" />
<PackageReference Update="NUnit" Version="3.13.3" />
<PackageReference Update="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Update="System.CommandLine" Version="2.0.0-beta1.21308.1" />
<PackageReference Update="System.Memory" Version="4.5.4" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,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-13.0.0 https://github.com/llvm/llvm-project
git clone --single-branch --branch llvmorg-14.0.0 https://github.com/llvm/llvm-project
cd llvm-project
mkdir artifacts/bin
cd artifacts/bin
Expand All @@ -93,7 +93,7 @@ git clone https://github.com/dotnet/clangsharp
cd clangsharp
mkdir artifacts/bin/native
cd artifacts/bin/native
cmake -DPATH_TO_LLVM=/usr/lib/llvm/13/ ../../..
cmake -DPATH_TO_LLVM=/usr/lib/llvm/14/ ../../..
make
```

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

Expand All @@ -113,7 +113,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 13.0.0-beta1
dotnet tool install --global ClangSharpPInvokeGenerator --version 14.0.0-beta1
ClangSharpPInvokeGenerator @generate.rsp
```

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.freebsd.12-x64</id>
<version>13.0.0-beta1</version>
<version>14.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down

This file was deleted.

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.freebsd.13-x64</id>
<version>13.0.0-beta1</version>
<version>14.0.0-beta1</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down

This file was deleted.

This file was deleted.

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>13.0.0-beta1</version>
<version>14.0.0-beta1</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation 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>13.0.0-beta1</version>
<version>14.0.0-beta1</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation 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>13.0.0-beta1</version>
<version>14.0.0-beta1</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation 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>13.0.0-beta1</version>
<version>14.0.0-beta1</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
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.ubuntu.21.04-x64</id>
<version>13.0.0-beta1</version>
<id>libClangSharp.runtime.ubuntu.21.10-x64</id>
<version>14.0.0-beta1</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">MIT</license>
<projectUrl>https://github.com/dotnet/clangsharp</projectUrl>
<description>ubuntu 21.04 x64 native library for libClangSharp.</description>
<description>ubuntu 21.10 x64 native library for libClangSharp.</description>
<copyright>Copyright © .NET Foundation and Contributors</copyright>
<repository type="git" url="https://github.com/dotnet/clangsharp" branch="main" />
</metadata>
<files>
<file src="..\..\..\LICENSE.md" target="LICENSE.TXT" />
<file src="..\..\..\NOTICE.md" target="NOTICE.TXT" />
<file src="libClangSharp.so" target="runtimes\ubuntu.21.04-x64\native\libClangSharp.so" />
<file src="libClangSharp.so" target="runtimes\ubuntu.21.10-x64\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.win-arm64</id>
<version>13.0.0-beta1</version>
<version>14.0.0-beta1</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
Expand Down
Loading

0 comments on commit ca2c4bf

Please sign in to comment.