Remove macOS version prefix for parser bindings.

mono · Oct 27, 2024 · 0e8e1c4 · 0e8e1c4
1 parent aea3d05
commit 0e8e1c4
Show file tree

Hide file tree

Showing 17 changed files with 9 additions and 8 deletions.
diff --git a/build/Helpers.lua b/build/Helpers.lua
@@ -253,11 +253,11 @@ function AddPlatformSpecificFiles(folder, filename)
       files { path.join(folder, "i686-pc-win32-msvc", filename) }
   elseif os.istarget("macosx") then
     filter { "architecture:arm64" }
-      files { path.join(folder, "arm64-apple-darwin12.4.0", filename) }
+      files { path.join(folder, "arm64-apple-darwin", filename) }
     filter { "architecture:x86_64" }
-      files { path.join(folder, "x86_64-apple-darwin12.4.0", filename) }
+      files { path.join(folder, "x86_64-apple-darwin", filename) }
     filter {"architecture:x86" }
-      files { path.join(folder, "i686-apple-darwin12.4.0", filename) }
+      files { path.join(folder, "i686-apple-darwin", filename) }
   elseif os.istarget("linux") then
     filter { "architecture:arm64" }
       files { path.join(folder, "arm64-linux-gnu" .. (UseCxx11ABI() and "-cxx11abi" or ""), filename) }

diff --git a/src/CppParser/Bindings/CSharp/CppSharp.Parser.CSharp.csproj b/src/CppParser/Bindings/CSharp/CppSharp.Parser.CSharp.csproj
@@ -9,9 +9,10 @@
     <PlatformParserFolder Condition="$(IsWindows) AND $(PlatformTarget) == x64">x86_64-pc-win32-msvc</PlatformParserFolder>
     <PlatformParserFolder Condition="$(IsLinux) AND $(PlatformTarget) == x64 AND $(UseCXX11ABI)">x86_64-linux-gnu-cxx11abi</PlatformParserFolder>
     <PlatformParserFolder Condition="$(IsLinux) AND $(PlatformTarget) == x64 AND !$(UseCXX11ABI)">x86_64-linux-gnu</PlatformParserFolder>
-    <PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x64">x86_64-apple-darwin12.4.0</PlatformParserFolder>
+    <PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x64">x86_64-apple-darwin</PlatformParserFolder>
+    <PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == arm64">arm64-apple-darwin</PlatformParserFolder>
     <PlatformParserFolder Condition="$(IsWindows) AND $(PlatformTarget) == x86">i686-pc-win32-msvc</PlatformParserFolder>
-    <PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x86">i686-apple-darwin12.4.0</PlatformParserFolder>
+    <PlatformParserFolder Condition="$(IsMacOSX) AND $(PlatformTarget) == x86">i686-apple-darwin</PlatformParserFolder>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...rwin12.4.0/CppSharp.CppParser-symbols.cpp → ...ple-darwin/CppSharp.CppParser-symbols.cpp b/...rwin12.4.0/CppSharp.CppParser-symbols.cpp → ...ple-darwin/CppSharp.CppParser-symbols.cpp
diff --git a/...-apple-darwin12.4.0/CppSharp.CppParser.cs → .../arm64-apple-darwin/CppSharp.CppParser.cs b/...-apple-darwin12.4.0/CppSharp.CppParser.cs → .../arm64-apple-darwin/CppSharp.CppParser.cs
diff --git a/.../arm64-apple-darwin12.4.0/Std-symbols.cpp → ...CSharp/arm64-apple-darwin/Std-symbols.cpp b/.../arm64-apple-darwin12.4.0/Std-symbols.cpp → ...CSharp/arm64-apple-darwin/Std-symbols.cpp
diff --git a/...gs/CSharp/arm64-apple-darwin12.4.0/Std.cs → ...Bindings/CSharp/arm64-apple-darwin/Std.cs b/...gs/CSharp/arm64-apple-darwin12.4.0/Std.cs → ...Bindings/CSharp/arm64-apple-darwin/Std.cs
diff --git a/...rwin12.4.0/CppSharp.CppParser-symbols.cpp → ...ple-darwin/CppSharp.CppParser-symbols.cpp b/...rwin12.4.0/CppSharp.CppParser-symbols.cpp → ...ple-darwin/CppSharp.CppParser-symbols.cpp
diff --git a/...-apple-darwin12.4.0/CppSharp.CppParser.cs → ...p/i686-apple-darwin/CppSharp.CppParser.cs b/...-apple-darwin12.4.0/CppSharp.CppParser.cs → ...p/i686-apple-darwin/CppSharp.CppParser.cs
diff --git a/....4.0/CppSharp.CppParser.dll-templates.cpp → ...rwin/CppSharp.CppParser.dll-templates.cpp b/....4.0/CppSharp.CppParser.dll-templates.cpp → ...rwin/CppSharp.CppParser.dll-templates.cpp
diff --git a/...p/i686-apple-darwin12.4.0/Std-symbols.cpp → .../CSharp/i686-apple-darwin/Std-symbols.cpp b/...p/i686-apple-darwin12.4.0/Std-symbols.cpp → .../CSharp/i686-apple-darwin/Std-symbols.cpp
diff --git a/...ngs/CSharp/i686-apple-darwin12.4.0/Std.cs → .../Bindings/CSharp/i686-apple-darwin/Std.cs b/...ngs/CSharp/i686-apple-darwin12.4.0/Std.cs → .../Bindings/CSharp/i686-apple-darwin/Std.cs
diff --git a/...rwin12.4.0/CppSharp.CppParser-symbols.cpp → ...ple-darwin/CppSharp.CppParser-symbols.cpp b/...rwin12.4.0/CppSharp.CppParser-symbols.cpp → ...ple-darwin/CppSharp.CppParser-symbols.cpp
diff --git a/...-apple-darwin12.4.0/CppSharp.CppParser.cs → ...x86_64-apple-darwin/CppSharp.CppParser.cs b/...-apple-darwin12.4.0/CppSharp.CppParser.cs → ...x86_64-apple-darwin/CppSharp.CppParser.cs
diff --git a/....4.0/CppSharp.CppParser.dll-templates.cpp → ...rwin/CppSharp.CppParser.dll-templates.cpp b/....4.0/CppSharp.CppParser.dll-templates.cpp → ...rwin/CppSharp.CppParser.dll-templates.cpp
diff --git a/...x86_64-apple-darwin12.4.0/Std-symbols.cpp → ...Sharp/x86_64-apple-darwin/Std-symbols.cpp b/...x86_64-apple-darwin12.4.0/Std-symbols.cpp → ...Sharp/x86_64-apple-darwin/Std-symbols.cpp
diff --git a/...s/CSharp/x86_64-apple-darwin12.4.0/Std.cs → ...indings/CSharp/x86_64-apple-darwin/Std.cs b/...s/CSharp/x86_64-apple-darwin12.4.0/Std.cs → ...indings/CSharp/x86_64-apple-darwin/Std.cs
diff --git a/src/CppParser/ParserGen/ParserGen.cs b/src/CppParser/ParserGen/ParserGen.cs
@@ -175,15 +175,15 @@ public static void Main(string[] args)
             if (Directory.Exists(osxHeadersPath) || Platform.IsMacOS)
             {
                 Console.WriteLine("Generating the C# parser bindings for macOS x86...");
-                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "i686-apple-darwin12.4.0"));
+                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "i686-apple-darwin"));
                 Console.WriteLine();
 
                 Console.WriteLine("Generating the C# parser bindings for macOS x64...");
-                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "x86_64-apple-darwin12.4.0"));
+                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "x86_64-apple-darwin"));
                 Console.WriteLine();
 
                 Console.WriteLine("Generating the C# parser bindings for macOS ARM64...");
-                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "arm64-apple-darwin12.4.0"));
+                ConsoleDriver.Run(new ParserGen(GeneratorKind.CSharp, "arm64-apple-darwin"));
                 Console.WriteLine();
             }
             else