Skip to content

Commit

Permalink
Finish rename
Browse files Browse the repository at this point in the history
  • Loading branch information
Perksey committed Nov 20, 2023
1 parent f67d445 commit 4590f4f
Show file tree
Hide file tree
Showing 48 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -479,5 +479,5 @@ src/**/build/
src/Website/Silk.NET.Statiq/temp
src/Website/Silk.NET.Statiq/cache

# SilkTouchX configs
# SilkTouch configs
!eng/silktouch/**/*.rsp
4 changes: 2 additions & 2 deletions Silk.NET.sln
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A5578D12
tests\Directory.Build.targets = tests\Directory.Build.targets
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SilkTouch", "sources\Silk.NET.SilkTouch\Silk.NET.SilkTouch.csproj", "{76F747A6-D971-4162-BF35-A226177FCA08}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SilkTouch", "sources\SilkTouch\Silk.NET.SilkTouch.csproj", "{76F747A6-D971-4162-BF35-A226177FCA08}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.SilkTouch.UnitTests", "tests\SilkTouchX\Silk.NET.SilkTouch.UnitTests.csproj", "{600D712C-4ABF-44C4-96C3-B1DEE1F38298}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.SilkTouch.UnitTests", "tests\SilkTouch\Silk.NET.SilkTouch.UnitTests.csproj", "{600D712C-4ABF-44C4-96C3-B1DEE1F38298}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.GLFW", "sources\GLFW\Silk.NET.GLFW.csproj", "{7B58E4E1-0DE6-453C-95A2-25D8EE0621C1}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Clang/ClangScraper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
using static ClangSharp.Interop.CXErrorCode;
using static ClangSharp.Interop.CXDiagnosticSeverity;

namespace SilkTouchX.Clang;
namespace Silk.NET.SilkTouch.Clang;

/// <summary>
/// Primary entrypoint of the Scraper. This class defines logic to extract symbols using ClangSharp
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Clang/GeneratedBindings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.CodeAnalysis.MSBuild;
using Diagnostic = ClangSharp.Diagnostic;

namespace SilkTouchX.Clang;
namespace Silk.NET.SilkTouch.Clang;

/// <summary>
/// Output from the <see cref="ClangScraper"/>.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Clang/IStdIncludeResolver.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace SilkTouchX.Clang;
namespace Silk.NET.SilkTouch.Clang;

/// <summary>
/// A resolver for standard includes.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Clang/MacOSStdIncludeResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.IO;
using Microsoft.Extensions.Logging;

namespace SilkTouchX.Clang;
namespace Silk.NET.SilkTouch.Clang;

/// <summary>
/// A macOS standard include resolver.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Clang/ResponseFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using ClangSharp;
using ClangSharp.Interop;

namespace SilkTouchX.Clang;
namespace Silk.NET.SilkTouch.Clang;

/// <summary>
/// Output from <see cref="ResponseFileHandler"/>.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Clang/ResponseFileHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
using Microsoft.Extensions.Logging;
using static ClangSharp.Interop.CXTranslationUnit_Flags;

namespace SilkTouchX.Clang;
namespace Silk.NET.SilkTouch.Clang;

/// <summary>
/// Reads a response file (rsp) containing ClangSharpPInvokeGenerator command line arguments.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Clang/UnixStdIncludeResolver.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Microsoft.Extensions.Logging;

namespace SilkTouchX.Clang;
namespace Silk.NET.SilkTouch.Clang;

/// <summary>
/// Resolver for the C standard include paths on UNIX-like systems. On UNIX this is remarkably simple, it's just
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Clang/VSWhere.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System.Runtime.Versioning;
using Microsoft.VisualStudio.Setup.Configuration;

namespace SilkTouchX.Clang;
namespace Silk.NET.SilkTouch.Clang;

[SupportedOSPlatform("windows")]
internal record struct SetupInstance(ISetupInstance Instance)
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Clang/VisualStudioResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using System.IO;
using System.Linq;

namespace SilkTouchX.Clang;
namespace Silk.NET.SilkTouch.Clang;

/// <summary>
/// Encapsulations information regarding installed versions of Visual Studio.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Clang/VisualStudioVarPrint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Diagnostics.CodeAnalysis;
using System.IO;

namespace SilkTouchX.Clang;
namespace Silk.NET.SilkTouch.Clang;

internal static class VisualStudioVarPrint
{
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Clang/WindowsStdIncludeResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Linq;
using Microsoft.Extensions.Logging;

namespace SilkTouchX.Clang;
namespace Silk.NET.SilkTouch.Clang;

/// <summary>
/// Resolves standard includes using VS setup interoperability and the VS developer command prompt to retrieve the MSVC
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/GenerateSources.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
..\..\artifacts\bin\sources\SilkTouchX\Debug\net8.0\win-x64\SilkTouchX.exe test.json --skip Microsoft -l debug
..\..\artifacts\bin\sources\SilkTouch\Debug\net8.0\win-x64\Silk.NET.SilkTouch.exe test.json --skip Microsoft -l debug
PAUSE
4 changes: 2 additions & 2 deletions sources/SilkTouch/Mods/AddApiProfiles.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using SilkTouchX.Clang;
using Silk.NET.SilkTouch.Clang;
using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// Adds SupportedApiProfile attributes to APIs in given source roots, optionally merging APIs into a single source set.
Expand Down
4 changes: 2 additions & 2 deletions sources/SilkTouch/Mods/AddOpaqueStructs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.Extensions.Options;
using SilkTouchX.Clang;
using Silk.NET.SilkTouch.Clang;
using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// Adds opaque structs.
Expand Down
4 changes: 2 additions & 2 deletions sources/SilkTouch/Mods/AddStdIncludes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using System.Linq;
using System.Threading.Tasks;
using ClangSharp;
using SilkTouchX.Clang;
using Silk.NET.SilkTouch.Clang;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// A mod that will add standard include directories to a response file that doesn't already have them (i.e. that
Expand Down
4 changes: 2 additions & 2 deletions sources/SilkTouch/Mods/AddVTables.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using SilkTouchX.Clang;
using Silk.NET.SilkTouch.Clang;
using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// Adds VTables to allow multiple points of entry into the native library.
Expand Down
4 changes: 2 additions & 2 deletions sources/SilkTouch/Mods/ChangeNamespace.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using SilkTouchX.Clang;
using Silk.NET.SilkTouch.Clang;
using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// A mod that changes namespaces in response files. It is assumed that there will be no other sources of variance with
Expand Down
4 changes: 2 additions & 2 deletions sources/SilkTouch/Mods/Common/IMod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
using Microsoft.CodeAnalysis;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using SilkTouchX.Clang;
using Silk.NET.SilkTouch.Clang;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// Represents a "mod" - a type that will ingest ClangSharp configurations and the outputs from their configurations,
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Mods/Common/IModConfigBinder.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Configuration;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// A mod that customises the binding of its configuration.
Expand Down
6 changes: 3 additions & 3 deletions sources/SilkTouch/Mods/Common/Mod.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using SilkTouchX.Clang;
using SilkTouchX.Naming;
using Silk.NET.SilkTouch.Clang;
using Silk.NET.SilkTouch.Naming;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// Represents an <see cref="IMod"/> with common functionality.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Mods/Common/ModCSharpSyntaxRewriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.CodeAnalysis.CSharp.Syntax;
using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// <see cref="CSharpSyntaxRewriter"/> containing common functionality for mods.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Mods/Common/ModConfigurationAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// Annotates the configuration type for this mod - this is used to call
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Mods/Common/ModLoader.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// Loads <see cref="IMod"/>s based on strings contained within the configuration file.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Mods/Common/ModUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using Microsoft.CodeAnalysis.CSharp.Syntax;
using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// Common utilities useful to mods.
Expand Down
4 changes: 2 additions & 2 deletions sources/SilkTouch/Mods/MixKhronosData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
using System.Xml.Linq;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using SilkTouchX.Naming;
using Silk.NET.SilkTouch.Naming;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// A mod that reads Khronos specifications to influence codegen.
Expand Down
6 changes: 3 additions & 3 deletions sources/SilkTouch/Mods/PrettifyNames.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using SilkTouchX.Clang;
using SilkTouchX.Naming;
using Silk.NET.SilkTouch.Clang;
using Silk.NET.SilkTouch.Naming;
using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// A mod that will convert other naming conventions to the PascalCase nomenclature typically used in C#.
Expand Down
4 changes: 2 additions & 2 deletions sources/SilkTouch/Mods/UseSilkDSL.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using SilkTouchX.Clang;
using Silk.NET.SilkTouch.Clang;
using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;

namespace SilkTouchX.Mods;
namespace Silk.NET.SilkTouch.Mods;

/// <summary>
/// Mods the bindings to use the Silk.NET.Core pointer types.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Naming/INameTrimmer.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;

namespace SilkTouchX.Naming;
namespace Silk.NET.SilkTouch.Naming;

/// <summary>
/// Represents a name trimmer.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Naming/INameTrimmerProvider.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace SilkTouchX.Naming;
namespace Silk.NET.SilkTouch.Naming;

/// <summary>
/// Provides name trimmers.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Naming/NameTrimmer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Diagnostics;
using System.Linq;

namespace SilkTouchX.Naming;
namespace Silk.NET.SilkTouch.Naming;

/// <summary>
/// The default name trimmer ported from Silk.NET 2.18 with modifications for 3.0.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Naming/NameTrimmer217.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using Humanizer;

namespace SilkTouchX.Naming;
namespace Silk.NET.SilkTouch.Naming;

/// <summary>
/// The 2.17 name trimmer.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Naming/NameTrimmer218.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;

namespace SilkTouchX.Naming;
namespace Silk.NET.SilkTouch.Naming;

/// <summary>
/// The 2.18 name trimmer.
Expand Down
4 changes: 2 additions & 2 deletions sources/SilkTouch/Naming/NameTrimmerProviders.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Options;
using SilkTouchX.Mods;
using Silk.NET.SilkTouch.Mods;

namespace SilkTouchX.Naming;
namespace Silk.NET.SilkTouch.Naming;

internal class NameTrimmerProviders
{
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Naming/NameUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Text.RegularExpressions;
using Humanizer;

namespace SilkTouchX.Naming;
namespace Silk.NET.SilkTouch.Naming;

/// <summary>
/// Contains utilities used throughout the naming namespace.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Console;
using SilkTouchX;
using Silk.NET.SilkTouch;

var logging = new Option<LogLevel>(new[] { "--log-level", "-l" }, () => LogLevel.Information);
var skip = new Option<string[]>(
Expand Down
10 changes: 5 additions & 5 deletions sources/SilkTouch/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Options;
using SilkTouchX.Clang;
using SilkTouchX.Mods;
using SilkTouchX.Naming;
using SilkTouchX.Workspace;
using Silk.NET.SilkTouch.Clang;
using Silk.NET.SilkTouch.Mods;
using Silk.NET.SilkTouch.Naming;
using Silk.NET.SilkTouch.Workspace;

namespace SilkTouchX;
namespace Silk.NET.SilkTouch;

/// <summary>
/// Provides the <see cref="AddSilkTouch"/> method.
Expand Down
2 changes: 1 addition & 1 deletion sources/SilkTouch/SilkTouchConfiguration.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;

namespace SilkTouchX;
namespace Silk.NET.SilkTouch;

/// <summary>
/// Represents the configuration for a single generation job in SilkTouch.
Expand Down
Loading

0 comments on commit 4590f4f

Please sign in to comment.