From 649921f4a822456921d460d5554ec46ee058a5d9 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Fri, 5 Jun 2015 10:19:58 +0200
Subject: Provide some BuildInfo even for non-CI builds.

Ref.: #2204
---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5556ddc4d..c68795bb3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -83,6 +83,7 @@ SET (HDRS
 	BlockTracer.h
 	Broadcaster.h
 	BoundingBox.h
+	BuildInfo.h
 	BuildInfo.h.cmake
 	ByteBuffer.h
 	ChatColor.h
-- 
cgit v1.2.3


From 99b182b4bea0e845ca4c207f4ba6aad7ebbe626a Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Fri, 5 Jun 2015 10:34:13 +0200
Subject: Added Build info to the cRoot API.

---
 src/Bindings/ManualBindings.cpp | 58 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index bce1891e2..7655d8c83 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -34,6 +34,7 @@
 #include "../CompositeChat.h"
 #include "../StringCompression.h"
 #include "../CommandOutput.h"
+#include "../BuildInfo.h"
 
 
 
@@ -2079,6 +2080,50 @@ static int tolua_cLineBlockTracer_Trace(lua_State * tolua_S)
 
 
 
+static int tolua_cRoot_GetBuildCommitID(lua_State * tolua_S)
+{
+	cLuaState L(tolua_S);
+	L.Push(BUILD_COMMIT_ID);
+	return 1;
+}
+
+
+
+
+
+static int tolua_cRoot_GetBuildDateTime(lua_State * tolua_S)
+{
+	cLuaState L(tolua_S);
+	L.Push(BUILD_DATETIME);
+	return 1;
+}
+
+
+
+
+
+static int tolua_cRoot_GetBuildID(lua_State * tolua_S)
+{
+	cLuaState L(tolua_S);
+	L.Push(BUILD_ID);
+	return 1;
+}
+
+
+
+
+
+static int tolua_cRoot_GetBuildSeriesName(lua_State * tolua_S)
+{
+	cLuaState L(tolua_S);
+	L.Push(BUILD_SERIES_NAME);
+	return 1;
+}
+
+
+
+
+
 static int tolua_cRoot_GetFurnaceRecipe(lua_State * tolua_S)
 {
 	cLuaState L(tolua_S);
@@ -2092,7 +2137,8 @@ static int tolua_cRoot_GetFurnaceRecipe(lua_State * tolua_S)
 	}
 	
 	// Check the input param:
-	cItem * Input = (cItem *)tolua_tousertype(L, 2, nullptr);
+	cItem * Input = nullptr;
+	L.GetStackValue(2, Input);
 	if (Input == nullptr)
 	{
 		LOGWARNING("cRoot:GetFurnaceRecipe: the Input parameter is nil or missing.");
@@ -2109,9 +2155,9 @@ static int tolua_cRoot_GetFurnaceRecipe(lua_State * tolua_S)
 	}
 	
 	// Push the output, number of ticks and input as the three return values:
-	tolua_pushusertype(L, Recipe->Out, "const cItem");
-	tolua_pushnumber  (L, (lua_Number)(Recipe->CookTime));
-	tolua_pushusertype(L, Recipe->In, "const cItem");
+	L.Push(Recipe->Out);
+	L.Push(Recipe->CookTime);
+	L.Push(Recipe->In);
 	return 3;
 }
 
@@ -2868,6 +2914,10 @@ void cManualBindings::Bind(lua_State * tolua_S)
 			tolua_function(tolua_S, "DoWithPlayerByUUID",  DoWith <cRoot, cPlayer, &cRoot::DoWithPlayerByUUID>);
 			tolua_function(tolua_S, "ForEachPlayer",       ForEach<cRoot, cPlayer, &cRoot::ForEachPlayer>);
 			tolua_function(tolua_S, "ForEachWorld",        ForEach<cRoot, cWorld,  &cRoot::ForEachWorld>);
+			tolua_function(tolua_S, "GetBuildCommitID",    tolua_cRoot_GetBuildCommitID);
+			tolua_function(tolua_S, "GetBuildDateTime",    tolua_cRoot_GetBuildDateTime);
+			tolua_function(tolua_S, "GetBuildID",          tolua_cRoot_GetBuildID);
+			tolua_function(tolua_S, "GetBuildSeriesName",  tolua_cRoot_GetBuildSeriesName);
 			tolua_function(tolua_S, "GetFurnaceRecipe",    tolua_cRoot_GetFurnaceRecipe);
 		tolua_endmodule(tolua_S);
 
-- 
cgit v1.2.3