The LunaRoad now works over Conari engine.

Added as submodule https://github.com/3F/Conari.git
3F · Aug 2, 2016 · 04da800 · 04da800
1 parent d679277
commit 04da800
Show file tree

Hide file tree

Showing 43 changed files with 323 additions and 963 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Conari"]
+	path = Conari
+	url = https://github.com/3F/Conari.git
diff --git a/.vssbe b/.vssbe
@@ -209,6 +209,94 @@
   "Transmitter": [],
   "CommandEvent": [],
   "Logging": [],
-  "SlnOpened": [],
+  "SlnOpened": [
+    {
+      "Enabled": true,
+      "Name": "ActReload",
+      "Caption": "Reload projects in solution after adding submodules",
+      "SupportMSBuild": true,
+      "SupportSBEScripts": true,
+      "IgnoreIfBuildFailed": false,
+      "BuildType": "Common",
+      "Confirmation": false,
+      "ToConfiguration": [],
+      "ExecutionOrder": {
+        "$type": "net.r_eg.vsSBE.Events.ExecutionOrder[], vsSolutionBuildEvent",
+        "$values": []
+      },
+      "Process": {
+        "$type": "net.r_eg.vsSBE.Events.EventProcess, vsSolutionBuildEvent",
+        "Waiting": false,
+        "Hidden": true,
+        "TimeLimit": 30
+      },
+      "Mode": {
+        "$type": "net.r_eg.vsSBE.Events.ModeCSharp, vsSolutionBuildEvent",
+        "Type": "CSharp",
+        "References": [
+          "System",
+          "Microsoft.VisualStudio.Shell.Interop.10.0",
+          "Microsoft.VisualStudio.Shell.Interop",
+          "Microsoft.VisualStudio.Shell.10.0",
+          "Microsoft.VisualStudio.Shell.Interop.9.0",
+          "Microsoft.VisualStudio.Shell.Interop.8.0",
+          "Microsoft.VisualStudio.OLE.Interop"
+        ],
+        "SmartReferences": true,
+        "GenerateInMemory": true,
+        "TreatWarningsAsErrors": false,
+        "WarningLevel": 4,
+        "FilesMode": false,
+        "CachingBytecode": false,
+        "LastTime": 0,
+        "Command": "//#[($(ProjectDir:Conari) == \"*Undefined*\" && ( $(BuildingInsideVisualStudio) || $(VSIDE) || $(DevEnvDir) != \"*Undefined*\") ) {\n\nusing System;\nusing Microsoft.VisualStudio;\nusing Microsoft.VisualStudio.Shell.Interop;\nusing ICommand = net.r_eg.vsSBE.Actions.ICommand;\nusing ISolutionEvent = net.r_eg.vsSBE.Events.ISolutionEvent;\n\nnamespace vsSolutionBuildEvent\n{\n    public class CSharpMode\n    {\n        public static int Init(ICommand cmd, ISolutionEvent evt)\n        {\n            System.Diagnostics.Process.Start(\"submodules.bat\").WaitForExit();\n\n            object service      = Microsoft.VisualStudio.Shell.Package.GetGlobalService(typeof(IVsSolution));\n            IVsSolution sln     = (IVsSolution)service;\n            IVsSolution4 sln4   = (IVsSolution4)service;\n\n            IEnumHierarchies projects;\n            Guid gtype = Guid.Empty;\n            if(ErrorHandler.Failed(sln.GetProjectEnum((int)__VSENUMPROJFLAGS.EPF_UNLOADEDINSOLUTION  /*EPF_ALLPROJECTS*/, ref gtype, out projects))) {\n                return 0;\n            }\n\n            var phr = new IVsHierarchy[1];\n            uint count;\n            while((projects.Next((uint)phr.Length, phr, out count) == VSConstants.S_OK) && (count > 0))\n            {\n                Guid pGuid;\n                if(ErrorHandler.Failed(sln.GetGuidOfProject(phr[0], out pGuid))) {\n                    continue;\n                }\n                sln4.EnsureProjectIsLoaded(ref pGuid, (uint)__VSBSLFLAGS.VSBSLFLAGS_None);\n            }\n            \n            return 0;\n        }\n    }\n}\n\n//}]",
+        "Command__": [
+          "//#[($(ProjectDir:Conari) == \"*Undefined*\" && ( $(BuildingInsideVisualStudio) || $(VSIDE) || $(DevEnvDir) != \"*Undefined*\") ) {",
+          "",
+          "using System;",
+          "using Microsoft.VisualStudio;",
+          "using Microsoft.VisualStudio.Shell.Interop;",
+          "using ICommand = net.r_eg.vsSBE.Actions.ICommand;",
+          "using ISolutionEvent = net.r_eg.vsSBE.Events.ISolutionEvent;",
+          "",
+          "namespace vsSolutionBuildEvent",
+          "{",
+          "    public class CSharpMode",
+          "    {",
+          "        public static int Init(ICommand cmd, ISolutionEvent evt)",
+          "        {",
+          "            System.Diagnostics.Process.Start(\"submodules.bat\").WaitForExit();",
+          "",
+          "            object service      = Microsoft.VisualStudio.Shell.Package.GetGlobalService(typeof(IVsSolution));",
+          "            IVsSolution sln     = (IVsSolution)service;",
+          "            IVsSolution4 sln4   = (IVsSolution4)service;",
+          "",
+          "            IEnumHierarchies projects;",
+          "            Guid gtype = Guid.Empty;",
+          "            if(ErrorHandler.Failed(sln.GetProjectEnum((int)__VSENUMPROJFLAGS.EPF_UNLOADEDINSOLUTION  /*EPF_ALLPROJECTS*/, ref gtype, out projects))) {",
+          "                return 0;",
+          "            }",
+          "",
+          "            var phr = new IVsHierarchy[1];",
+          "            uint count;",
+          "            while((projects.Next((uint)phr.Length, phr, out count) == VSConstants.S_OK) && (count > 0))",
+          "            {",
+          "                Guid pGuid;",
+          "                if(ErrorHandler.Failed(sln.GetGuidOfProject(phr[0], out pGuid))) {",
+          "                    continue;",
+          "                }",
+          "                sln4.EnsureProjectIsLoaded(ref pGuid, (uint)__VSBSLFLAGS.VSBSLFLAGS_None);",
+          "            }",
+          "            ",
+          "            return 0;",
+          "        }",
+          "    }",
+          "}",
+          "",
+          "//}]"
+        ]
+      }
+    }
+  ],
   "SlnClosed": []
 }
diff --git a/Conari b/Conari
diff --git a/LunaRoad.nuspec b/LunaRoad.nuspec
@@ -26,7 +26,7 @@
 
     </description>
     <summary>LunaRoad represents a flexible platform to work with Lua C API :: Source code and all details here: https://github.com/3F/LunaRoad</summary>
-    <tags>Lua API LunaRoad dll KeraLua KopiLua NLua</tags>
+    <tags>Lua API LunaRoad dll KeraLua KopiLua NLua LuaInterface Conari</tags>
     <releaseNotes></releaseNotes>
     <copyright>Copyright (c) 2016  Denis Kuzmin [[email protected]] </copyright>
     <references>

diff --git a/LunaRoad.sln b/LunaRoad.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LunaRoad", "LunaRoad\LunaRo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LunaRoadTest", "LunaRoadTest\LunaRoadTest.csproj", "{BC464A8F-DA52-4F2B-87FC-F79D130A15FF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F23EF90C-E980-4827-8107-6FAC6F1B24EF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{F23EF90C-E980-4827-8107-6FAC6F1B24EF}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 		.version = .version
@@ -20,6 +20,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Readme.md = Readme.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{21C4CA5C-BA1D-4065-B8B2-2A12FBDF86BF}"
+	ProjectSection(SolutionItems) = preProject
+		Conari\.gitignore = Conari\.gitignore
+		Conari\.version = Conari\.version
+		Conari\build.bat = Conari\build.bat
+		Conari\changelog.txt = Conari\changelog.txt
+		Conari\Conari.nuspec = Conari\Conari.nuspec
+		Conari\gnt.core = Conari\gnt.core
+		Conari\LICENSE = Conari\LICENSE
+		Conari\packages.config = Conari\packages.config
+		Conari\Readme.md = Conari\Readme.md
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Conari", "Conari\Conari\Conari.csproj", "{27152FD4-7B94-4AF0-A7ED-BE7E7A196D57}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConariTest", "Conari\ConariTest\ConariTest.csproj", "{0AEEC49E-07A5-4A55-9673-9346C3A7BC03}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenDelegates", "Conari\GenDelegates\GenDelegates.csproj", "{40CCC613-93D0-4F80-A99B-36112BD5D815}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Conari", "Conari", "{B8FABCD7-D14E-4105-AE53-F861D8F09A2E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LunaRoad", "LunaRoad", "{F8FFB798-9677-4DF8-ACC8-C806A2A6B3EF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,8 +57,29 @@ Global
 		{BC464A8F-DA52-4F2B-87FC-F79D130A15FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC464A8F-DA52-4F2B-87FC-F79D130A15FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC464A8F-DA52-4F2B-87FC-F79D130A15FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27152FD4-7B94-4AF0-A7ED-BE7E7A196D57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27152FD4-7B94-4AF0-A7ED-BE7E7A196D57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27152FD4-7B94-4AF0-A7ED-BE7E7A196D57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27152FD4-7B94-4AF0-A7ED-BE7E7A196D57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AEEC49E-07A5-4A55-9673-9346C3A7BC03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AEEC49E-07A5-4A55-9673-9346C3A7BC03}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AEEC49E-07A5-4A55-9673-9346C3A7BC03}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AEEC49E-07A5-4A55-9673-9346C3A7BC03}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40CCC613-93D0-4F80-A99B-36112BD5D815}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40CCC613-93D0-4F80-A99B-36112BD5D815}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40CCC613-93D0-4F80-A99B-36112BD5D815}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40CCC613-93D0-4F80-A99B-36112BD5D815}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{359A216F-1B6D-4A82-B75A-09509A23830A} = {F8FFB798-9677-4DF8-ACC8-C806A2A6B3EF}
+		{BC464A8F-DA52-4F2B-87FC-F79D130A15FF} = {F8FFB798-9677-4DF8-ACC8-C806A2A6B3EF}
+		{F23EF90C-E980-4827-8107-6FAC6F1B24EF} = {F8FFB798-9677-4DF8-ACC8-C806A2A6B3EF}
+		{21C4CA5C-BA1D-4065-B8B2-2A12FBDF86BF} = {B8FABCD7-D14E-4105-AE53-F861D8F09A2E}
+		{27152FD4-7B94-4AF0-A7ED-BE7E7A196D57} = {B8FABCD7-D14E-4105-AE53-F861D8F09A2E}
+		{0AEEC49E-07A5-4A55-9673-9346C3A7BC03} = {B8FABCD7-D14E-4105-AE53-F861D8F09A2E}
+		{40CCC613-93D0-4F80-A99B-36112BD5D815} = {B8FABCD7-D14E-4105-AE53-F861D8F09A2E}
+	EndGlobalSection
 EndGlobal
diff --git a/LunaRoad/API/Bridge.cs b/LunaRoad/API/Bridge.cs
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
 */
 
+using net.r_eg.Conari.Core;
 using net.r_eg.LunaRoad.API.Lua51;
 using net.r_eg.LunaRoad.API.Lua52;
 using net.r_eg.LunaRoad.API.Lua53;

diff --git a/LunaRoad/API/Lua51/Func51.cs b/LunaRoad/API/Lua51/Func51.cs
@@ -23,7 +23,9 @@
 */
 
 using System;
+using net.r_eg.Conari.Types;
 using net.r_eg.LunaRoad.Types;
+using TFO = net.r_eg.Conari.Types.Func.Out;
 
 namespace net.r_eg.LunaRoad.API.Lua51
 {
@@ -126,7 +128,7 @@ public LuaNumber tonumber(LuaState L, int index)
         /// </returns>
         public CharPtr tolstring(LuaState L, int index, out size_t len)
         {
-            return bind<FuncOut3<LuaState, int, size_t, IntPtr>>("tolstring")(L, index, out len);
+            return bind<TFO.FuncOut3<LuaState, int, size_t, IntPtr>>("tolstring")(L, index, out len);
         }
 
         /// <summary>

diff --git a/LunaRoad/API/Lua51/ILua51.cs b/LunaRoad/API/Lua51/ILua51.cs
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
 */
 
+using net.r_eg.Conari.Types;
 using net.r_eg.LunaRoad.Types;
 
 namespace net.r_eg.LunaRoad.API.Lua51

diff --git a/LunaRoad/API/Lua51/Impl51.cs b/LunaRoad/API/Lua51/Impl51.cs
@@ -22,6 +22,8 @@
  * THE SOFTWARE.
 */
 
+using net.r_eg.Conari.Core;
+
 namespace net.r_eg.LunaRoad.API.Lua51
 {
     internal class Impl51: Func51, ILevel, ILua51

diff --git a/LunaRoad/API/Lua52/Func52.cs b/LunaRoad/API/Lua52/Func52.cs
@@ -23,8 +23,8 @@
 */
 
 using System;
+using net.r_eg.Conari.Types;
 using net.r_eg.LunaRoad.API.Lua51;
-using net.r_eg.LunaRoad.Types;
 
 namespace net.r_eg.LunaRoad.API.Lua52
 {

diff --git a/LunaRoad/API/Lua52/ILua52.cs b/LunaRoad/API/Lua52/ILua52.cs
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
 */
 
+using net.r_eg.Conari.Types;
 using net.r_eg.LunaRoad.Types;
 
 namespace net.r_eg.LunaRoad.API.Lua52

diff --git a/LunaRoad/API/Lua52/Impl52.cs b/LunaRoad/API/Lua52/Impl52.cs
@@ -22,6 +22,8 @@
  * THE SOFTWARE.
 */
 
+using net.r_eg.Conari.Core;
+
 namespace net.r_eg.LunaRoad.API.Lua52
 {
     internal class Impl52: Func52, ILevel, ILua52

diff --git a/LunaRoad/API/Lua53/ILua53.cs b/LunaRoad/API/Lua53/ILua53.cs
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
 */
 
+using net.r_eg.Conari.Types;
 using net.r_eg.LunaRoad.Types;
 
 namespace net.r_eg.LunaRoad.API.Lua53

diff --git a/LunaRoad/API/Lua53/Impl53.cs b/LunaRoad/API/Lua53/Impl53.cs
@@ -22,6 +22,8 @@
  * THE SOFTWARE.
 */
 
+using net.r_eg.Conari.Core;
+
 namespace net.r_eg.LunaRoad.API.Lua53
 {
     internal class Impl53: Func53, ILevel, ILua53

diff --git a/LunaRoad/API/LuaImplN.cs b/LunaRoad/API/LuaImplN.cs
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
 */
 
+using net.r_eg.Conari.Core;
 using net.r_eg.LunaRoad.API.Lua53;
 
 namespace net.r_eg.LunaRoad.API

diff --git a/LunaRoad/API/LuaX.cs b/LunaRoad/API/LuaX.cs
@@ -23,6 +23,7 @@
 */
 
 using System;
+using net.r_eg.Conari.Core;
 
 namespace net.r_eg.LunaRoad.API
 {

diff --git a/LunaRoad/Exceptions/LoadLibException.cs b/LunaRoad/Exceptions/LoadLibException.cs
diff --git a/LunaRoad/Exceptions/LoaderException.cs b/LunaRoad/Exceptions/LoaderException.cs
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ @@
     */
     using System;
+    using net.r_eg.Conari.Core;
     namespace net.r_eg.LunaRoad.API
     {
@@ Expand Down @@