Rename CppSharp.CppParser

On Linux dotnet things are .dll and native things are .so, so names don't conflict. Not so much on Windows...
cmcneish · Jun 6, 2024 · 91820e3 · 91820e3
1 parent ed62ea6
commit 91820e3
Show file tree

Hide file tree

Showing 33 changed files with 16 additions and 16 deletions.
diff --git a/CppSharp.CppParser/CppSharp.CppParser.csproj → ...Managed/CppSharp.CppParser.Managed.csproj b/CppSharp.CppParser/CppSharp.CppParser.csproj → ...Managed/CppSharp.CppParser.Managed.csproj
diff --git a/.../linux-x64/CppSharp.CppParser-symbols.cpp → .../linux-x64/CppSharp.CppParser-symbols.cpp b/.../linux-x64/CppSharp.CppParser-symbols.cpp → .../linux-x64/CppSharp.CppParser-symbols.cpp
diff --git a/...CppParser/linux-x64/CppSharp.CppParser.cs → ...r.Managed/linux-x64/CppSharp.CppParser.cs b/...CppParser/linux-x64/CppSharp.CppParser.cs → ...r.Managed/linux-x64/CppSharp.CppParser.cs
diff --git a/CppSharp.CppParser/linux-x64/Std-symbols.cpp → ...pParser.Managed/linux-x64/Std-symbols.cpp b/CppSharp.CppParser/linux-x64/Std-symbols.cpp → ...pParser.Managed/linux-x64/Std-symbols.cpp
diff --git a/CppSharp.CppParser/linux-x64/Std.cs → CppSharp.CppParser.Managed/linux-x64/Std.cs b/CppSharp.CppParser/linux-x64/Std.cs → CppSharp.CppParser.Managed/linux-x64/Std.cs
diff --git a/CppSharp.CppParser.Native/APValuePrinter.h → CppSharp.CppParser/APValuePrinter.h b/CppSharp.CppParser.Native/APValuePrinter.h → CppSharp.CppParser/APValuePrinter.h
diff --git a/CppSharp.CppParser.Native/AST.cpp → CppSharp.CppParser/AST.cpp b/CppSharp.CppParser.Native/AST.cpp → CppSharp.CppParser/AST.cpp
diff --git a/CppSharp.CppParser.Native/AST.h → CppSharp.CppParser/AST.h b/CppSharp.CppParser.Native/AST.h → CppSharp.CppParser/AST.h
diff --git a/CppSharp.CppParser.Native/CXXABI.h → CppSharp.CppParser/CXXABI.h b/CppSharp.CppParser.Native/CXXABI.h → CppSharp.CppParser/CXXABI.h
diff --git a/CppSharp.CppParser.Native/Comments.cpp → CppSharp.CppParser/Comments.cpp b/CppSharp.CppParser.Native/Comments.cpp → CppSharp.CppParser/Comments.cpp
diff --git a/CppSharp.CppParser.Native/CppParser.cpp → CppSharp.CppParser/CppParser.cpp b/CppSharp.CppParser.Native/CppParser.cpp → CppSharp.CppParser/CppParser.cpp
diff --git a/CppSharp.CppParser.Native/CppParser.h → CppSharp.CppParser/CppParser.h b/CppSharp.CppParser.Native/CppParser.h → CppSharp.CppParser/CppParser.h
diff --git a/CppSharp.CppParser.Native/Decl.h → CppSharp.CppParser/Decl.h b/CppSharp.CppParser.Native/Decl.h → CppSharp.CppParser/Decl.h
diff --git a/CppSharp.CppParser.Native/ELFDumper.h → CppSharp.CppParser/ELFDumper.h b/CppSharp.CppParser.Native/ELFDumper.h → CppSharp.CppParser/ELFDumper.h
diff --git a/CppSharp.CppParser.Native/Expr.cpp → CppSharp.CppParser/Expr.cpp b/CppSharp.CppParser.Native/Expr.cpp → CppSharp.CppParser/Expr.cpp
diff --git a/CppSharp.CppParser.Native/Expr.h → CppSharp.CppParser/Expr.h b/CppSharp.CppParser.Native/Expr.h → CppSharp.CppParser/Expr.h
diff --git a/CppSharp.CppParser.Native/Helpers.h → CppSharp.CppParser/Helpers.h b/CppSharp.CppParser.Native/Helpers.h → CppSharp.CppParser/Helpers.h
diff --git a/CppSharp.CppParser.Native/Link.cpp → CppSharp.CppParser/Link.cpp b/CppSharp.CppParser.Native/Link.cpp → CppSharp.CppParser/Link.cpp
diff --git a/CppSharp.CppParser.Native/ParseExpr.cpp → CppSharp.CppParser/ParseExpr.cpp b/CppSharp.CppParser.Native/ParseExpr.cpp → CppSharp.CppParser/ParseExpr.cpp
diff --git a/CppSharp.CppParser.Native/ParseStmt.cpp → CppSharp.CppParser/ParseStmt.cpp b/CppSharp.CppParser.Native/ParseStmt.cpp → CppSharp.CppParser/ParseStmt.cpp
diff --git a/CppSharp.CppParser.Native/Parser.cpp → CppSharp.CppParser/Parser.cpp b/CppSharp.CppParser.Native/Parser.cpp → CppSharp.CppParser/Parser.cpp
diff --git a/CppSharp.CppParser.Native/Parser.h → CppSharp.CppParser/Parser.h b/CppSharp.CppParser.Native/Parser.h → CppSharp.CppParser/Parser.h
diff --git a/CppSharp.CppParser.Native/Sources.cpp → CppSharp.CppParser/Sources.cpp b/CppSharp.CppParser.Native/Sources.cpp → CppSharp.CppParser/Sources.cpp
diff --git a/CppSharp.CppParser.Native/Sources.h → CppSharp.CppParser/Sources.h b/CppSharp.CppParser.Native/Sources.h → CppSharp.CppParser/Sources.h
diff --git a/CppSharp.CppParser.Native/Stmt.cpp → CppSharp.CppParser/Stmt.cpp b/CppSharp.CppParser.Native/Stmt.cpp → CppSharp.CppParser/Stmt.cpp
diff --git a/CppSharp.CppParser.Native/Stmt.h → CppSharp.CppParser/Stmt.h b/CppSharp.CppParser.Native/Stmt.h → CppSharp.CppParser/Stmt.h
diff --git a/CppSharp.CppParser.Native/Target.cpp → CppSharp.CppParser/Target.cpp b/CppSharp.CppParser.Native/Target.cpp → CppSharp.CppParser/Target.cpp
diff --git a/CppSharp.CppParser.Native/Target.h → CppSharp.CppParser/Target.h b/CppSharp.CppParser.Native/Target.h → CppSharp.CppParser/Target.h
diff --git a/CppSharp.CppParser.Native/Types.h → CppSharp.CppParser/Types.h b/CppSharp.CppParser.Native/Types.h → CppSharp.CppParser/Types.h
diff --git a/CppSharp.CppParser.Native/meson.build → CppSharp.CppParser/meson.build b/CppSharp.CppParser.Native/meson.build → CppSharp.CppParser/meson.build
diff --git a/CppSharp.Parser/CppSharp.Parser.csproj b/CppSharp.Parser/CppSharp.Parser.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <ProjectReference Include="../CppSharp.AST/CppSharp.AST.csproj" />
     <ProjectReference Include="../CppSharp.Core/CppSharp.Core.csproj" />
-    <ProjectReference Include="../CppSharp.CppParser/CppSharp.CppParser.csproj" />
+    <ProjectReference Include="../CppSharp.CppParser.Managed/CppSharp.CppParser.Managed.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/CppSharp.sln b/CppSharp.sln
@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppSharp.Parser", "CppSharp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppSharp.AST", "CppSharp.AST\CppSharp.AST.csproj", "{7B593DA9-2667-4558-AF79-8822389581A8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppSharp.CppParser", "CppSharp.CppParser\CppSharp.CppParser.csproj", "{6049A13D-A86D-4377-B4FE-E8AFFF111224}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppSharp.Runtime", "CppSharp.Runtime\CppSharp.Runtime.csproj", "{EECC6B8D-E253-4837-A8E1-6C719DCBFB6E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppSharp.Core", "CppSharp.Core\CppSharp.Core.csproj", "{0FF3E8FB-A835-4687-8BA5-1481FE0FC68D}"
@@ -19,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppSharp.Generator", "CppSh
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppSharp.Parser.Bootstrap", "CppSharp.Parser.Bootstrap\CppSharp.Parser.Bootstrap.csproj", "{A4CF99EF-EFE8-449F-8203-B010B9ABB856}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppSharp.CppParser.Managed", "CppSharp.CppParser.Managed\CppSharp.CppParser.Managed.csproj", "{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}"
+EndProject
 Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -56,18 +56,6 @@ Global
 		{7B593DA9-2667-4558-AF79-8822389581A8}.Release|x64.Build.0 = Release|x64
 		{7B593DA9-2667-4558-AF79-8822389581A8}.Release|x86.ActiveCfg = Release|x86
 		{7B593DA9-2667-4558-AF79-8822389581A8}.Release|x86.Build.0 = Release|x86
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Debug|Any CPU.Build.0 = Debug|x86
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Debug|x64.ActiveCfg = Debug|x64
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Debug|x64.Build.0 = Debug|x64
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Debug|x86.ActiveCfg = Debug|x86
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Debug|x86.Build.0 = Debug|x86
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Release|Any CPU.ActiveCfg = Release|x86
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Release|Any CPU.Build.0 = Release|x86
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Release|x64.ActiveCfg = Release|x64
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Release|x64.Build.0 = Release|x64
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Release|x86.ActiveCfg = Release|x86
-		{6049A13D-A86D-4377-B4FE-E8AFFF111224}.Release|x86.Build.0 = Release|x86
 		{EECC6B8D-E253-4837-A8E1-6C719DCBFB6E}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{EECC6B8D-E253-4837-A8E1-6C719DCBFB6E}.Debug|Any CPU.Build.0 = Debug|x86
 		{EECC6B8D-E253-4837-A8E1-6C719DCBFB6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -128,5 +116,17 @@ Global
 		{A4CF99EF-EFE8-449F-8203-B010B9ABB856}.Release|x64.Build.0 = Release|x64
 		{A4CF99EF-EFE8-449F-8203-B010B9ABB856}.Release|x86.ActiveCfg = Release|x86
 		{A4CF99EF-EFE8-449F-8203-B010B9ABB856}.Release|x86.Build.0 = Release|x86
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Debug|x64.Build.0 = Debug|Any CPU
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Debug|x86.Build.0 = Debug|Any CPU
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Release|Any CPU.Build.0 = Release|Any CPU
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Release|x64.ActiveCfg = Release|Any CPU
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Release|x64.Build.0 = Release|Any CPU
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Release|x86.ActiveCfg = Release|Any CPU
+		{393E415E-5C73-4AC0-9E7A-B7E27ECD7C50}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/readme.md b/readme.md
@@ -1,3 +1,3 @@
 $ pushd llvm ; ./build-llvm.sh ; popd
-$ pushd CppSharp.CppParser.Native ; meson setup build -Dprefix=/home/c/dev/CppSharp -Dlibdir=bin/Debug/net8.0 ; meson install -C build ; popd
+$ pushd CppSharp.CppParser ; meson setup build -Dprefix=/home/c/dev/CppSharp -Dlibdir=bin/Debug/net8.0 ; meson install -C build ; popd
 $ dotnet run --project CppSharp.Parser.Bootstrap/CppSharp.Parser.Bootstrap.csproj --framework net8.0