Added sysinfo (System Information) functionalities

- More informative messages are displayed during startup, to make it easier to identify what system and environment Hercules is running. - Git/SVN revision detection is improved, separating the source version (cached at compile time) from the runtime version, in case the user updated their working copy without recompiling the server. Git version detection is also more reliable, in case a non-default branch is used. - The get_revision script command has been removed (as it was useless to begin with, after the switch to git). An alternative will be provided later, for feature-probing purposes. - The patch was tested under Linux (Gentoo / gcc 4.7 on i686 and x86_64, Debian 6 / gcc 4.4 on i686, Raspbian / gcc 4.6 on armv6l, CentOS 5 / gcc 4.1 on i686, CentOS 6 / gcc 4.4 on x86_64, Linux Mint 15 / gcc 4.7 on x86_64, OS X Mountain Lion / clang 5.0 and gcc 4.8 on x86_64, Cygwin-NT-5.1/gcc 4.8 on i686, FreeBSD 8 / gcc 4.2 on i386, FreeBSD 9 / gcc 4.2 on amd64, FreeBSD 10 / clang 3.3 on amd64, NetBSD 5 / gcc 4.1 on i386, NetBSD 6 / gcc 4.5 on amd64, OpenBSD 5 / gcc 4.2 on amd64, Solaris 11 / gcc 4.5 on i86pc, Windows 7 / Visual Studio 2012 on x86, Windows 8 / Visual Studio 2010 on WOW64, Windows 8.1 / Visual Studio 2013 on WOW64. Signed-off-by: Haru <haru@dotalux.com>
author: Haru <haru@dotalux.com> 2013-10-18 13:21:34 +0200
committer: Haru <haru@dotalux.com> 2014-04-17 06:09:49 +0200
commit: 7b12dd06420fae973fbcc2f81f5d385e59788c78 (patch)
tree: 5bad1c4f2e44f5d4b49c82fafdd46177d15b9b97
parent: 8a84d46a19b0112b7e2417728b8816e8b34b7383 (diff)
download: hercules-7b12dd06420fae973fbcc2f81f5d385e59788c78.tar.gz
hercules-7b12dd06420fae973fbcc2f81f5d385e59788c78.tar.bz2
hercules-7b12dd06420fae973fbcc2f81f5d385e59788c78.tar.xz
hercules-7b12dd06420fae973fbcc2f81f5d385e59788c78.zip
55 files changed, 1638 insertions, 239 deletions
diff --git a/.gitignore b/.gitignore
index c43c27e31..69782bcd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,7 +69,7 @@ Thumbs.db
 /src/common/Makefile
 /src/common/obj_all
 /src/common/obj_sql
-/src/common/svnversion.h
+/src/common/sysinfo.inc
 
 # /src/login/
 /src/login/Makefile
diff --git a/3rdparty/libconfig/Makefile.in b/3rdparty/libconfig/Makefile.in
index 88c5eba96..e27aab30a 100644
--- a/3rdparty/libconfig/Makefile.in
+++ b/3rdparty/libconfig/Makefile.in
@@ -1,3 +1,5 @@
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
 
 LIBCONFIG_OBJ = libconfig.o grammar.o scanctx.o scanner.o strbuf.o
 LIBCONFIG_H = libconfig.h grammar.h parsectx.h scanctx.h scanner.h strbuf.h wincompat.h
diff --git a/3rdparty/mt19937ar/Makefile.in b/3rdparty/mt19937ar/Makefile.in
index 5d8e19994..61f0556be 100644
--- a/3rdparty/mt19937ar/Makefile.in
+++ b/3rdparty/mt19937ar/Makefile.in
@@ -1,3 +1,5 @@
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
 
 MT19937AR_OBJ = mt19937ar.o
 MT19937AR_H = mt19937ar.h
diff --git a/Makefile.in b/Makefile.in
index d61a885b4..e987c713f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,14 +1,17 @@
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
+
 @SET_MAKE@
 
 HAVE_MYSQL=@HAVE_MYSQL@
 ifeq ($(HAVE_MYSQL),yes)
-	ALL_DEPENDS=common_sql login_sql char_sql map_sql tools | import
-	SQL_DEPENDS=common_sql login_sql char_sql map_sql | import
-	COMMON_SQL_DEPENDS=mt19937ar libconfig
-	LOGIN_SQL_DEPENDS=mt19937ar libconfig common_sql
-	CHAR_SQL_DEPENDS=mt19937ar libconfig common_sql
-	MAP_SQL_DEPENDS=mt19937ar libconfig common_sql
-	TOOLS_DEPENDS=mt19937ar libconfig common_sql
+	ALL_DEPENDS=common_sql login_sql char_sql map_sql tools sysinfo | import
+	SQL_DEPENDS=common_sql login_sql char_sql map_sql sysinfo | import
+	COMMON_SQL_DEPENDS=mt19937ar libconfig sysinfo
+	LOGIN_SQL_DEPENDS=mt19937ar libconfig common_sql sysinfo
+	CHAR_SQL_DEPENDS=mt19937ar libconfig common_sql sysinfo
+	MAP_SQL_DEPENDS=mt19937ar libconfig common_sql sysinfo
+	TOOLS_DEPENDS=mt19937ar libconfig common_sql sysinfo
 else
 	ALL_DEPENDS=needs_mysql
 	SQL_DEPENDS=needs_mysql
@@ -51,6 +54,7 @@ export CC
 	clean \
 	buildclean \
 	distclean \
+	sysinfo \
 	hooks \
 	help
 
@@ -140,6 +144,14 @@ clean buildclean: $(MF_TARGETS)
 distclean: clean
 	@-rm -f $(MF_TARGETS) config.status config.log
 
+sysinfo:
+	@./sysinfogen.sh src/common/sysinfo_new.inc @CFLAGS@
+	@if cmp -s src/common/sysinfo.inc src/common/sysinfo_new.inc; then \
+		rm src/common/sysinfo_new.inc ; \
+	else \
+		mv src/common/sysinfo_new.inc src/common/sysinfo.inc ; \
+	fi
+
 help: Makefile
 	@echo "most common targets are 'all' 'sql' 'clean' 'plugins' 'help'"
 	@echo "possible targets are:"
@@ -161,8 +173,9 @@ help: Makefile
 	@echo "'buildclean'  - cleans build temporary (object) files, without deleting the"
 	@echo "                executables"
 	@echo "'distclean'   - cleans files generated by ./configure"
+	@echo "'sysinfo'     - re-generates the System Info include"
 ifeq ($(HAVE_PERL)$(HAVE_DOXYGEN),yesyes)
-	@echo "'hooks'       - re-generates the definitions for the HPM Hooking plugin"
+	@echo "'hooks'       - re-generates the definitions for the HPM"
 endif
 	@echo "'help'        - outputs this message"
 
diff --git a/conf/messages.conf b/conf/messages.conf
index 2eba688cd..2f6a98882 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -1223,12 +1223,11 @@
 1289: %s spawns in:
 1290: This monster does not spawn normally.
 
-//1291-1293 FREE
+//1291-1294 FREE
 
 // @version
-1294: SVN r%s
-1295: Git Hash '%s'
-1296: Cannot determine version.
+1295: %s revision '%s' (src) / '%s' (scripts)
+1296: Hercules %d-bit for %s
 
 // @mutearea
 1297: Please enter a time in minutes (usage: @mutearea/@stfu <time in minutes>).
diff --git a/script-checker b/script-checker
index f4a277e2d..7be4bc51a 100755
--- a/script-checker
+++ b/script-checker
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 # See the LICENSE file
@@ -13,10 +13,18 @@ if [ -z "$1" ]; then
 	echo "No file specified."
 	echo "Usage: $0 <path to the script>"
 	echo " (you may use a relative or absolute path)"
-	exit -1
+	exit 1
 fi
+case "$1" in
+	/*)
+		FILE="$1"
+		;;
+	*)
+		FILE="${ORIG_CWD}/$1"
+		;;
+esac
 if [ ! -x "$EXECUTABLE" ]; then
-	exit -1
+	exit 1
 fi
 
 while [ -n "$1" ]; do
diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index ab1e7c234..ecaad3602 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -1,9 +1,12 @@
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
 
 CONFIG_D = ../config
 CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h)
 
 COMMON_D = ../common
 COMMON_H = $(wildcard $(COMMON_D)/*.h)
+SYSINFO_INC = $(COMMON_D)/sysinfo.inc
 
 LIBCONFIG_D = ../../3rdparty/libconfig
 LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \
@@ -27,7 +30,7 @@ CHAR_H = char.h inter.h int_auction.h int_elemental.h int_guild.h int_homun.h \
 
 HAVE_MYSQL=@HAVE_MYSQL@
 ifeq ($(HAVE_MYSQL),yes)
-	CHAR_SERVER_SQL_DEPENDS=$(CHAR_OBJ) $(COMMON_D)/obj_sql/common_sql.a $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ)
+	CHAR_SERVER_SQL_DEPENDS=$(CHAR_OBJ) $(COMMON_D)/obj_sql/common_sql.a $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) $(SYSINFO_INC)
 else
 	CHAR_SERVER_SQL_DEPENDS=needs_mysql
 endif
@@ -66,6 +69,10 @@ help:
 Makefile: Makefile.in
 	@$(MAKE) -C ../.. src/char/Makefile
 
+$(SYSINFO_INC): $(CHAR_C) $(CHAR_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H)
+	@echo "	MAKE	$@"
+	@$(MAKE) -C ../.. sysinfo
+
 needs_mysql:
 	@echo "MySQL not found or disabled by the configure script"
 	@exit 1
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 971eb83bd..6d2c45641 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -703,8 +703,6 @@ void hplugins_share_defaults(void) {
 	HPM->share(&arg_c,"arg_c");
 	HPM->share(SERVER_NAME,"SERVER_NAME");
 	HPM->share(&SERVER_TYPE,"SERVER_TYPE");
-	HPM->share((void*)get_svn_revision,"get_svn_revision");
-	HPM->share((void*)get_git_hash,"get_git_hash");
 	HPM->share(DB, "DB");
 	HPM->share(HPMiMalloc, "iMalloc");
 	/* socket */
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 7bb9ae630..623c59c2e 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -1,3 +1,5 @@
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
 
 CONFIG_D = ../config
 CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h)
@@ -15,8 +17,8 @@ MT19937AR_H = $(MT19937AR_D)/mt19937ar.h
 MT19937AR_INCLUDE = -I$(MT19937AR_D)
 
 COMMON_SHARED_C = conf.c db.c des.c ers.c grfio.c HPM.c mapindex.c md5calc.c \
-                  mutex.c nullpo.c random.c showmsg.c strlib.c thread.c \
-                  timer.c utils.c
+                  mutex.c nullpo.c random.c showmsg.c strlib.c sysinfo.c \
+                  thread.c timer.c utils.c
 COMMON_C = $(COMMON_SHARED_C)
 COMMON_SHARED_OBJ = $(patsubst %.c,%.o,$(COMMON_SHARED_C))
 COMMON_OBJ = $(addprefix obj_all/, $(COMMON_SHARED_OBJ) \
@@ -27,11 +29,12 @@ COMMON_C += console.c core.c malloc.c socket.c
 COMMON_H = atomic.h cbasetypes.h conf.h console.h core.h db.h des.h ers.h \
            grfio.h HPM.h HPMi.h malloc.h mapindex.h md5calc.h mmo.h mutex.h \
            nullpo.h random.h showmsg.h socket.h spinlock.h sql.h strlib.h \
-           thread.h timer.h utils.h winapi.h
+           sysinfo.h thread.h timer.h utils.h winapi.h
 
 COMMON_SQL_OBJ = obj_sql/sql.o
 COMMON_SQL_H = sql.h
 COMMON_C += sql.c
+SYSINFO_INC = sysinfo.inc
 
 HAVE_MYSQL=@HAVE_MYSQL@
 ifeq ($(HAVE_MYSQL),yes)
@@ -54,7 +57,7 @@ sql: $(SQL_DEPENDS)
 
 buildclean:
 	@echo "	CLEAN	common (build temp files)"
-	@rm -rf *.o obj_all obj_sql
+	@rm -rf *.o obj_all obj_sql sysinfo.inc
 
 clean: buildclean
 	@echo "	CLEAN	common"
@@ -71,6 +74,10 @@ help:
 Makefile: Makefile.in
 	@$(MAKE) -C ../.. src/common/Makefile
 
+$(SYSINFO_INC): $(COMMON_C) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H)
+	@echo "	MAKE	$@"
+	@$(MAKE) -C ../.. sysinfo
+
 needs_mysql:
 	@echo "MySQL not found or disabled by the configure script"
 	@exit 1
@@ -103,19 +110,20 @@ common_mini: $(COMMON_MINI_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) obj_all/common
 
 common_sql: $(COMMON_SQL_OBJ) obj_sql/common_sql.a Makefile
 
-obj_all/%.o: %.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_all
+obj_all/sysinfo.o: sysinfo.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) $(SYSINFO_INC) | obj_all
+
+obj_all/%.o: %.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | $(SYSINFO_INC) obj_all
 	@echo "	CC	$<"
 	@$(CC) @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
 
-obj_all/mini%.o: %.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_all
+obj_all/mini%.o: %.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | $(SYSINFO_INC) obj_all
 	@echo "	CC	$<"
 	@$(CC) @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
 
-obj_sql/%.o: %.c $(COMMON_H) $(COMMON_SQL_H) $(CONFIG_H) $(LIBCONFIG_H) | obj_sql
+obj_sql/%.o: %.c $(COMMON_H) $(COMMON_SQL_H) $(CONFIG_H) $(LIBCONFIG_H) | $(SYSINFO_INC) obj_sql
 	@echo "	CC	$<"
 	@$(CC) @CFLAGS@ $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
 
-
 # missing object files
 $(MT19937AR_OBJ):
 	@echo "	MAKE	$@"
diff --git a/src/common/console.c b/src/common/console.c
index ec228b563..d8f352c8a 100644
--- a/src/common/console.c
+++ b/src/common/console.c
@@ -5,6 +5,7 @@
 #include "../common/cbasetypes.h"
 #include "../common/showmsg.h"
 #include "../common/core.h"
+#include "../common/sysinfo.h"
 #include "../config/core.h"
 #include "console.h"
 
@@ -41,8 +42,7 @@ struct console_interface console_s;
  *	CORE : Display title
  *--------------------------------------*/
 void display_title(void) {
-	const char* svn = get_svn_revision();
-	const char* git = get_git_hash();
+	const char *vcstype = sysinfo->vcstype();
 
 	ShowMessage("\n");
 	ShowMessage(""CL_BG_RED""CL_BT_WHITE"                                                                      "CL_CLL""CL_NORMAL"\n");
@@ -57,10 +57,13 @@ void display_title(void) {
 	ShowMessage(""CL_BG_RED""CL_BT_WHITE"                    http://hercules.ws/board/                         "CL_CLL""CL_NORMAL"\n");
 	ShowMessage(""CL_BG_RED""CL_BT_WHITE"                                                                      "CL_CLL""CL_NORMAL"\n");
 
-	if( git[0] != HERC_UNKNOWN_VER )
-		ShowInfo("Git Hash: '"CL_WHITE"%s"CL_RESET"'\n", git);
-	else if( svn[0] != HERC_UNKNOWN_VER )
-		ShowInfo("SVN Revision: '"CL_WHITE"%s"CL_RESET"'\n", svn);
+	ShowInfo("Hercules %d-bit for %s\n", sysinfo->is64bit() ? 64 : 32, sysinfo->platform());
+	ShowInfo("%s revision (src): '"CL_WHITE"%s"CL_RESET"'\n", vcstype, sysinfo->vcsrevision_src());
+	ShowInfo("%s revision (scripts): '"CL_WHITE"%s"CL_RESET"'\n", vcstype, sysinfo->vcsrevision_scripts());
+	ShowInfo("OS version: '"CL_WHITE"%s"CL_RESET" [%s]'\n", sysinfo->osversion(), sysinfo->arch());
+	ShowInfo("CPU: '"CL_WHITE"%s [%d]"CL_RESET"'\n", sysinfo->cpu(), sysinfo->cpucores());
+	ShowInfo("Compiled with %s\n", sysinfo->compiler());
+	ShowInfo("Compile Flags: %s\n", sysinfo->cflags());
 }
 #ifdef CONSOLE_INPUT
 #if defined(WIN32)
diff --git a/src/common/core.c b/src/common/core.c
index c6075da40..798c832f0 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -9,6 +9,7 @@
 #include "core.h"
 #include "../common/console.h"
 #include "../common/random.h"
+#include "../common/sysinfo.h"
 
 #ifndef MINICORE
 	#include "../common/db.h"
@@ -78,7 +79,7 @@ sigfunc *compat_signal(int signo, sigfunc *func) {
  *--------------------------------------*/
 #ifdef _WIN32
 static BOOL WINAPI console_handler(DWORD c_event) {
-    switch(c_event) {
+	switch(c_event) {
 		case CTRL_CLOSE_EVENT:
 		case CTRL_LOGOFF_EVENT:
 		case CTRL_SHUTDOWN_EVENT:
@@ -89,8 +90,8 @@ static BOOL WINAPI console_handler(DWORD c_event) {
 			break;
 		default:
 			return FALSE;
-    }
-    return TRUE;
+	}
+	return TRUE;
 }
 
 static void cevents_init() {
@@ -152,134 +153,21 @@ void signals_init (void) {
 }
 #endif
 
-const char* get_svn_revision(void) {
-	static char svn_version_buffer[16] = "";
-	FILE *fp;
-
-	if( svn_version_buffer[0] != '\0' )
-		return svn_version_buffer;
-
-	// subversion 1.7 uses a sqlite3 database
-	// FIXME this is hackish at best...
-	// - ignores database file structure
-	// - assumes the data in NODES.dav_cache column ends with "!svn/ver/<revision>/<path>)"
-	// - since it's a cache column, the data might not even exist
-	if( (fp = fopen(".svn"PATHSEP_STR"wc.db", "rb")) != NULL || (fp = fopen(".."PATHSEP_STR".svn"PATHSEP_STR"wc.db", "rb")) != NULL )
-	{
-	#ifndef SVNNODEPATH
-		//not sure how to handle branches, so i'll leave this overridable define until a better solution comes up
-		#define SVNNODEPATH trunk
-	#endif
-		const char* prefix = "!svn/ver/";
-		const char* postfix = "/"EXPAND_AND_QUOTE(SVNNODEPATH)")"; // there should exist only 1 entry like this
-		size_t prefix_len = strlen(prefix);
-		size_t postfix_len = strlen(postfix);
-		size_t i,j,len;
-		char* buffer;
-
-		// read file to buffer
-		fseek(fp, 0, SEEK_END);
-		len = ftell(fp);
-		buffer = (char*)aMalloc(len + 1);
-		fseek(fp, 0, SEEK_SET);
-		len = fread(buffer, 1, len, fp);
-		buffer[len] = '\0';
-		fclose(fp);
-
-		// parse buffer
-		for( i = prefix_len + 1; i + postfix_len <= len; ++i ) {
-			if( buffer[i] != postfix[0] || memcmp(buffer + i, postfix, postfix_len) != 0 )
-				continue; // postfix missmatch
-			for( j = i; j > 0; --j ) {// skip digits
-				if( !ISDIGIT(buffer[j - 1]) )
-					break;
-			}
-			if( memcmp(buffer + j - prefix_len, prefix, prefix_len) != 0 )
-				continue; // prefix missmatch
-			// done
-			snprintf(svn_version_buffer, sizeof(svn_version_buffer), "%d", atoi(buffer + j));
-			break;
-		}
-		aFree(buffer);
-
-		if( svn_version_buffer[0] != '\0' )
-			return svn_version_buffer;
-	}
-
-	// subversion 1.6 and older?
-	if ((fp = fopen(".svn/entries", "r")) != NULL) {
-		char line[1024];
-		int rev;
-		// Check the version
-		if (fgets(line, sizeof(line), fp)) {
-			if(!ISDIGIT(line[0])) {
-				// XML File format
-				while (fgets(line,sizeof(line),fp))
-					if (strstr(line,"revision=")) break;
-				if (sscanf(line," %*[^\"]\"%d%*[^\n]", &rev) == 1) {
-					snprintf(svn_version_buffer, sizeof(svn_version_buffer), "%d", rev);
-				}
-			} else {
-				// Bin File format
-				if ( fgets(line, sizeof(line), fp) == NULL ) { printf("Can't get bin name\n"); } // Get the name
-				if ( fgets(line, sizeof(line), fp) == NULL ) { printf("Can't get entries kind\n"); } // Get the entries kind
-				if(fgets(line, sizeof(line), fp)) { // Get the rev numver
-					snprintf(svn_version_buffer, sizeof(svn_version_buffer), "%d", atoi(line));
-				}
-			}
-		}
-		fclose(fp);
-
-		if( svn_version_buffer[0] != '\0' )
-			return svn_version_buffer;
-	}
-
-	// fallback
-	svn_version_buffer[0] = HERC_UNKNOWN_VER;
-	return svn_version_buffer;
-}
-/* whats our origin */
-#define GIT_ORIGIN "refs/remotes/origin/master"
-/* Grabs the hash from the last time the user updated his working copy (last pull)  */
-const char *get_git_hash (void) {
-	static char HerculesGitHash[41] = "";//Sha(40) + 1
-	FILE *fp;
-	
-	if( HerculesGitHash[0] != '\0' )
-		return HerculesGitHash;
-	
-	if ( (fp = fopen (".git/"GIT_ORIGIN, "r")) != NULL) {
-		char line[64];
-		char *rev = malloc (sizeof (char) * 50);
-		
-		if (fgets (line, sizeof (line), fp) && sscanf (line, "%50s", rev))
-			snprintf (HerculesGitHash, sizeof (HerculesGitHash), "%s", rev);
-		
-		free (rev);
-		fclose (fp);
-	} else {
-		HerculesGitHash[0] = HERC_UNKNOWN_VER;
-	}
-	
-	if (! (*HerculesGitHash)) {
-		HerculesGitHash[0] = HERC_UNKNOWN_VER;
-	}
-	
-	return HerculesGitHash;
-}
-// Warning if executed as superuser (root)
+/**
+ * Warns the user if executed as superuser (root)
+ */
 void usercheck(void) {
-#ifndef _WIN32
-    if (geteuid() == 0) {
-		ShowWarning ("You are running Hercules with root privileges, it is not necessary.\n");
-    }
-#endif
+	if (sysinfo->is_superuser()) {
+		ShowWarning("You are running Hercules with root privileges, it is not necessary.\n");
+	}
 }
+
 void core_defaults(void) {
 #ifndef MINICORE
 	hpm_defaults();
 	HCache_defaults();
 #endif
+	sysinfo_defaults();
 	console_defaults();
 	strlib_defaults();
 	malloc_defaults();
@@ -318,16 +206,18 @@ int main (int argc, char **argv) {
 	
 	iMalloc->init();// needed for Show* in display_title() [FlavioJS]
 
+	sysinfo->init();
+
 	if (!(msg_silent&0x1))
 		console->display_title();
-	
-#ifdef MINICORE // minimalist Core
+
 	usercheck();
+
+#ifdef MINICORE // minimalist Core
 	do_init(argc,argv);
 	do_final();
 #else// not MINICORE
 	set_server_type();
-	usercheck();
 
 	Sql_Init();
 	rathread_init();
@@ -348,10 +238,8 @@ int main (int argc, char **argv) {
 	
 	HCache->init();
 	
-#ifndef MINICORE
 	HPM->init();
-#endif
-		
+
 	sockt->init();
 
 	do_init(argc,argv);
@@ -366,15 +254,14 @@ int main (int argc, char **argv) {
 	console->final();
 	
 	do_final();
-#ifndef MINICORE
 	HPM->final();
-#endif
 	timer->final();
 	sockt->final();
 	DB->final();
 	rathread_final();
 	ers_final();
 #endif
+	sysinfo->final();
 
 	iMalloc->final();
 
diff --git a/src/common/core.h b/src/common/core.h
index 72f956e1d..2cb623bc2 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -32,8 +32,6 @@ enum server_types {
 
 enum server_types SERVER_TYPE;
 
-const char *get_svn_revision(void);
-const char *get_git_hash (void);
 extern int do_init(int,char**);
 extern void set_server_type(void);
 extern void do_abort(void);
diff --git a/src/common/malloc.c b/src/common/malloc.c
index f7f108304..5b39cbab6 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -5,6 +5,7 @@
 #include "../common/malloc.h"
 #include "../common/core.h"
 #include "../common/showmsg.h"
+#include "../common/sysinfo.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -574,17 +575,14 @@ static void memmgr_log (char *buf)
 	if( !log_fp ) {
 		time_t raw;
 		struct tm* t;
-		const char* svn = get_svn_revision();
-		const char* git = get_git_hash();
 
 		log_fp = fopen(memmer_logfile,"at");
 		if (!log_fp) log_fp = stdout;
 
 		time(&raw);
 		t = localtime(&raw);
-		fprintf(log_fp, "\nMemory manager: Memory leaks found at %d/%02d/%02d %02dh%02dm%02ds (rev %s).\n",
-			(t->tm_year+1900), (t->tm_mon+1), t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec,
-			git[0] != HERC_UNKNOWN_VER ? git : svn[0] != HERC_UNKNOWN_VER ? svn : "Unknown");
+		fprintf(log_fp, "\nMemory manager: Memory leaks found at %d/%02d/%02d %02dh%02dm%02ds (%s rev '%s').\n",
+			(t->tm_year+1900), (t->tm_mon+1), t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, sysinfo->vcstype(), sysinfo->vcsrevision_src());
 	}
 	fprintf(log_fp, "%s", buf);
 	return;
diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c
new file mode 100644
index 000000000..a56896458
--- /dev/null
+++ b/src/common/sysinfo.c
@@ -0,0 +1,1022 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Base Author: Haru @ http://hercules.ws
+
+/// See sysinfo.h for a description of this file
+
+#define _COMMON_SYSINFO_P_
+#include "sysinfo.h"
+#undef _COMMON_SYSINFO_P_
+
+#include "../common/cbasetypes.h"
+#include "../common/core.h"
+#include "../common/strlib.h"
+#include "../common/malloc.h"
+
+#ifdef WIN32
+#include <windows.h>
+#include <string.h> // strlen
+#else
+#include <unistd.h>
+#endif
+#include <stdio.h> // fopen
+#include <stdlib.h> // atoi
+
+/// sysinfo.c interface source
+struct sysinfo_interface sysinfo_s;
+struct sysinfo_private sysinfo_p;
+
+#define VCSTYPE_UNKNOWN 0
+#define VCSTYPE_GIT 1
+#define VCSTYPE_SVN 2
+#define VCSTYPE_NONE -1
+
+#ifdef WIN32
+/**
+ * Values to be used with GetProductInfo.
+ *
+ * These aren't defined in MSVC2008/WindowsXP, so we gotta define them here.
+ * Values from: http://msdn.microsoft.com/en-us/library/windows/desktop/ms724358%28v=vs.85%29.aspx
+ */
+enum windows_product_type {
+	msPRODUCT_UNDEFINED                           = 0x00000000, ///< An unknown product
+	msPRODUCT_ULTIMATE                            = 0x00000001, ///< Ultimate
+	msPRODUCT_HOME_BASIC                          = 0x00000002, ///< Home Basic
+	msPRODUCT_HOME_PREMIUM                        = 0x00000003, ///< Home Premium
+	msPRODUCT_ENTERPRISE                          = 0x00000004, ///< Enterprise
+	msPRODUCT_HOME_BASIC_N                        = 0x00000005, ///< Home Basic N
+	msPRODUCT_BUSINESS                            = 0x00000006, ///< Business
+	msPRODUCT_STANDARD_SERVER                     = 0x00000007, ///< Server Standard
+	msPRODUCT_DATACENTER_SERVER                   = 0x00000008, ///< Server Datacenter (full installation)
+	msPRODUCT_SMALLBUSINESS_SERVER                = 0x00000009, ///< Windows Small Business Server
+	msPRODUCT_ENTERPRISE_SERVER                   = 0x0000000A, ///< Server Enterprise (full installation)
+	msPRODUCT_STARTER                             = 0x0000000B, ///< Starter
+	msPRODUCT_DATACENTER_SERVER_CORE              = 0x0000000C, ///< Server Datacenter (core installation)
+	msPRODUCT_ENTERPRISE_SERVER_CORE              = 0x0000000E, ///< Server Enterprise (core installation)
+	msPRODUCT_STANDARD_SERVER_CORE                = 0x0000000D, ///< Server Standard (core installation)
+	msPRODUCT_ENTERPRISE_SERVER_IA64              = 0x0000000F, ///< Server Enterprise for Itanium-based Systems
+	msPRODUCT_BUSINESS_N                          = 0x00000010, ///< Business N
+	msPRODUCT_WEB_SERVER                          = 0x00000011, ///< Web Server (full installation)
+	msPRODUCT_CLUSTER_SERVER                      = 0x00000012, ///< HPC Edition
+	msPRODUCT_HOME_SERVER                         = 0x00000013, ///< Windows Storage Server 2008 R2 Essentials
+	msPRODUCT_STORAGE_EXPRESS_SERVER              = 0x00000014, ///< Storage Server Express
+	msPRODUCT_STORAGE_STANDARD_SERVER             = 0x00000015, ///< Storage Server Standard
+	msPRODUCT_STORAGE_WORKGROUP_SERVER            = 0x00000016, ///< Storage Server Workgroup
+	msPRODUCT_STORAGE_ENTERPRISE_SERVER           = 0x00000017, ///< Storage Server Enterprise
+	msPRODUCT_SERVER_FOR_SMALLBUSINESS            = 0x00000018, ///< Windows Server 2008 for Windows Essential Server Solutions
+	msPRODUCT_SMALLBUSINESS_SERVER_PREMIUM        = 0x00000019, ///< Small Business Server Premium
+	msPRODUCT_HOME_PREMIUM_N                      = 0x0000001A, ///< Home Premium N
+	msPRODUCT_ENTERPRISE_N                        = 0x0000001B, ///< Enterprise N
+	msPRODUCT_ULTIMATE_N                          = 0x0000001C, ///< Ultimate N
+	msPRODUCT_WEB_SERVER_CORE                     = 0x0000001D, ///< Web Server (core installation)
+	msPRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT    = 0x0000001E, ///< Windows Essential Business Server Management Server
+	msPRODUCT_MEDIUMBUSINESS_SERVER_SECURITY      = 0x0000001F, ///< Windows Essential Business Server Security Server
+	msPRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING     = 0x00000020, ///< Windows Essential Business Server Messaging Server
+	msPRODUCT_SERVER_FOUNDATION                   = 0x00000021, ///< Server Foundation
+	msPRODUCT_HOME_PREMIUM_SERVER                 = 0x00000022, ///< Windows Home Server 2011
+	msPRODUCT_SERVER_FOR_SMALLBUSINESS_V          = 0x00000023, ///< Windows Server 2008 without Hyper-V for Windows Essential Server Solutions
+	msPRODUCT_STANDARD_SERVER_V                   = 0x00000024, ///< Server Standard without Hyper-V
+	msPRODUCT_DATACENTER_SERVER_V                 = 0x00000025, ///< Server Datacenter without Hyper-V (full installation)
+	msPRODUCT_ENTERPRISE_SERVER_V                 = 0x00000026, ///< Server Enterprise without Hyper-V (full installation)
+	msPRODUCT_DATACENTER_SERVER_CORE_V            = 0x00000027, ///< Server Datacenter without Hyper-V (core installation)
+	msPRODUCT_STANDARD_SERVER_CORE_V              = 0x00000028, ///< Server Standard without Hyper-V (core installation)
+	msPRODUCT_ENTERPRISE_SERVER_CORE_V            = 0x00000029, ///< Server Enterprise without Hyper-V (core installation)
+	msPRODUCT_HYPERV                              = 0x0000002A, ///< Microsoft Hyper-V Server
+	msPRODUCT_STORAGE_EXPRESS_SERVER_CORE         = 0x0000002B, ///< Storage Server Express (core installation)
+	msPRODUCT_STORAGE_STANDARD_SERVER_CORE        = 0x0000002C, ///< Storage Server Standard (core installation)
+	msPRODUCT_STORAGE_WORKGROUP_SERVER_CORE       = 0x0000002D, ///< Storage Server Workgroup (core installation)
+	msPRODUCT_STORAGE_ENTERPRISE_SERVER_CORE      = 0x0000002E, ///< Storage Server Enterprise (core installation)
+	msPRODUCT_STARTER_N                           = 0x0000002F, ///< Starter N
+	msPRODUCT_PROFESSIONAL                        = 0x00000030, ///< Professional
+	msPRODUCT_PROFESSIONAL_N                      = 0x00000031, ///< Professional N
+	msPRODUCT_SB_SOLUTION_SERVER                  = 0x00000032, ///< Windows Small Business Server 2011 Essentials
+	msPRODUCT_SERVER_FOR_SB_SOLUTIONS             = 0x00000033, ///< Server For SB Solutions
+	msPRODUCT_STANDARD_SERVER_SOLUTIONS           = 0x00000034, ///< Server Solutions Premium
+	msPRODUCT_STANDARD_SERVER_SOLUTIONS_CORE      = 0x00000035, ///< Server Solutions Premium (core installation)
+	msPRODUCT_SB_SOLUTION_SERVER_EM               = 0x00000036, ///< Server For SB Solutions EM
+	msPRODUCT_SERVER_FOR_SB_SOLUTIONS_EM          = 0x00000037, ///< Server For SB Solutions EM
+	msPRODUCT_SOLUTION_EMBEDDEDSERVER             = 0x00000038, ///< Windows MultiPoint Server
+	msPRODUCT_ESSENTIALBUSINESS_SERVER_MGMT       = 0x0000003B, ///< Windows Essential Server Solution Management
+	msPRODUCT_ESSENTIALBUSINESS_SERVER_ADDL       = 0x0000003C, ///< Windows Essential Server Solution Additional
+	msPRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC    = 0x0000003D, ///< Windows Essential Server Solution Management SVC
+	msPRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC    = 0x0000003E, ///< Windows Essential Server Solution Additional SVC
+	msPRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE   = 0x0000003F, ///< Small Business Server Premium (core installation)
+	msPRODUCT_CLUSTER_SERVER_V                    = 0x00000040, ///< Server Hyper Core V
+	msPRODUCT_STARTER_E                           = 0x00000042, ///< Not supported
+	msPRODUCT_HOME_BASIC_E                        = 0x00000043, ///< Not supported
+	msPRODUCT_HOME_PREMIUM_E                      = 0x00000044, ///< Not supported
+	msPRODUCT_PROFESSIONAL_E                      = 0x00000045, ///< Not supported
+	msPRODUCT_ENTERPRISE_E                        = 0x00000046, ///< Not supported
+	msPRODUCT_ULTIMATE_E                          = 0x00000047, ///< Not supported
+	msPRODUCT_ENTERPRISE_EVALUATION               = 0x00000048, ///< Server Enterprise (evaluation installation)
+	msPRODUCT_MULTIPOINT_STANDARD_SERVER          = 0x0000004C, ///< Windows MultiPoint Server Standard (full installation)
+	msPRODUCT_MULTIPOINT_PREMIUM_SERVER           = 0x0000004D, ///< Windows MultiPoint Server Premium (full installation)
+	msPRODUCT_STANDARD_EVALUATION_SERVER          = 0x0000004F, ///< Server Standard (evaluation installation)
+	msPRODUCT_DATACENTER_EVALUATION_SERVER        = 0x00000050, ///< Server Datacenter (evaluation installation)
+	msPRODUCT_ENTERPRISE_N_EVALUATION             = 0x00000054, ///< Enterprise N (evaluation installation)
+	msPRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER = 0x0000005F, ///< Storage Server Workgroup (evaluation installation)
+	msPRODUCT_STORAGE_STANDARD_EVALUATION_SERVER  = 0x00000060, ///< Storage Server Standard (evaluation installation)
+	msPRODUCT_CORE_N                              = 0x00000062, ///< Windows 8 N
+	msPRODUCT_CORE_COUNTRYSPECIFIC                = 0x00000063, ///< Windows 8 China
+	msPRODUCT_CORE_SINGLELANGUAGE                 = 0x00000064, ///< Windows 8 Single Language
+	msPRODUCT_CORE                                = 0x00000065, ///< Windows 8
+	msPRODUCT_PROFESSIONAL_WMC                    = 0x00000067, ///< Professional with Media Center
+};
+
+/**
+ * Values to be used with GetSystemMetrics.
+ *
+ * Values from http://msdn.microsoft.com/en-us/library/windows/desktop/ms724385%28v=vs.85%29.aspx
+ */
+enum windows_metrics {
+	msSM_SERVERR2 = 89, ///< Obtains the build number if the system is Windows Server 2003 R2; otherwise, 0.
+};
+
+/**
+ * Values to be used with OSVERSIONINFOEX.wSuiteMask.
+ *
+ * Values from http://msdn.microsoft.com/en-us/library/windows/desktop/ms724833%28v=vs.85%29.aspx
+ */
+enum windows_ver_suite {
+	msVER_SUITE_BLADE          = 0x00000400, ///< Windows Server 2003, Web Edition is installed.
+	msVER_SUITE_STORAGE_SERVER = 0x00002000, ///< Windows Storage Server 2003 R2 or Windows Storage Server 2003 is installed.
+	msVER_SUITE_COMPUTE_SERVER = 0x00004000, ///< Windows Server 2003, Compute Cluster Edition is installed.
+	msVER_SUITE_WH_SERVER      = 0x00008000, ///< Windows Home Server is installed.
+};
+
+#else // not WIN32
+// UNIX. Use build-time cached values
+#include "sysinfo.inc"
+#endif // WIN32
+
+// Compiler detection <http://sourceforge.net/p/predef/wiki/Compilers/>
+#if defined(__BORLANDC__)
+#define SYSINFO_COMPILER "Borland C++"
+#elif defined(__clang__)
+#define SYSINFO_COMPILER "Clang v" EXPAND_AND_QUOTE(__clang_major__) "." EXPAND_AND_QUOTE(__clang_minor__) "." EXPAND_AND_QUOTE(__clang_patchlevel__)
+#elif defined(__INTEL_COMPILER)
+#define SYSINFO_COMPILER "Intel CC v" EXPAND_AND_QUOTE(__INTEL_COMPILER)
+#elif defined(__MINGW32__)
+#if defined(__MINGW64__)
+#define SYSINFO_COMPILER "MinGW-w64 64 Bit v" EXPAND_AND_QUOTE(__MINGW64_VERSION_MAJOR) "." EXPAND_AND_QUOTE(__MINGW64_VERSION_MINOR) \
+	" (MinGW " EXPAND_AND_QUOTE(__MINGW32_MAJOR_VERSION) "." EXPAND_AND_QUOTE(__MINGW32_MINOR_VERSION) ")"
+#elif defined(__MINGW64_VERSION_MAJOR)
+#define SYSINFO_COMPILER "MinGW-w64 32 Bit v" EXPAND_AND_QUOTE(__MINGW64_VERSION_MAJOR) "." EXPAND_AND_QUOTE(__MINGW64_VERSION_MINOR) \
+	" (MinGW " EXPAND_AND_QUOTE(__MINGW32_MAJOR_VERSION) "." EXPAND_AND_QUOTE(__MINGW32_MINOR_VERSION) ")"
+#else
+#define SYSINFO_COMPILER "MinGW32 v" EXPAND_AND_QUOTE(__MINGW32_MAJOR_VERSION) "." EXPAND_AND_QUOTE(__MINGW32_MINOR_VERSION)
+#endif
+#elif defined(__GNUC__)
+#define SYSINFO_COMPILER "GCC v" EXPAND_AND_QUOTE(__GNUC__) "." EXPAND_AND_QUOTE(__GNUC_MINOR__) "." EXPAND_AND_QUOTE(__GNUC_PATCHLEVEL__)
+#elif defined(_MSC_VER)
+#if _MSC_VER >= 1300 && _MSC_VER < 1310
+#define SYSINFO_COMPILER "Microsoft Visual C++ 7.0 (v" EXPAND_AND_QUOTE(_MSC_VER) ")"
+#elif _MSC_VER >= 1310 && _MSC_VER < 1400
+#define SYSINFO_COMPILER "Microsoft Visual C++ 2003 (v" EXPAND_AND_QUOTE(_MSC_VER) ")"
+#elif _MSC_VER >= 1400 && _MSC_VER < 1500
+#define SYSINFO_COMPILER "Microsoft Visual C++ 2005 (v" EXPAND_AND_QUOTE(_MSC_VER) ")"
+#elif _MSC_VER >= 1500 && _MSC_VER < 1600
+#define SYSINFO_COMPILER "Microsoft Visual C++ 2008 (v" EXPAND_AND_QUOTE(_MSC_VER) ")"
+#elif _MSC_VER >= 1600 && _MSC_VER < 1700
+#define SYSINFO_COMPILER "Microsoft Visual C++ 2010 (v" EXPAND_AND_QUOTE(_MSC_VER) ")"
+#elif _MSC_VER >= 1700 && _MSC_VER < 1800
+#define SYSINFO_COMPILER "Microsoft Visual C++ 2012 (v" EXPAND_AND_QUOTE(_MSC_VER) ")"
+#elif _MSC_VER >= 1800 && _MSC_VER < 1900
+#define SYSINFO_COMPILER "Microsoft Visual C++ 2013 (v" EXPAND_AND_QUOTE(_MSC_VER) ")"
+#else // < 1300 || >= 1900
+#define SYSINFO_COMPILER "Microsoft Visual C++ v" EXPAND_AND_QUOTE(_MSC_VER)
+#endif
+#else
+#define SYSINFO_COMPILER "Unknown"
+#endif
+// end compiler detection
+
+/**
+ * Retrieves the current SVN revision.
+ *
+ * @param out[out] a string pointer to return the value (to be aFree()'d.)
+ * @retval true  if a revision was correctly detected.
+ * @retval false if no revision was detected. out is set to NULL in this case.
+ */
+bool sysinfo_svn_get_revision(char **out) {
+	// Only include SVN support if detected it, or we're on MSVC
+#if !defined(SYSINFO_VCSTYPE) || SYSINFO_VCSTYPE == VCSTYPE_SVN || SYSINFO_VCSTYPE == VCSTYPE_UNKNOWN
+	FILE *fp;
+
+	// subversion 1.7 uses a sqlite3 database
+	// FIXME this is hackish at best...
+	// - ignores database file structure
+	// - assumes the data in NODES.dav_cache column ends with "!svn/ver/<revision>/<path>)"
+	// - since it's a cache column, the data might not even exist
+	if ((fp = fopen(".svn"PATHSEP_STR"wc.db", "rb")) != NULL || (fp = fopen(".."PATHSEP_STR".svn"PATHSEP_STR"wc.db", "rb")) != NULL) {
+
+#ifndef SVNNODEPATH //not sure how to handle branches, so i'll leave this overridable define until a better solution comes up
+#define SVNNODEPATH trunk
+#endif // SVNNODEPATH
+
+		const char* prefix = "!svn/ver/";
+		const char* postfix = "/"EXPAND_AND_QUOTE(SVNNODEPATH)")"; // there should exist only 1 entry like this
+		size_t prefix_len = strlen(prefix);
+		size_t postfix_len = strlen(postfix);
+		size_t i,j,flen;
+		char* buffer;
+
+		// read file to buffer
+		fseek(fp, 0, SEEK_END);
+		flen = ftell(fp);
+		buffer = (char*)aMalloc(flen + 1);
+		fseek(fp, 0, SEEK_SET);
+		flen = fread(buffer, 1, flen, fp);
+		buffer[flen] = '\0';
+		fclose(fp);
+
+		// parse buffer
+		for (i = prefix_len + 1; i + postfix_len <= flen; ++i) {
+			if (buffer[i] != postfix[0] || memcmp(buffer + i, postfix, postfix_len) != 0)
+				continue; // postfix mismatch
+			for (j = i; j > 0; --j) { // skip digits
+				if (!ISDIGIT(buffer[j - 1]))
+					break;
+			}
+			if (memcmp(buffer + j - prefix_len, prefix, prefix_len) != 0)
+				continue; // prefix mismatch
+			// done
+			if (*out != NULL)
+				aFree(*out);
+			*out = aCalloc(1, 8);
+			snprintf(*out, 8, "%d", atoi(buffer + j));
+			break;
+		}
+		aFree(buffer);
+
+		if (*out != NULL)
+			return true;
+	}
+
+	// subversion 1.6 and older?
+	if ((fp = fopen(".svn/entries", "r")) != NULL) {
+		char line[1024];
+		int rev;
+		// Check the version
+		if (fgets(line, sizeof(line), fp)) {
+			if (!ISDIGIT(line[0])) {
+				// XML File format
+				while (fgets(line,sizeof(line),fp))
+					if (strstr(line,"revision=")) break;
+				if (sscanf(line," %*[^\"]\"%d%*[^\n]", &rev) == 1) {
+					if (*out != NULL)
+						aFree(*out);
+					*out = aCalloc(1, 8);
+					snprintf(*out, 8, "%d", rev);
+				}
+			} else {
+				// Bin File format
+				if (fgets(line, sizeof(line), fp) == NULL) { printf("Can't get bin name\n"); } // Get the name
+				if (fgets(line, sizeof(line), fp) == NULL) { printf("Can't get entries kind\n"); } // Get the entries kind
+				if (fgets(line, sizeof(line), fp)) { // Get the rev numver
+					if (*out != NULL)
+						aFree(*out);
+					*out = aCalloc(1, 8);
+					snprintf(*out, 8, "%d", atoi(line));
+				}
+			}
+		}
+		fclose(fp);
+
+		if (*out != NULL)
+			return true;
+	}
+#endif
+	if (*out != NULL)
+		aFree(*out);
+	*out = NULL;
+	return false;
+}
+
+/**
+ * Retrieves the current Git revision.
+ *
+ * @param out[out] a string pointer to return the value (to be aFree()'d.)
+ * @retval true  if a revision was correctly detected.
+ * @retval false if no revision was detected. out is set to NULL in this case.
+ */
+bool sysinfo_git_get_revision(char **out) {
+	// Only include Git support if we detected it, or we're on MSVC
+#if !defined(SYSINFO_VCSTYPE) || SYSINFO_VCSTYPE == VCSTYPE_GIT || SYSINFO_VCSTYPE == VCSTYPE_UNKNOWN
+	FILE *fp;
+	char ref[128], filepath[128], line[128];
+
+	strcpy(ref, "HEAD");
+
+	while (*ref) {
+		snprintf(filepath, sizeof(filepath), ".git/%s", ref);
+		if ((fp = fopen(filepath, "r")) != NULL) {
+			if (fgets(line, sizeof(line)-1, fp) == NULL) {
+				fclose(fp);
+				break;
+			}
+			fclose(fp);
+			if (sscanf(line, "ref: %127[^\n]", ref) == 1) {
+				continue;
+			} else if (sscanf(line, "%127[a-f0-9]", ref) == 1 && strlen(ref) == 40) {
+				if (*out != NULL)
+					aFree(*out);
+				*out = aStrdup(ref);
+			}
+		}
+		break;
+	}
+	if (*out != NULL)
+		return true;
+#else
+	if (*out != NULL)
+		aFree(*out);
+	*out = NULL;
+#endif
+	return false;
+}
+
+#ifdef WIN32
+
+/// Windows-specific runtime detection functions.
+
+typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
+/**
+ * Retrieves the Operating System version (Windows only).
+ *
+ * Once retrieved, the version string is stored into sysinfo->p->osversion.
+ */
+void sysinfo_osversion_retrieve(void) {
+	OSVERSIONINFOEX osvi;
+	StringBuf buf;
+	ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+	StrBuf->Init(&buf);
+
+	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+
+	if (sysinfo->p->osversion != NULL) {
+		aFree(sysinfo->p->osversion);
+		sysinfo->p->osversion = NULL;
+	}
+
+	/*
+	 * #pragma rantmode (on)
+	 * Some engineer at Microsoft moronically decided that, since some applications use this information to do version checks and refuse to
+	 * run if they detect a new, unknown version of Windows, now nobody will be able to rely on this information anymore, not even those who
+	 * need it for reporting or logging.
+	 * The correct fix was to let those applications break, and their developer fix them (and in the meanwhile let the users use the
+	 * Compatibility settings to run them) but no, they decided they'd deprecate the API, and make it lie for those who use it, reporting
+	 * windows 8 even if they're running on 8.1 or newer.
+	 * The API wasn't broken, applications were. Now we have broken applications, and a broken API. Great move, Microsoft.  Oh right,
+	 * there's the Version API helper functions. Or maybe not, since you can only do 'are we running on at least version X?' checks with
+	 * those, it's not what we need.
+	 * You know what? I'll just silence your deprecation warning for the time being. Maybe by the time you release the next version of
+	 * Windows, you'll have provided a less crippled API or something.
+	 * #pragma rantmode (off)
+	 */
+#pragma warning (push)
+#pragma warning (disable : 4996)
+	if (!GetVersionEx((OSVERSIONINFO*) &osvi)) {
+		sysinfo->p->osversion = aStrdup("Unknown Version");
+		return;
+	}
+#pragma warning (pop)
+
+	if (VER_PLATFORM_WIN32_NT == osvi.dwPlatformId // Windows NT Family
+	 && ((osvi.dwMajorVersion > 4 && osvi.dwMajorVersion < 6) || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion <= 3)) // Between XP and 8.1
+	) {
+		if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion <= 3) { // Between Vista and 8.1
+			PGPI pGPI;
+			DWORD dwType;
+			if (osvi.dwMinorVersion == 0) {
+				StrBuf->AppendStr(&buf, osvi.wProductType == VER_NT_WORKSTATION ? "Windows Vista" : "Windows Server 2008");
+			} else if (osvi.dwMinorVersion == 1) {
+				StrBuf->AppendStr(&buf, osvi.wProductType == VER_NT_WORKSTATION ? "Windows 7" : "Windows Server 2008 R2");
+			} else {
+				// If it's 2, it can be Windows 8, or any newer version (8.1 at the time of writing this) -- see above for the reason.
+				switch (osvi.dwMinorVersion) {
+				case 2:
+					{
+						ULONGLONG mask = 0;
+						OSVERSIONINFOEX osvi2;
+						ZeroMemory(&osvi2, sizeof(OSVERSIONINFOEX));
+						osvi2.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+						osvi2.dwMajorVersion = 6;
+						osvi2.dwMinorVersion = 2;
+						VER_SET_CONDITION(mask, VER_MAJORVERSION, VER_LESS_EQUAL);
+						VER_SET_CONDITION(mask, VER_MINORVERSION, VER_LESS_EQUAL);
+						if (VerifyVersionInfo(&osvi2, VER_MAJORVERSION | VER_MINORVERSION, mask)) {
+							StrBuf->AppendStr(&buf, osvi.wProductType == VER_NT_WORKSTATION ? "Windows 8" : "Windows Server 2012");
+							break;
+						}
+					}
+				case 3:
+					StrBuf->AppendStr(&buf, osvi.wProductType == VER_NT_WORKSTATION ? "Windows 8.1" : "Windows Server 2012 R2");
+				}
+			}
+
+			pGPI = (PGPI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetProductInfo");
+
+			pGPI(osvi.dwMajorVersion, osvi.dwMinorVersion, 0, 0, &dwType);
+
+			switch (dwType) {
+				case msPRODUCT_ULTIMATE:
+				case msPRODUCT_ULTIMATE_N:
+					StrBuf->AppendStr(&buf, " Ultimate");
+					break;
+				case msPRODUCT_PROFESSIONAL:
+				case msPRODUCT_PROFESSIONAL_N:
+				case msPRODUCT_PROFESSIONAL_WMC:
+					StrBuf->AppendStr(&buf, " Professional");
+					break;
+				case msPRODUCT_HOME_PREMIUM:
+				case msPRODUCT_HOME_PREMIUM_N:
+					StrBuf->AppendStr(&buf, " Home Premium");
+					break;
+				case msPRODUCT_HOME_BASIC:
+				case msPRODUCT_HOME_BASIC_N:
+					StrBuf->AppendStr(&buf, " Home Basic");
+					break;
+				case msPRODUCT_ENTERPRISE:
+				case msPRODUCT_ENTERPRISE_N:
+				case msPRODUCT_ENTERPRISE_SERVER:
+				case msPRODUCT_ENTERPRISE_SERVER_CORE:
+				case msPRODUCT_ENTERPRISE_SERVER_IA64:
+				case msPRODUCT_ENTERPRISE_SERVER_V:
+				case msPRODUCT_ENTERPRISE_SERVER_CORE_V:
+				case msPRODUCT_ENTERPRISE_EVALUATION:
+				case msPRODUCT_ENTERPRISE_N_EVALUATION:
+					StrBuf->AppendStr(&buf, " Enterprise");
+					break;
+				case msPRODUCT_BUSINESS:
+				case msPRODUCT_BUSINESS_N:
+					StrBuf->AppendStr(&buf, " Business");
+					break;
+				case msPRODUCT_STARTER:
+				case msPRODUCT_STARTER_N:
+					StrBuf->AppendStr(&buf, " Starter");
+					break;
+				case msPRODUCT_CLUSTER_SERVER:
+				case msPRODUCT_CLUSTER_SERVER_V:
+					StrBuf->AppendStr(&buf, " Cluster Server");
+					break;
+				case msPRODUCT_DATACENTER_SERVER:
+				case msPRODUCT_DATACENTER_SERVER_CORE:
+				case msPRODUCT_DATACENTER_SERVER_V:
+				case msPRODUCT_DATACENTER_SERVER_CORE_V:
+				case msPRODUCT_DATACENTER_EVALUATION_SERVER:
+					StrBuf->AppendStr(&buf, " Datacenter");
+					break;
+				case msPRODUCT_SMALLBUSINESS_SERVER:
+				case msPRODUCT_SMALLBUSINESS_SERVER_PREMIUM:
+				case msPRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE:
+					StrBuf->AppendStr(&buf, " Small Business Server");
+					break;
+				case PRODUCT_STANDARD_SERVER:
+				case PRODUCT_STANDARD_SERVER_CORE:
+				case msPRODUCT_STANDARD_SERVER_V:
+				case msPRODUCT_STANDARD_SERVER_CORE_V:
+				case msPRODUCT_STANDARD_EVALUATION_SERVER:
+					StrBuf->AppendStr(&buf, " Standard");
+					break;
+				case msPRODUCT_WEB_SERVER:
+				case msPRODUCT_WEB_SERVER_CORE:
+					StrBuf->AppendStr(&buf, " Web Server");
+					break;
+				case msPRODUCT_STORAGE_EXPRESS_SERVER:
+				case msPRODUCT_STORAGE_STANDARD_SERVER:
+				case msPRODUCT_STORAGE_WORKGROUP_SERVER:
+				case msPRODUCT_STORAGE_ENTERPRISE_SERVER:
+				case msPRODUCT_STORAGE_EXPRESS_SERVER_CORE:
+				case msPRODUCT_STORAGE_STANDARD_SERVER_CORE:
+				case msPRODUCT_STORAGE_WORKGROUP_SERVER_CORE:
+				case msPRODUCT_STORAGE_ENTERPRISE_SERVER_CORE:
+				case msPRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER:
+				case msPRODUCT_STORAGE_STANDARD_EVALUATION_SERVER:
+					StrBuf->AppendStr(&buf, " Storage Server");
+					break;
+				case msPRODUCT_HOME_SERVER:
+				case msPRODUCT_SERVER_FOR_SMALLBUSINESS:
+				case msPRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT:
+				case msPRODUCT_MEDIUMBUSINESS_SERVER_SECURITY:
+				case msPRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING:
+				case msPRODUCT_SERVER_FOR_SMALLBUSINESS_V:
+				case msPRODUCT_SERVER_FOUNDATION:
+				case msPRODUCT_HOME_PREMIUM_SERVER:
+				case msPRODUCT_HYPERV:
+				case msPRODUCT_SB_SOLUTION_SERVER:
+				case msPRODUCT_SERVER_FOR_SB_SOLUTIONS:
+				case msPRODUCT_STANDARD_SERVER_SOLUTIONS:
+				case msPRODUCT_STANDARD_SERVER_SOLUTIONS_CORE:
+				case msPRODUCT_SB_SOLUTION_SERVER_EM:
+				case msPRODUCT_SERVER_FOR_SB_SOLUTIONS_EM:
+				case msPRODUCT_SOLUTION_EMBEDDEDSERVER:
+				case msPRODUCT_ESSENTIALBUSINESS_SERVER_MGMT:
+				case msPRODUCT_ESSENTIALBUSINESS_SERVER_ADDL:
+				case msPRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC:
+				case msPRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC:
+				case msPRODUCT_MULTIPOINT_STANDARD_SERVER:
+				case msPRODUCT_MULTIPOINT_PREMIUM_SERVER:
+					StrBuf->AppendStr(&buf, " Server (other)");
+					break;
+				case msPRODUCT_CORE_N:
+				case msPRODUCT_CORE_COUNTRYSPECIFIC:
+				case msPRODUCT_CORE_SINGLELANGUAGE:
+				case msPRODUCT_CORE:
+					StrBuf->AppendStr(&buf, " Workstation (other)");
+					break;
+			}
+
+		} else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) { // XP x64 and Server 2003
+			if (osvi.wProductType == VER_NT_WORKSTATION) {
+				StrBuf->AppendStr(&buf, "Windows XP Professional");
+			} else {
+				if (GetSystemMetrics(msSM_SERVERR2))
+					StrBuf->AppendStr(&buf, "Windows Server 2003 R2");
+				else if (osvi.wSuiteMask & msVER_SUITE_STORAGE_SERVER)
+					StrBuf->AppendStr(&buf, "Windows Storage Server 2003");
+				else if (osvi.wSuiteMask & msVER_SUITE_WH_SERVER)
+					StrBuf->AppendStr(&buf, "Windows Home Server");
+				else
+					StrBuf->AppendStr(&buf, "Windows Server 2003");
+
+				// Test for the server type.
+				if (osvi.wSuiteMask & msVER_SUITE_COMPUTE_SERVER)
+					StrBuf->AppendStr(&buf, " Compute Cluster");
+				else if (osvi.wSuiteMask & VER_SUITE_DATACENTER)
+					StrBuf->AppendStr(&buf, " Datacenter");
+				else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)
+					StrBuf->AppendStr(&buf, " Enterprise");
+				else if (osvi.wSuiteMask & msVER_SUITE_BLADE)
+					StrBuf->AppendStr(&buf, " Web");
+				else
+					StrBuf->AppendStr(&buf, " Standard");
+			}
+		} else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) { // XP
+			StrBuf->AppendStr(&buf, "Windows XP");
+			if (osvi.wSuiteMask & VER_SUITE_EMBEDDEDNT)
+				StrBuf->AppendStr(&buf, " Embedded");
+			else if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
+				StrBuf->AppendStr(&buf, " Home");
+			else
+				StrBuf->AppendStr(&buf, " Professional");
+		} else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) { // 2000
+			StrBuf->AppendStr(&buf, "Windows 2000");
+
+			if (osvi.wProductType == VER_NT_WORKSTATION)
+				StrBuf->AppendStr(&buf, " Professional");
+			else if (osvi.wSuiteMask & VER_SUITE_DATACENTER)
+				StrBuf->AppendStr(&buf, " Datacenter Server");
+			else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)
+				StrBuf->AppendStr(&buf, " Advanced Server");
+			else
+				StrBuf->AppendStr(&buf, " Server");
+		} else {
+			StrBuf->Printf(&buf, "Unknown Windows version %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+		}
+	}
+
+	// Include service pack (if any) and build number.
+
+	if (strlen(osvi.szCSDVersion) > 0) {
+		StrBuf->Printf(&buf, " %s", osvi.szCSDVersion);
+	}
+
+	StrBuf->Printf(&buf, " (build %d)", osvi.dwBuildNumber);
+
+	sysinfo->p->osversion = aStrdup(StrBuf->Value(&buf));
+
+	StrBuf->Destroy(&buf);
+	return;
+}
+
+typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
+/**
+ * Retrieves the CPU type (Windows only).
+ *
+ * Once retrieved, the name is stored into sysinfo->p->cpu and the
+ * number of cores in sysinfo->p->cpucores.
+ */
+void sysinfo_cpu_retrieve(void) {
+	StringBuf buf;
+	PGNSI pGNSI;
+	SYSTEM_INFO si;
+	ZeroMemory(&si, sizeof(SYSTEM_INFO));
+	StrBuf->Init(&buf);
+
+	if (sysinfo->p->cpu != NULL) {
+		aFree(sysinfo->p->cpu);
+		sysinfo->p->cpu = NULL;
+	}
+
+	// Call GetNativeSystemInfo if supported or GetSystemInfo otherwise.
+	pGNSI = (PGNSI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetNativeSystemInfo");
+	if (NULL != pGNSI)
+		pGNSI(&si);
+	else
+		GetSystemInfo(&si);
+
+	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL
+	 || si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64
+	) {
+		StrBuf->Printf(&buf, "%s CPU, Family %d, Model %d, Stepping %d",
+		               si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL ? "x86" : "x86_64",
+		               si.wProcessorLevel,
+		               (si.wProcessorRevision&0xff00)>>8,
+		               (si.wProcessorRevision&0xff));
+	} else {
+		StrBuf->AppendStr(&buf, "Unknown");
+	}
+
+	sysinfo->p->cpu = aStrdup(StrBuf->Value(&buf));
+	sysinfo->p->cpucores = si.dwNumberOfProcessors;
+
+	StrBuf->Destroy(&buf);
+}
+
+/**
+ * Retrieves the OS architecture (Windows only).
+ *
+ * Once retrieved, the name is stored into sysinfo->p->arch.
+ */
+void sysinfo_arch_retrieve(void) {
+	PGNSI pGNSI;
+	SYSTEM_INFO si;
+	ZeroMemory(&si, sizeof(SYSTEM_INFO));
+
+	if (sysinfo->p->arch != NULL) {
+		aFree(sysinfo->p->arch);
+		sysinfo->p->arch = NULL;
+	}
+
+	// Call GetNativeSystemInfo if supported or GetSystemInfo otherwise.
+	pGNSI = (PGNSI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetNativeSystemInfo");
+	if (NULL != pGNSI)
+		pGNSI(&si);
+	else
+		GetSystemInfo(&si);
+
+	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) // x64
+		sysinfo->p->arch = aStrdup("x86_64");
+	else if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) // x32
+		sysinfo->p->arch = aStrdup("x86");
+	else if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM) // ARM
+		sysinfo->p->arch = aStrdup("ARM");
+	else if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_IA64) // Itanium
+		sysinfo->p->arch = aStrdup("IA-64");
+	else
+		sysinfo->p->arch = aStrdup("Unknown");
+}
+
+/**
+ * Retrieves the startup-time VCS revision information.
+ *
+ * Once retrieved, the value is stored in sysinfo->p->vcsrevision_src.
+ */
+void sysinfo_vcsrevision_src_retrieve(void) {
+	if (sysinfo->p->vcsrevision_src != NULL) {
+		aFree(sysinfo->p->vcsrevision_src);
+		sysinfo->p->vcsrevision_src = NULL;
+	}
+	// Try Git, then SVN
+	if (sysinfo_git_get_revision(&sysinfo->p->vcsrevision_src)) {
+		sysinfo->p->vcstype = VCSTYPE_GIT;
+		return;
+	}
+	if (sysinfo_svn_get_revision(&sysinfo->p->vcsrevision_src)) {
+		sysinfo->p->vcstype = VCSTYPE_SVN;
+		return;
+	}
+	sysinfo->p->vcstype = VCSTYPE_NONE;
+	sysinfo->p->vcsrevision_src = aStrdup("Unknown");
+}
+#endif // WIN32
+
+/**
+ * Retrieevs the VCS type name.
+ *
+ * Once retrieved, the value is stored in sysinfo->p->vcstype_name.
+ */
+void sysinfo_vcstype_name_retrieve(void) {
+	if (sysinfo->p->vcstype_name != NULL) {
+		aFree(sysinfo->p->vcstype_name);
+		sysinfo->p->vcstype_name = NULL;
+	}
+	switch (sysinfo->p->vcstype) {
+		case VCSTYPE_GIT:
+			sysinfo->p->vcstype_name = aStrdup("Git");
+			break;
+		case VCSTYPE_SVN:
+			sysinfo->p->vcstype_name = aStrdup("SVN");
+			break;
+		default:
+			sysinfo->p->vcstype_name = aStrdup("Exported");
+			break;
+	}
+}
+
+/**
+ * Returns the platform (OS type) this application is running on.
+ *
+ * This information is cached at compile time, since it's unlikely to change.
+ *
+ * @return the OS platform name.
+ *
+ * Note: Ownership is NOT transferred, the value should not be freed.
+ *
+ * Output example: "Linux", "Darwin", "Windows", etc.
+ */
+const char *sysinfo_platform(void) {
+	return sysinfo->p->platform;
+}
+
+/**
+ * Returns the Operating System version the application is running on.
+ *
+ * On platforms other than Windows (MSVC), this information is cached at
+ *   compile time, since it is uncommon that an application is compiled and runs
+ *   on different machines.
+ *
+ * @return the OS name.
+ *
+ * Note: Ownership is NOT transferred, the value should not be freed.
+ *
+ * Output example: "Windows 2008 Small Business Server", "OS X 10.8 Mountain Lion",
+ *   "Gentoo Base System Release 2.2", "Debian GNU/Linux 6.0.6 (squeeze)", etc.
+ */
+const char *sysinfo_osversion(void) {
+	return sysinfo->p->osversion;
+}
+
+/**
+ * Returns the CPU model the application is running on.
+ *
+ * On platforms other than Windows (MSVC), this information is cached at
+ *   compile time, since it is uncommon that an application is compiled and runs
+ *   on different machines.
+ *
+ * @return the CPU model name.
+ *
+ * Note: Ownership is NOT transferred, the value should not be freed.
+ *
+ * Output example: "Intel(R) Atom(TM) CPU D2500   @ 1.86GHz",
+ *   "Intel(R) Xeon(R) CPU E5-1650 0 @ 3.20GHz", "Intel Core i7",
+ *   "x86 CPU, Family 6, Model 54, Stepping 1", etc.
+ */
+const char *sysinfo_cpu(void) {
+	return sysinfo->p->cpu;
+}
+
+/**
+ * Returns the number of CPU cores available.
+ *
+ * On platforms other than Windows (MSVC), this information is cached at
+ *   compile time, since it is uncommon that an application is compiled and runs
+ *   on different machines.
+ *
+ * @return the number of CPU cores.
+ */
+int sysinfo_cpucores(void) {
+	return sysinfo->p->cpucores;
+}
+
+/**
+ * Returns the CPU architecture the application was compiled for.
+ *
+ * On platforms other than Windows (MSVC), this information is cached at
+ *   compile time, since it is uncommon that an application is compiled and runs
+ *   on different machines.
+ *
+ * @return the CPU architecture name.
+ *
+ * Note: Ownership is NOT transferred, the value should not be freed.
+ *
+ * Output example: "x86", "x86_64", "IA-64", "ARM", etc.
+ */
+const char *sysinfo_arch(void) {
+	return sysinfo->p->arch;
+}
+
+/**
+ * Returns info about the 32 or 64 bit build of Hercules.
+ *
+ * @retval true  if this is a 64 bit build.
+ * @retval false if this isn't a 64 bit build (i.e. it is a 32 bit build).
+ */
+bool sysinfo_is64bit(void) {
+#ifdef _LP64
+	return true;
+#else
+	return false;
+#endif
+}
+
+/**
+ * Returns the compiler the application was compiled with.
+ *
+ * @return the compiler name.
+ *
+ * Note: Ownership is NOT transferred, the value should not be freed.
+ *
+ * Output example: "Microsoft Visual C++ 2012 (v170050727)",
+ *   "Clang v5.0.0", "MinGW32 v3.20", "GCC v4.7.3", etc.
+ */
+const char *sysinfo_compiler(void) {
+	return sysinfo->p->compiler;
+}
+
+/**
+ * Returns the compiler flags the application was compiled with.
+ *
+ * On Windows (MSVC), an empty string is returned instead.
+ *
+ * @return the compiler flags.
+ *
+ * Note: Ownership is NOT transferred, the value should not be freed.
+ *
+ * Output example: "-ggdb -O2 -flto -pipe -ffast-math ..."
+ */
+const char *sysinfo_cflags(void) {
+	return sysinfo->p->cflags;
+}
+
+/**
+ * Returns the Version Control System the application was downloaded with.
+ *
+ * On platforms other than Windows (MSVC), this information is cached at
+ *   compile time. On Windows (MSVC), it is cached when the function is first
+ *   called (most likely on server startup).
+ *
+ * @return the VCS type (numerical).
+ *
+ * @see VCSTYPE_NONE, VCSTYPE_GIT, VCSTYPE_SVN, VCSTYPE_UNKNOWN
+ */
+int sysinfo_vcstypeid(void) {
+	return sysinfo->p->vcstype;
+}
+
+/**
+ * Returns the Version Control System the application was downloaded with.
+ *
+ * On platforms other than Windows (MSVC), this information is cached at
+ *   compile time. On Windows (MSVC), it is cached when the function is first
+ *   called (most likely on server startup).
+ *
+ * @return the VCS type.
+ *
+ * Note: Ownership is NOT transferred, the value should not be freed.
+ *
+ * Output example: "Git", "SVN", "Exported"
+ */
+const char *sysinfo_vcstype(void) {
+	return sysinfo->p->vcstype_name;
+}
+
+/**
+ * Returns the Version Control System revision.
+ *
+ * On platforms other than Windows (MSVC), this information is cached at
+ *   compile time for better reliability. On Windows (MSVC), it is cached when
+ *   the function is first called (most likely on server startup), so it may
+ *   diverge from the actual revision that was compiled.
+ *
+ * @return the VCS revision.
+ *
+ * Note: Ownership is NOT transferred, the value should not be freed.
+ *
+ * Output example: Git: "9128feccf3bddda94a7f8a170305565416815b40", SVN: "17546"
+ */
+const char *sysinfo_vcsrevision_src(void) {
+	return sysinfo->p->vcsrevision_src;
+}
+
+/**
+ * Returns the Version Control System revision.
+ *
+ * This information is cached during a script reload, so that it matches the
+ *   version of the loaded scripts.
+ *
+ * @return the VCS revision.
+ *
+ * Note: Ownership is NOT transferred, the value should not be freed.
+ *
+ * Output example: Git: "9128feccf3bddda94a7f8a170305565416815b40", SVN: "17546"
+ */
+const char *sysinfo_vcsrevision_scripts(void) {
+	return sysinfo->p->vcsrevision_scripts;
+}
+
+/**
+ * Reloads the run-time (scripts) VCS revision information. To be used during
+ *   script reloads to refresh the cached version.
+ */
+void sysinfo_vcsrevision_reload(void) {
+	if (sysinfo->p->vcsrevision_scripts != NULL) {
+		aFree(sysinfo->p->vcsrevision_scripts);
+		sysinfo->p->vcsrevision_scripts = NULL;
+	}
+	// Try Git, then SVN
+	if (sysinfo_git_get_revision(&sysinfo->p->vcsrevision_scripts)) {
+		return;
+	}
+	if (sysinfo_svn_get_revision(&sysinfo->p->vcsrevision_scripts)) {
+		return;
+	}
+	sysinfo->p->vcsrevision_scripts = aStrdup("Unknown");
+}
+
+/**
+ * Checks if we're running (unnecessarily) as superuser.
+ *
+ * @retval true  if the current process is running as UNIX super-user.
+ * @retval false if the current process is running as regular user, or
+ *               in any case under Windows.
+ */
+bool sysinfo_is_superuser(void) {
+#ifndef _WIN32
+	if (geteuid() == 0)
+		return true;
+#endif
+	return false;
+}
+
+/**
+ * Interface runtime initialization.
+ */
+void sysinfo_init(void) {
+	sysinfo->p->compiler = SYSINFO_COMPILER;
+#ifdef WIN32
+	sysinfo->p->platform = "Windows";
+	sysinfo->p->cflags = "N/A";
+	sysinfo_osversion_retrieve();
+	sysinfo_cpu_retrieve();
+	sysinfo_arch_retrieve();
+	sysinfo_vcsrevision_src_retrieve();
+#else
+	sysinfo->p->platform = SYSINFO_PLATFORM;
+	sysinfo->p->osversion = SYSINFO_OSVERSION;
+	sysinfo->p->cpucores = SYSINFO_CPUCORES;
+	sysinfo->p->cpu = SYSINFO_CPU;
+	sysinfo->p->arch = SYSINFO_ARCH;
+	sysinfo->p->cflags = SYSINFO_CFLAGS;
+	sysinfo->p->vcstype = SYSINFO_VCSTYPE;
+	sysinfo->p->vcsrevision_src = SYSINFO_VCSREV;
+#endif
+	sysinfo->vcsrevision_reload();
+	sysinfo_vcstype_name_retrieve(); // Must be called after setting vcstype
+}
+
+/**
+ * Interface shutdown cleanup.
+ */
+void sysinfo_final(void) {
+#ifdef WIN32
+	// Only need to be free'd in win32, they're #defined elsewhere
+	if (sysinfo->p->osversion)
+		aFree(sysinfo->p->osversion);
+	if (sysinfo->p->cpu)
+		aFree(sysinfo->p->cpu);
+	if (sysinfo->p->arch)
+		aFree(sysinfo->p->arch);
+	if (sysinfo->p->vcsrevision_src)
+		aFree(sysinfo->p->vcsrevision_src);
+#endif
+	sysinfo->p->platform = NULL;
+	sysinfo->p->osversion = NULL;
+	sysinfo->p->cpu = NULL;
+	sysinfo->p->arch = NULL;
+	sysinfo->p->vcsrevision_src = NULL;
+	sysinfo->p->cflags = NULL;
+	if (sysinfo->p->vcsrevision_scripts)
+		aFree(sysinfo->p->vcsrevision_scripts);
+	sysinfo->p->vcsrevision_scripts = NULL;
+	if (sysinfo->p->vcstype_name)
+		aFree(sysinfo->p->vcstype_name);
+	sysinfo->p->vcstype_name = NULL;
+}
+
+/**
+ * Interface default values initialization.
+ */
+void sysinfo_defaults(void) {
+	sysinfo = &sysinfo_s;
+	memset(&sysinfo_p, '\0', sizeof(sysinfo_p));
+	sysinfo->p = &sysinfo_p;
+
+	sysinfo->platform = sysinfo_platform;
+	sysinfo->osversion = sysinfo_osversion;
+	sysinfo->cpu = sysinfo_cpu;
+	sysinfo->cpucores = sysinfo_cpucores;
+	sysinfo->arch = sysinfo_arch;
+	sysinfo->is64bit = sysinfo_is64bit;
+	sysinfo->compiler = sysinfo_compiler;
+	sysinfo->cflags = sysinfo_cflags;
+	sysinfo->vcstype = sysinfo_vcstype;
+	sysinfo->vcstypeid = sysinfo_vcstypeid;
+	sysinfo->vcsrevision_src = sysinfo_vcsrevision_src;
+	sysinfo->vcsrevision_scripts = sysinfo_vcsrevision_scripts;
+	sysinfo->vcsrevision_reload = sysinfo_vcsrevision_reload;
+	sysinfo->is_superuser = sysinfo_is_superuser;
+	sysinfo->init = sysinfo_init;
+	sysinfo->final = sysinfo_final;
+}
diff --git a/src/common/sysinfo.h b/src/common/sysinfo.h
new file mode 100644
index 000000000..17faac26b
--- /dev/null
+++ b/src/common/sysinfo.h
@@ -0,0 +1,62 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Base Author: Haru @ http://hercules.ws
+
+#ifndef _COMMON_SYSINFO_H_
+#define _COMMON_SYSINFO_H_
+
+/**
+ * Provides various bits of information about the system Hercules is running on
+ * (note: on unix systems, to avoid runtime detection, most of the data is
+ * cached at compile time)
+ */
+
+#include "../common/cbasetypes.h"
+
+#ifdef _COMMON_SYSINFO_P_
+struct sysinfo_private {
+	char *platform;
+	char *osversion;
+	char *cpu;
+	int cpucores;
+	char *arch;
+	char *compiler;
+	char *cflags;
+	char *vcstype_name;
+	int vcstype;
+	char *vcsrevision_src;
+	char *vcsrevision_scripts;
+};
+#else
+struct sysinfo_private;
+#endif
+
+/**
+ * sysinfo.c interface
+ **/
+struct sysinfo_interface {
+	struct sysinfo_private *p;
+
+	const char *(*platform) (void);
+	const char *(*osversion) (void);
+	const char *(*cpu) (void);
+	int (*cpucores) (void);
+	const char *(*arch) (void);
+	bool (*is64bit) (void);
+	const char *(*compiler) (void);
+	const char *(*cflags) (void);
+	const char *(*vcstype) (void);
+	int (*vcstypeid) (void);
+	const char *(*vcsrevision_src) (void);
+	const char *(*vcsrevision_scripts) (void);
+	void (*vcsrevision_reload) (void);
+	bool (*is_superuser) (void);
+	void (*init) (void);
+	void (*final) (void);
+};
+
+struct sysinfo_interface *sysinfo;
+
+void sysinfo_defaults(void);
+
+#endif /* _COMMON_SYSINFO_H_ */
diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index fa5f92105..033dad25b 100644
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -1,9 +1,12 @@
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
 
 CONFIG_D = ../config
 CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h)
 
 COMMON_D = ../common
 COMMON_H = $(wildcard $(COMMON_D)/*.h)
+SYSINFO_INC = $(COMMON_D)/sysinfo.inc
 
 LIBCONFIG_D = ../../3rdparty/libconfig
 LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \
@@ -23,7 +26,7 @@ LOGIN_H = login.h account.h ipban.h loginlog.h
 
 HAVE_MYSQL=@HAVE_MYSQL@
 ifeq ($(HAVE_MYSQL),yes)
-	LOGIN_SERVER_SQL_DEPENDS=$(LOGIN_OBJ) $(COMMON_D)/obj_sql/common_sql.a $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ)
+	LOGIN_SERVER_SQL_DEPENDS=$(LOGIN_OBJ) $(COMMON_D)/obj_sql/common_sql.a $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ $(SYSINFO_INC))
 else
 	LOGIN_SERVER_SQL_DEPENDS=needs_mysql
 endif
@@ -62,6 +65,10 @@ help:
 Makefile: Makefile.in
 	@$(MAKE) -C ../.. src/login/Makefile
 
+$(SYSINFO_INC): $(LOGIN_C) $(LOGIN_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H)
+	@echo "	MAKE	$@"
+	@$(MAKE) -C ../.. sysinfo
+
 needs_mysql:
 	@echo "MySQL not found or disabled by the configure script"
 	@exit 1
diff --git a/src/map/Makefile.in b/src/map/Makefile.in
index e3a47abeb..e4f2d9953 100644
--- a/src/map/Makefile.in
+++ b/src/map/Makefile.in
@@ -1,9 +1,12 @@
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
 
 CONFIG_D = ../config
 CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h)
 
 COMMON_D = ../common
 COMMON_H = $(wildcard $(COMMON_D)/*.h)
+SYSINFO_INC = $(COMMON_D)/sysinfo.inc
 
 LIBCONFIG_D = ../../3rdparty/libconfig
 LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \
@@ -33,7 +36,7 @@ MAP_H = atcommand.h battle.h battleground.h buyingstore.h chat.h chrif.h \
 
 HAVE_MYSQL=@HAVE_MYSQL@
 ifeq ($(HAVE_MYSQL),yes)
-	MAP_SERVER_SQL_DEPENDS=$(MAP_OBJ) $(COMMON_D)/obj_sql/common_sql.a $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ)
+	MAP_SERVER_SQL_DEPENDS=$(MAP_OBJ) $(COMMON_D)/obj_sql/common_sql.a $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ $(SYSINFO_INC))
 else
 	MAP_SERVER_SQL_DEPENDS=needs_mysql
 endif
@@ -79,6 +82,10 @@ help:
 Makefile: Makefile.in
 	@$(MAKE) -C ../.. src/map/Makefile
 
+$(SYSINFO_INC): $(MAP_C) $(MAP_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H)
+	@echo "	MAKE	$@"
+	@$(MAKE) -C ../.. sysinfo
+
 needs_mysql:
 	@echo "MySQL not found or disabled by the configure script"
 	@exit 1
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 9e33f3c68..6668214fa 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -14,6 +14,7 @@
 #include "../common/strlib.h"
 #include "../common/utils.h"
 #include "../common/conf.h"
+#include "../common/sysinfo.h"
 
 #include "atcommand.h"
 #include "battle.h"
@@ -7208,18 +7209,11 @@ ACMD(whereis)
 }
 
 ACMD(version) {
-	const char *git = get_git_hash();
-	const char *svn = get_svn_revision();
-	
-	if ( git[0] != HERC_UNKNOWN_VER ) {
-		sprintf(atcmd_output,msg_txt(1295),git); // Git Hash '%s'
-		clif->message(fd,atcmd_output);
-	} else if ( svn[0] != HERC_UNKNOWN_VER ) {
-		sprintf(atcmd_output,msg_txt(1294),git); // SVN r%s
-		clif->message(fd,atcmd_output);
-	} else
-		clif->message(fd,msg_txt(1296)); // Cannot determine version
-	
+	sprintf(atcmd_output, msg_txt(1296), sysinfo->is64bit() ? 64 : 32, sysinfo->platform()); // Hercules %d-bit for %s
+	clif->message(fd, atcmd_output);
+	sprintf(atcmd_output, msg_txt(1295), sysinfo->vcstype(), sysinfo->vcsrevision_src(), sysinfo->vcsrevision_scripts()); // %s revision '%s' (src) / '%s' (scripts)
+	clif->message(fd, atcmd_output);
+
 	return true;
 }
 
diff --git a/src/map/battle.c b/src/map/battle.c
index 2217ccecc..d64c14b2f 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -12,6 +12,7 @@
 #include "../common/socket.h"
 #include "../common/strlib.h"
 #include "../common/utils.h"
+#include "../common/sysinfo.h"
 #include "../common/HPM.h"
 
 #include "map.h"
@@ -6748,8 +6749,6 @@ static const struct _battle_data {
 void Hercules_report(char* date, char *time_c) {
 	int i, bd_size = ARRAYLENGTH(battle_data);
 	unsigned int config = 0;
-	const char *svn = get_svn_revision();
-	const char *git = get_git_hash();
 	char timestring[25];
 	time_t curtime;
 	char* buf;
@@ -6776,6 +6775,9 @@ void Hercules_report(char* date, char *time_c) {
 		C_SEND_SHORTLIST		= 0x40000,
 	};
 
+	// TODO[Haru]: Add sysinfo->platform(), sysinfo->osversion(), sysinfo->cpu(), sysinfo->arch(),
+	//             sysinfo->vcstype(), sysinfo->vcsrevision_scripts() to the stat server
+
 	/* we get the current time */
 	time(&curtime);
 	strftime(timestring, 24, "%Y-%m-%d %H:%M:%S", localtime(&curtime));
@@ -6867,7 +6869,7 @@ void Hercules_report(char* date, char *time_c) {
 	safestrncpy((char*)WBUFP(buf,6 + 12), time_c, 9);
 	safestrncpy((char*)WBUFP(buf,6 + 12 + 9), timestring, 24);
 
-	safestrncpy((char*)WBUFP(buf,6 + 12 + 9 + 24), git[0] != HERC_UNKNOWN_VER ? git : svn[0] != HERC_UNKNOWN_VER ? svn : "Unknown", 41);
+	safestrncpy((char*)WBUFP(buf,6 + 12 + 9 + 24), sysinfo->vcsrevision_src(), 41);
 	WBUFL(buf,6 + 12 + 9 + 24 + 41) = map->getusers();
 
 	WBUFL(buf,6 + 12 + 9 + 24 + 41 + 4) = config;
diff --git a/src/map/map.c b/src/map/map.c
index a423e6973..7adeee3d5 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -5373,9 +5373,6 @@ void map_helpscreen(bool do_exit)
  * Map-Server Version Screen [MC Cameri]
  *------------------------------------------------------*/
 void map_versionscreen(bool do_exit) {
-	const char *svn = get_svn_revision();
-	const char *git = get_git_hash();
-	ShowInfo(CL_WHITE"Hercules version: %s" CL_RESET"\n", git[0] != HERC_UNKNOWN_VER ? git : svn[0] != HERC_UNKNOWN_VER ? svn : "Unknown");
 	ShowInfo(CL_GREEN"Website/Forum:"CL_RESET"\thttp://hercules.ws/\n");
 	ShowInfo(CL_GREEN"IRC Channel:"CL_RESET"\tirc://irc.rizon.net/#Hercules\n");
 	ShowInfo("Open "CL_WHITE"readme.txt"CL_RESET" for more information.\n");
diff --git a/src/map/pc.c b/src/map/pc.c
index 848238ed2..afb06527d 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -14,6 +14,7 @@
 #include "../common/utils.h"
 #include "../common/conf.h"
 #include "../common/mmo.h" //NAME_LENGTH
+#include "../common/sysinfo.h"
 
 #include "pc.h"
 #include "atcommand.h" // get_atcommand_level()
@@ -1147,15 +1148,8 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 	if( !changing_mapservers ) {
 
 		if (battle_config.display_version == 1) {
-			const char* svn = get_svn_revision();
-			const char* git = get_git_hash();
 			char buf[256];
-			if( git[0] != HERC_UNKNOWN_VER )
-				sprintf(buf,"Git Hash: %s", git);
-			else if( svn[0] != HERC_UNKNOWN_VER )
-				sprintf(buf,"SVN Revision: %s", svn);
-			else
-				sprintf(buf,"Unknown Version");
+			sprintf(buf, msg_txt(1295), sysinfo->vcstype(), sysinfo->vcsrevision_src(), sysinfo->vcsrevision_scripts()); // %s revision '%s' (src) / '%s' (scripts)
 			clif->message(sd->fd, buf);
 		}
 		
diff --git a/src/map/script.c b/src/map/script.c
index 312e40696..8ac657f93 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -12,6 +12,7 @@
 #include "../common/strlib.h"
 #include "../common/timer.h"
 #include "../common/utils.h"
+#include "../common/sysinfo.h"
 
 #include "map.h"
 #include "path.h"
@@ -4499,6 +4500,8 @@ int script_reload(void) {
 
 	itemdb->name_constants();
 
+	sysinfo->vcsrevision_reload();
+
 	return 0;
 }
 /* returns name of current function being run, from within the stack [Ind/Hercules] */
@@ -17315,19 +17318,6 @@ BUILDIN(is_function) {
 	return true;
 }
 /**
- * get_revision() -> retrieves the current svn revision (if available)
- **/
-BUILDIN(get_revision) {
-	const char *svn = get_svn_revision();
-
-	if ( svn[0] != HERC_UNKNOWN_VER )
-		script_pushint(st,atoi(svn));
-	else
-		script_pushint(st,-1);//unknown
-
-	return true;
-}
-/**
  * freeloop(<toggle>) -> toggles this script instance's looping-check ability
  **/
 BUILDIN(freeloop) {
@@ -19152,7 +19142,6 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(getargcount,""),
 		BUILDIN_DEF(getcharip,"?"),
 		BUILDIN_DEF(is_function,"s"),
-		BUILDIN_DEF(get_revision,""),
 		BUILDIN_DEF(freeloop,"i"),
 		BUILDIN_DEF(getrandgroupitem,"ii"),
 		BUILDIN_DEF(cleanmap,"s"),
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 0f1698d2a..11e93973d 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -1,3 +1,6 @@
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
+
 ################  PLUGIN CONFIGURATION  ##############################
 #                                                                    #
 # When you add a plugin, add its name here:                          #
@@ -50,7 +53,7 @@ $(ALLPLUGINS): %: ../../plugins/%@DLLEXT@
 buildclean:
 	@echo "	CLEAN	plugins (build temp files)"
 	@rm -rf *.o
-	
+
 clean: buildclean
 	@echo "	CLEAN	plugins"
 	@rm -rf ../../plugins/*@DLLEXT@
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index c70997c63..2ee4e29b7 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -1,9 +1,12 @@
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
 
 CONFIG_D = ../config
 CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h)
 
 COMMON_D = ../common
 COMMON_H = $(wildcard $(COMMON_D)/*.h)
+SYSINFO_INC = $(COMMON_D)/sysinfo.inc
 
 LIBCONFIG_D = ../../3rdparty/libconfig
 LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \
@@ -17,9 +20,10 @@ MT19937AR_OBJ = $(MT19937AR_D)/mt19937ar.o
 MT19937AR_H = $(MT19937AR_D)/mt19937ar.h
 MT19937AR_INCLUDE = -I$(MT19937AR_D)
 
-TEST_SPINLOCK_OBJ=obj/test_spinlock.o
-TEST_SPINLOCK_H=
-TEST_SPINLOCK_DEPENDS=$(TEST_SPINLOCK_OBJ) $(COMMON_D)/obj_sql/common_sql.a $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ)
+TEST_SPINLOCK_OBJ = obj/test_spinlock.o
+TEST_SPINLOCK_C = test_spinlock.c
+TEST_SPINLOCK_H =
+TEST_SPINLOCK_DEPENDS = $(TEST_SPINLOCK_OBJ) $(COMMON_D)/obj_sql/common_sql.a $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ $(SYSINFO_INC))
 
 @SET_MAKE@
 
@@ -44,22 +48,25 @@ clean: buildclean
 Makefile: Makefile.in
 	@$(MAKE) -C ../.. src/test/Makefile
 
+$(SYSINFO_INC): $(TEST_SPINLOCK_C) $(TEST_SPINLOCK_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H)
+	@echo "	MAKE	$@"
+	@$(MAKE) -C ../.. sysinfo
+
 # object directories
 
 obj:
 	@echo "	MKDIR	obj"
 	@-mkdir obj
-	
+
 #executables
 
 test_spinlock: $(TEST_SPINLOCK_DEPENDS) Makefile
 	@echo "	LD	$@"
-	@$(CC) @LDFLAGS@ -o ../../test_spinlock@EXEEXT@ $(TEST_SPINLOCK_OBJ) $(COMMON_D)/obj_sql/common_sql.a \
-		$(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@
+	@$(CC) @LDFLAGS@ -o ../../test_spinlock@EXEEXT@ $(TEST_SPINLOCK_DEPENDS) @LIBS@ @MYSQL_LIBS@
 
-# login object files
+# object files
 
-obj/%.o: %.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj
+obj/%.o: %.c $(TEST_SPINLOCK_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj
 	@echo "	CC	$<"
 	@$(CC) @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
 
@@ -67,7 +74,7 @@ obj/%.o: %.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj
 $(COMMON_D)/obj_all/common.a:
 	@echo "	MAKE	$@"
 	@$(MAKE) -C $(COMMON_D) sql
-	
+
 $(COMMON_D)/obj_sql/common_sql.a:
 	@echo "	MAKE	$@"
 	@$(MAKE) -C $(COMMON_D) sql
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in
index 3d0de1122..07b03e334 100644
--- a/src/tool/Makefile.in
+++ b/src/tool/Makefile.in
@@ -1,12 +1,12 @@
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
 
 CONFIG_D = ../config
 CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h)
 
 COMMON_D = ../common
-COMMON_OBJ = $(addprefix $(COMMON_D)/obj_all/, des.o grfio.o malloc.o \
-             nullpo.o miniconsole.o minicore.o showmsg.o strlib.o utils.o)
-COMMON_H = $(addprefix $(COMMON_D)/, cbasetypes.h console.h core.h des.h \
-           grfio.h malloc.h mmo.h nullpo.h showmsg.h strlib.h utils.h)
+COMMON_H = $(wildcard $(COMMON_D)/*.h)
+SYSINFO_INC = $(COMMON_D)/sysinfo.inc
 
 LIBCONFIG_D = ../../3rdparty/libconfig
 LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \
@@ -16,6 +16,9 @@ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \
 LIBCONFIG_INCLUDE = -I$(LIBCONFIG_D)
 
 MAPCACHE_OBJ = obj_all/mapcache.o
+MAPCACHE_C = mapcache.c
+MAPCACHE_H =
+MAPCACHE_DEPENDS = $(MAPCACHE_OBJ) $(COMMON_D)/obj_all/common_mini.a $(LIBCONFIG_OBJ $(SYSINFO_INC))
 
 @SET_MAKE@
 
@@ -29,9 +32,9 @@ all: mapcache Makefile
 
 mapcache: ../../mapcache@EXEEXT@
 
-../../mapcache@EXEEXT@: $(MAPCACHE_OBJ) $(COMMON_OBJ) $(LIBCONFIG_OBJ) Makefile
+../../mapcache@EXEEXT@: $(MAPCACHE_DEPENDS) Makefile
 	@echo "	LD	$(notdir $@)"
-	@$(CC) @LDFLAGS@ $(LIBCONFIG_INCLUDE) -o ../../mapcache@EXEEXT@ $(MAPCACHE_OBJ) $(COMMON_OBJ) $(LIBCONFIG_OBJ) @LIBS@
+	@$(CC) @LDFLAGS@ -o ../../mapcache@EXEEXT@ $(MAPCACHE_DEPENDS) @LIBS@
 
 buildclean:
 	@echo "	CLEAN	tool (build temp files)"
@@ -55,22 +58,22 @@ help:
 Makefile: Makefile.in
 	@$(MAKE) -C ../.. src/tool/Makefile
 
+$(SYSINFO_INC): $(MAPCACHE_C) $(MAPCACHE_H) $(COMMON_H) $(CONFIG_H) $(LIBCONFIG_H)
+	@echo "	MAKE	$@"
+	@$(MAKE) -C ../.. sysinfo
+
 obj_all:
 	@echo "	MKDIR	obj_all"
 	@-mkdir obj_all
 
-obj_all/%.o: %.c $(COMMON_H) $(CONFIG_H) $(LIBCONFIG_H) | obj_all
+obj_all/%.o: %.c $(MAPCACHE_H) $(COMMON_H) $(CONFIG_H) $(LIBCONFIG_H) | obj_all
 	@echo "	CC	$<"
 	@$(CC) @CFLAGS@ $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
 
 # missing common object files
-$(COMMON_D)/obj_all/%.o:
-	@echo "	MAKE	$@"
-	@$(MAKE) -C $(COMMON_D) sql
-
-$(COMMON_D)/obj_all/mini%.o:
+$(COMMON_D)/obj_all/common_mini.a:
 	@echo "	MAKE	$@"
-	@$(MAKE) -C $(COMMON_D) sql
+	@$(MAKE) -C $(COMMON_D) common_mini
 
 $(LIBCONFIG_OBJ):
 	@echo "	MAKE	$@"
diff --git a/sysinfogen.sh b/sysinfogen.sh
new file mode 100755
index 000000000..89857249f
--- /dev/null
+++ b/sysinfogen.sh
@@ -0,0 +1,259 @@
+#!/bin/sh
+
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
+# Base Author: Haru @ http://hercules.ws
+
+do_fail() {
+	echo 'Error writing output file'
+	exit 1
+}
+
+cleanstring() {
+	if [ "$( echo "x x" | sed -e 's/[[:space:]]//g' )" = "x x" ]; then
+		# Workaround for non-POSIX-compliant systems that lack [[:space:]] (Solaris)
+		echo "$@" | sed -e 's/"/ /g' -e 's/[ 	][ 	]*/ /g' -e 's/^[ 	]*//g' -e 's/[ 	]*$//g'
+	else
+		echo "$@" | sed -e 's/"/ /g' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g'
+	fi
+}
+
+if [ -z "$1" ]; then
+	echo 'No output file specified'
+	exit 1
+fi
+
+OUTFILE="$1"
+shift
+
+if ! touch "$OUTFILE"; then
+	echo 'Cannot create output file'
+	exit 1
+fi
+
+cat > "$OUTFILE" << EOF
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+
+// This file was automatically generated. Any edit to it will be lost.
+
+EOF
+[ $? -eq 0 ] || do_fail
+
+HERC_PLATFORM="$( uname -s )"
+HERC_CORES="0"
+HERC_CPU="Unknown"
+
+case $HERC_PLATFORM in
+	Linux)
+		DIST=''
+		DESCRIPTION=''
+		REV=''
+
+		if type lsb_release >/dev/null 2>&1; then
+			LSBINFO="$( lsb_release -a 2>/dev/null )"
+			DIST="$( cleanstring "$( echo "$LSBINFO" | grep '^Distributor ID:' | cut -d: -f2- )" )"
+			DESCRIPTION="$( echo "$LSBINFO" | grep '^Description:' | cut -d: -f2- | sed 's/Enterprise Linux Enterprise Linux/Oracle Linux/' )"
+		fi
+
+		if [ -z "$DIST" ] || [ "$DIST" = "Gentoo" ]; then
+			if [ -f /etc/gentoo-release ]; then
+				# "Gentoo Base System release 2.2"
+				DIST='Gentoo'
+				DESCRIPTION="$( head -n 1 /etc/gentoo-release )"
+				REV=''
+			elif [ -f /etc/arch-release ]; then
+				# empty release file
+				DIST='ArchLinux'
+				DESCRIPTION=''
+				REV=''
+			elif [ -f /etc/vmware-release ]; then
+				# "VMware ESX Server 3" or "VMware ESX 4.0 (Kandinsky)"
+				DIST="VMWare"
+				DESCRIPTION="$( head -n 1 /etc/vmware-release )"
+				REV=''
+			elif [ -f /etc/debian_version ]; then
+				# "wheezy/sid"
+				DIST="Debian"
+				DESCRIPTION="Debian GNU/Linux $( head -n 1 /etc/debian_version )"
+				REV=''
+			elif [ -f /etc/fedora-release ]; then
+				# "Fedora release 9 (Sulphur)"
+				DIST="Fedora"
+				DESCRIPTION="$( head -n 1 /etc/fedora-release )"
+				REV=''
+			elif [ -f /etc/knoppix_version ]; then
+				# "3.2 2003-04-15"
+				DIST="Knoppix"
+				REV="Knoppix GNU/Linux $( head -n 1 /etc/knoppix_version )"
+				DESCRIPTION=''
+			elif [ -f /etc/mandriva-release ]; then
+				# "Mandriva Linux release 2010.1 (Official) for x86_64"
+				DIST="Mandriva"
+				DESCRIPTION="$( head -n 1 /etc/mandriva-release )"
+				REV=''
+			elif [ -f /etc/mandrake-release ]; then
+				# "Mandrakelinux release 10.1 (Community) for i586"
+				DIST="Mandrake"
+				DESCRIPTION="$( head -n 1 /etc/mandrake-release )"
+				REV=''
+			elif [ -f /etc/oracle-release ]; then
+				# "Oracle Linux Server release 6.3"
+				DIST="Oracle"
+				DESCRIPTION="$( head -n 1 /etc/oracle-release )"
+				REV=''
+			elif [ -f /etc/centos-release ]; then
+				# "CentOS Linux release 6.0 (Final)"
+				DIST="CentOS"
+				DESCRIPTION="$( head -n 1 /etc/centos-release )"
+				REV=''
+			elif [ -f /etc/redhat-release ]; then
+				# "Red Hat Enterprise Linux Server release 5 (Tikanga)"
+				DIST="RedHat"
+				DESCRIPTION="$( head -n 1 /etc/redhat-release )"
+				REV=''
+			elif [ -f /etc/slackware-version ]; then
+				DIST="Slackware"
+				DESCRIPTION="$( head -n 1 /etc/slackware-version )"
+				REV=''
+			elif [ -f /etc/slackware-release ]; then
+				DIST="Slackware"
+				DESCRIPTION="$( head -n 1 /etc/slackware-release )"
+				REV=''
+			elif [ -f /etc/SuSE-release ]; then
+				# "SUSE Linux Enterprise Server 11 (x86_64)"
+				# Note: it may contain several extra lines
+				DIST="SuSE"
+				DESCRIPTION="$( head -n 1 /etc/SuSE-release )"
+				REV=''
+			elif [ -f /etc/trustix-release ]; then
+				# "Trustix Secure Linux release 2.0 (Cloud)"
+				DIST="Trustix"
+				DESCRIPTION="$( head -n 1 /etc/trustix-release )"
+				REV=''
+			else
+				DIST='Unknown'
+				DESCRIPTION=''
+				REV=''
+			fi
+		fi
+		if [ -n "$DESCRIPTION" ]; then
+			DIST="$DESCRIPTION"
+		fi
+		HERC_OSVERSION="$DIST"
+
+		HERC_CPU="$( cat /proc/cpuinfo | grep "model name" | head -n 1 | cut -d: -f2- )"
+		HERC_CORES="$( grep '^processor' /proc/cpuinfo | wc -l )"
+		;;
+	Darwin)
+		HERC_PLATFORM="Mac OS X"
+		if type sw_vers >/dev/null 2>&1; then
+			HERC_OSVERSION="$( sw_vers -productName ) $( sw_vers -productVersion ) $( sw_vers -buildVersion )"
+		else
+			HERC_OSVERSION="Unknown"
+		fi
+		if type system_profiler >/dev/null 2>&1; then
+			HWDATA="$( system_profiler SPHardwareDataType )"
+			HWDATA_CPU="$( echo "$HWDATA" | grep "Processor Name:" | cut -d: -f2- )"
+			HWDATA_CPUSPEED="$( cleanstring "$( echo "$HWDATA" | grep "Processor Speed:" | cut -d: -f2- )" )"
+			HERC_CORES="$( echo "$HWDATA" | grep "Total Number of Cores:" | cut -d: -f2- )"
+			HERC_CPU="${HWDATA_CPU} (${HWDATA_CPUSPEED})"
+		fi
+		;;
+	SunOS)
+		HERC_PLATFORM="Solaris"
+		HERC_OSVERSION="${HERC_PLATFORM} $( uname -r ) ($( uname -p) $(uname -v))"
+		;;
+	AIX)
+		HERC_OSVERSION="AIX $( oslevel ) ($(`oslevel -r`))"
+		;;
+	CYGWIN*)
+		HERC_PLATFORM="Cygwin Windows"
+		HERC_OSVERSION="$( cleanstring "$( uname -s )" )"
+		HERC_CPU="$( cat /proc/cpuinfo | grep "model name" | head -n 1 | cut -d: -f2- )"
+		HERC_CORES="$( grep '^processor' /proc/cpuinfo | wc -l )"
+		;;
+	OpenBSD)
+		HERC_OSVERSION="${HERC_PLATFORM} $( uname -r ) ($( uname -p) $(uname -v))"
+		HERC_CPU="$( sysctl hw.model | cut -d= -f2- )"
+		HERC_CORES="$( sysctl hw.ncpu | cut -d= -f2- )"
+		;;
+	FreeBSD)
+		HERC_OSVERSION="${HERC_PLATFORM} $( uname -r ) ($( uname -p))"
+		HERC_CPU="$( sysctl hw.model | cut -d: -f2- )"
+		HERC_CORES="$( sysctl hw.ncpu | cut -d: -f2- )"
+		;;
+	NetBSD)
+		HERC_OSVERSION="${HERC_PLATFORM} $( uname -r ) ($( uname -p))"
+		HERC_CPU="$( sysctl hw.model | cut -d= -f2- )"
+		HERC_CORES="$( sysctl hw.ncpu | cut -d= -f2- )"
+		;;
+	*)
+		HERC_OSVERSION="Unknown"
+		;;
+esac
+
+cat >> "$OUTFILE" << EOF
+// Platform (uname -s)
+#define SYSINFO_PLATFORM "$( cleanstring "${HERC_PLATFORM}" )"
+
+// Operating System version (Platform-dependent)
+#define SYSINFO_OSVERSION "$( cleanstring "${HERC_OSVERSION}" )"
+
+// CPU Model (Platform-dependent)
+#define SYSINFO_CPU "$( cleanstring "${HERC_CPU}" )"
+
+// CPU Cores (Platform-dependent)
+#define SYSINFO_CPUCORES ( $( cleanstring "${HERC_CORES}" ) )
+
+EOF
+[ $? -eq 0 ] || do_fail
+
+HERC_ARCH="$( uname -m )"
+
+cat >> "$OUTFILE" << EOF
+// OS Architecture (uname -m)
+#define SYSINFO_ARCH "$( cleanstring "${HERC_ARCH}" )"
+
+EOF
+[ $? -eq 0 ] || do_fail
+
+HERC_CFLAGS="$@"
+HERC_CFLAGS="$( echo "${HERC_CFLAGS}" | sed 's/"//g' )"
+
+cat >> "$OUTFILE" << EOF
+// Compiler Flags
+#define SYSINFO_CFLAGS "$( cleanstring "${HERC_CFLAGS}" )"
+
+EOF
+[ $? -eq 0 ] || do_fail
+
+HERC_VCSREV=""
+if [ -d .git ]; then
+	HERC_VCSTYPE="VCSTYPE_GIT"
+	if type git >/dev/null 2>&1; then
+		HERC_VCSREV="$( git rev-parse HEAD )"
+	else
+		HERC_VCSREV="Unknown"
+	fi
+elif [ -d .svn ]; then
+	HERC_VCSTYPE="VCSTYPE_SVN"
+	if type svnversion >/dev/null 2>&1; then
+		HERC_VCSREV="$( svnversion )"
+	else
+		HERC_VCSREV="Unknown"
+	fi
+else
+	HERC_VCSTYPE="VCSTYPE_NONE"
+fi
+
+cat >> "$OUTFILE" << EOF
+// VCS Type
+#define SYSINFO_VCSTYPE ${HERC_VCSTYPE}
+
+// VCS Revision
+#define SYSINFO_VCSREV "$( cleanstring "${HERC_VCSREV}" )"
+
+EOF
+[ $? -eq 0 ] || do_fail
+
diff --git a/tools/HPMHookGen/Makefile.in b/tools/HPMHookGen/Makefile.in
index eb9cad8ff..ce07b37d4 100644
--- a/tools/HPMHookGen/Makefile.in
+++ b/tools/HPMHookGen/Makefile.in
@@ -1,3 +1,6 @@
+# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+# See the LICENSE file
+
 @SET_MAKE@
 
 COMMON_D = ../../src/common
@@ -38,7 +41,7 @@ endif
 .PHONY: hooks clean buildclean generate
 
 all: $(ALL_DEPENDS)
-	
+
 buildclean:
 
 clean: buildclean
@@ -73,4 +76,3 @@ needs_doxygen:
 needs_perl:
 	@echo "perl not found or disabled by the configure script"
 	@exit 1
-
diff --git a/vcproj-10/char-server.vcxproj b/vcproj-10/char-server.vcxproj
index 46438b3aa..3be45938a 100644
--- a/vcproj-10/char-server.vcxproj
+++ b/vcproj-10/char-server.vcxproj
@@ -155,6 +155,7 @@
     <ClInclude Include="..\src\common\random.h" />
     <ClInclude Include="..\src\common\showmsg.h" />
     <ClInclude Include="..\src\common\socket.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\sql.h" />
     <ClInclude Include="..\src\common\strlib.h" />
     <ClInclude Include="..\src\common\thread.h" />
@@ -199,6 +200,7 @@
     <ClCompile Include="..\src\common\socket.c" />
     <ClCompile Include="..\src\common\sql.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\thread.c" />
     <ClCompile Include="..\src\common\timer.c" />
     <ClCompile Include="..\src\common\utils.c" />
diff --git a/vcproj-10/char-server.vcxproj.filters b/vcproj-10/char-server.vcxproj.filters
index 3f3c2f6ac..ac5b663cd 100644
--- a/vcproj-10/char-server.vcxproj.filters
+++ b/vcproj-10/char-server.vcxproj.filters
@@ -40,6 +40,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\timer.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -168,6 +171,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\timer.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-10/login-server.vcxproj b/vcproj-10/login-server.vcxproj
index 7cf90854d..17538db85 100644
--- a/vcproj-10/login-server.vcxproj
+++ b/vcproj-10/login-server.vcxproj
@@ -164,6 +164,7 @@
     <ClInclude Include="..\src\common\socket.h" />
     <ClInclude Include="..\src\common\sql.h" />
     <ClInclude Include="..\src\common\strlib.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\timer.h" />
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
@@ -196,6 +197,7 @@
     <ClCompile Include="..\src\common\socket.c" />
     <ClCompile Include="..\src\common\sql.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\timer.c" />
     <ClCompile Include="..\src\common\utils.c" />
     <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
diff --git a/vcproj-10/login-server.vcxproj.filters b/vcproj-10/login-server.vcxproj.filters
index 46f4efbc4..321f84ad4 100644
--- a/vcproj-10/login-server.vcxproj.filters
+++ b/vcproj-10/login-server.vcxproj.filters
@@ -52,6 +52,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\timer.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -153,6 +156,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\timer.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-10/map-server.vcxproj b/vcproj-10/map-server.vcxproj
index 9ea5f5341..2c2491040 100644
--- a/vcproj-10/map-server.vcxproj
+++ b/vcproj-10/map-server.vcxproj
@@ -157,6 +157,7 @@
     <ClInclude Include="..\src\common\socket.h" />
     <ClInclude Include="..\src\common\sql.h" />
     <ClInclude Include="..\src\common\strlib.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\thread.h" />
     <ClInclude Include="..\src\common\timer.h" />
     <ClInclude Include="..\src\common\utils.h" />
@@ -234,6 +235,7 @@
     <ClCompile Include="..\src\common\socket.c" />
     <ClCompile Include="..\src\common\sql.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\thread.c" />
     <ClCompile Include="..\src\common\timer.c" />
     <ClCompile Include="..\src\common\utils.c" />
diff --git a/vcproj-10/map-server.vcxproj.filters b/vcproj-10/map-server.vcxproj.filters
index 1dff3e560..b04819eff 100644
--- a/vcproj-10/map-server.vcxproj.filters
+++ b/vcproj-10/map-server.vcxproj.filters
@@ -160,6 +160,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\timer.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -378,6 +381,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\timer.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-10/mapcache.vcxproj b/vcproj-10/mapcache.vcxproj
index b8c901f14..4aac4b06a 100644
--- a/vcproj-10/mapcache.vcxproj
+++ b/vcproj-10/mapcache.vcxproj
@@ -130,6 +130,7 @@
     <ClCompile Include="..\src\common\malloc.c" />
     <ClCompile Include="..\src\common\showmsg.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\utils.c" />
     <ClCompile Include="..\src\common\nullpo.c" />
     <ClCompile Include="..\src\tool\mapcache.c" />
@@ -144,6 +145,7 @@
     <ClInclude Include="..\src\common\mmo.h" />
     <ClInclude Include="..\src\common\showmsg.h" />
     <ClInclude Include="..\src\common\strlib.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\src\common\winapi.h" />
     <ClInclude Include="..\src\common\nullpo.h" />
diff --git a/vcproj-10/mapcache.vcxproj.filters b/vcproj-10/mapcache.vcxproj.filters
index e095c1e1c..32479a909 100644
--- a/vcproj-10/mapcache.vcxproj.filters
+++ b/vcproj-10/mapcache.vcxproj.filters
@@ -22,6 +22,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\utils.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -60,6 +63,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\utils.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-11/char-server.vcxproj b/vcproj-11/char-server.vcxproj
index 126f15ea4..1b77a6270 100644
--- a/vcproj-11/char-server.vcxproj
+++ b/vcproj-11/char-server.vcxproj
@@ -160,6 +160,7 @@
     <ClInclude Include="..\src\common\socket.h" />
     <ClInclude Include="..\src\common\sql.h" />
     <ClInclude Include="..\src\common\strlib.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\thread.h" />
     <ClInclude Include="..\src\common\timer.h" />
     <ClInclude Include="..\src\common\utils.h" />
@@ -202,6 +203,7 @@
     <ClCompile Include="..\src\common\socket.c" />
     <ClCompile Include="..\src\common\sql.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\thread.c" />
     <ClCompile Include="..\src\common\timer.c" />
     <ClCompile Include="..\src\common\utils.c" />
diff --git a/vcproj-11/char-server.vcxproj.filters b/vcproj-11/char-server.vcxproj.filters
index 5e536aada..9c3926e71 100644
--- a/vcproj-11/char-server.vcxproj.filters
+++ b/vcproj-11/char-server.vcxproj.filters
@@ -43,6 +43,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\timer.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -171,6 +174,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\timer.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-11/login-server.vcxproj b/vcproj-11/login-server.vcxproj
index 48c79d285..9556c0c72 100644
--- a/vcproj-11/login-server.vcxproj
+++ b/vcproj-11/login-server.vcxproj
@@ -168,6 +168,7 @@
     <ClInclude Include="..\src\common\socket.h" />
     <ClInclude Include="..\src\common\sql.h" />
     <ClInclude Include="..\src\common\strlib.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\timer.h" />
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
@@ -200,6 +201,7 @@
     <ClCompile Include="..\src\common\socket.c" />
     <ClCompile Include="..\src\common\sql.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\timer.c" />
     <ClCompile Include="..\src\common\utils.c" />
     <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
diff --git a/vcproj-11/login-server.vcxproj.filters b/vcproj-11/login-server.vcxproj.filters
index 4574ee7c1..2bd98407b 100644
--- a/vcproj-11/login-server.vcxproj.filters
+++ b/vcproj-11/login-server.vcxproj.filters
@@ -55,6 +55,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\timer.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -156,6 +159,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\timer.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-11/map-server.vcxproj b/vcproj-11/map-server.vcxproj
index 5701cd4d0..5e0290f01 100644
--- a/vcproj-11/map-server.vcxproj
+++ b/vcproj-11/map-server.vcxproj
@@ -161,6 +161,7 @@
     <ClInclude Include="..\src\common\socket.h" />
     <ClInclude Include="..\src\common\sql.h" />
     <ClInclude Include="..\src\common\strlib.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\thread.h" />
     <ClInclude Include="..\src\common\timer.h" />
     <ClInclude Include="..\src\common\utils.h" />
@@ -238,6 +239,7 @@
     <ClCompile Include="..\src\common\socket.c" />
     <ClCompile Include="..\src\common\sql.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\thread.c" />
     <ClCompile Include="..\src\common\timer.c" />
     <ClCompile Include="..\src\common\utils.c" />
diff --git a/vcproj-11/map-server.vcxproj.filters b/vcproj-11/map-server.vcxproj.filters
index 1dff3e560..b04819eff 100644
--- a/vcproj-11/map-server.vcxproj.filters
+++ b/vcproj-11/map-server.vcxproj.filters
@@ -160,6 +160,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\timer.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -378,6 +381,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\timer.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-11/mapcache.vcxproj b/vcproj-11/mapcache.vcxproj
index 1135461ad..36c8023e3 100644
--- a/vcproj-11/mapcache.vcxproj
+++ b/vcproj-11/mapcache.vcxproj
@@ -134,6 +134,7 @@
     <ClCompile Include="..\src\common\malloc.c" />
     <ClCompile Include="..\src\common\showmsg.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\utils.c" />
     <ClCompile Include="..\src\common\nullpo.c" />
     <ClCompile Include="..\src\tool\mapcache.c" />
@@ -148,6 +149,7 @@
     <ClInclude Include="..\src\common\mmo.h" />
     <ClInclude Include="..\src\common\showmsg.h" />
     <ClInclude Include="..\src\common\strlib.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\src\common\winapi.h" />
     <ClInclude Include="..\src\common\nullpo.h" />
diff --git a/vcproj-11/mapcache.vcxproj.filters b/vcproj-11/mapcache.vcxproj.filters
index 3fe21d74b..d5c2fbb83 100644
--- a/vcproj-11/mapcache.vcxproj.filters
+++ b/vcproj-11/mapcache.vcxproj.filters
@@ -22,6 +22,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\utils.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -60,6 +63,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\utils.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-12/char-server.vcxproj b/vcproj-12/char-server.vcxproj
index 710251169..a9dc9cac8 100644
--- a/vcproj-12/char-server.vcxproj
+++ b/vcproj-12/char-server.vcxproj
@@ -159,6 +159,7 @@
     <ClInclude Include="..\src\common\socket.h" />
     <ClInclude Include="..\src\common\sql.h" />
     <ClInclude Include="..\src\common\strlib.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\thread.h" />
     <ClInclude Include="..\src\common\timer.h" />
     <ClInclude Include="..\src\common\utils.h" />
@@ -201,6 +202,7 @@
     <ClCompile Include="..\src\common\socket.c" />
     <ClCompile Include="..\src\common\sql.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\thread.c" />
     <ClCompile Include="..\src\common\timer.c" />
     <ClCompile Include="..\src\common\utils.c" />
diff --git a/vcproj-12/char-server.vcxproj.filters b/vcproj-12/char-server.vcxproj.filters
index 5e536aada..9c3926e71 100644
--- a/vcproj-12/char-server.vcxproj.filters
+++ b/vcproj-12/char-server.vcxproj.filters
@@ -43,6 +43,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\timer.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -171,6 +174,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\timer.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-12/login-server.vcxproj b/vcproj-12/login-server.vcxproj
index 473f03019..fd1a84820 100644
--- a/vcproj-12/login-server.vcxproj
+++ b/vcproj-12/login-server.vcxproj
@@ -168,6 +168,7 @@
     <ClInclude Include="..\src\common\socket.h" />
     <ClInclude Include="..\src\common\sql.h" />
     <ClInclude Include="..\src\common\strlib.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\timer.h" />
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
@@ -200,6 +201,7 @@
     <ClCompile Include="..\src\common\socket.c" />
     <ClCompile Include="..\src\common\sql.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\timer.c" />
     <ClCompile Include="..\src\common\utils.c" />
     <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
diff --git a/vcproj-12/login-server.vcxproj.filters b/vcproj-12/login-server.vcxproj.filters
index 4574ee7c1..2bd98407b 100644
--- a/vcproj-12/login-server.vcxproj.filters
+++ b/vcproj-12/login-server.vcxproj.filters
@@ -55,6 +55,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\timer.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -156,6 +159,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\timer.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-12/map-server.vcxproj b/vcproj-12/map-server.vcxproj
index d5d6c3156..d8e0e2838 100644
--- a/vcproj-12/map-server.vcxproj
+++ b/vcproj-12/map-server.vcxproj
@@ -161,6 +161,7 @@
     <ClInclude Include="..\src\common\socket.h" />
     <ClInclude Include="..\src\common\sql.h" />
     <ClInclude Include="..\src\common\strlib.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\thread.h" />
     <ClInclude Include="..\src\common\timer.h" />
     <ClInclude Include="..\src\common\utils.h" />
@@ -238,6 +239,7 @@
     <ClCompile Include="..\src\common\socket.c" />
     <ClCompile Include="..\src\common\sql.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\thread.c" />
     <ClCompile Include="..\src\common\timer.c" />
     <ClCompile Include="..\src\common\utils.c" />
diff --git a/vcproj-12/map-server.vcxproj.filters b/vcproj-12/map-server.vcxproj.filters
index 1dff3e560..b04819eff 100644
--- a/vcproj-12/map-server.vcxproj.filters
+++ b/vcproj-12/map-server.vcxproj.filters
@@ -160,6 +160,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\timer.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -378,6 +381,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\timer.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-12/mapcache.vcxproj b/vcproj-12/mapcache.vcxproj
index 3be84f4d4..46f621966 100644
--- a/vcproj-12/mapcache.vcxproj
+++ b/vcproj-12/mapcache.vcxproj
@@ -134,6 +134,7 @@
     <ClCompile Include="..\src\common\malloc.c" />
     <ClCompile Include="..\src\common\showmsg.c" />
     <ClCompile Include="..\src\common\strlib.c" />
+    <ClCompile Include="..\src\common\sysinfo.c" />
     <ClCompile Include="..\src\common\utils.c" />
     <ClCompile Include="..\src\common\nullpo.c" />
     <ClCompile Include="..\src\tool\mapcache.c" />
@@ -148,6 +149,7 @@
     <ClInclude Include="..\src\common\mmo.h" />
     <ClInclude Include="..\src\common\showmsg.h" />
     <ClInclude Include="..\src\common\strlib.h" />
+    <ClInclude Include="..\src\common\sysinfo.h" />
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\src\common\winapi.h" />
     <ClInclude Include="..\src\common\nullpo.h" />
diff --git a/vcproj-12/mapcache.vcxproj.filters b/vcproj-12/mapcache.vcxproj.filters
index 3fe21d74b..d5c2fbb83 100644
--- a/vcproj-12/mapcache.vcxproj.filters
+++ b/vcproj-12/mapcache.vcxproj.filters
@@ -22,6 +22,9 @@
     <ClCompile Include="..\src\common\strlib.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\sysinfo.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\utils.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -60,6 +63,9 @@
     <ClInclude Include="..\src\common\strlib.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\sysinfo.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\utils.h">
       <Filter>common</Filter>
     </ClInclude>
diff --git a/vcproj-9/char-server.vcproj b/vcproj-9/char-server.vcproj
index f8d8e7abd..d1d9645a0 100644
--- a/vcproj-9/char-server.vcproj
+++ b/vcproj-9/char-server.vcproj
@@ -421,6 +421,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\sysinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\sysinfo.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\thread.c"
 				>
 			</File>
diff --git a/vcproj-9/login-server.vcproj b/vcproj-9/login-server.vcproj
index 1031d2237..58ccfda89 100644
--- a/vcproj-9/login-server.vcproj
+++ b/vcproj-9/login-server.vcproj
@@ -391,6 +391,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\sysinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\sysinfo.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\thread.c"
 				>
 			</File>
diff --git a/vcproj-9/map-server.vcproj b/vcproj-9/map-server.vcproj
index 81d39e48f..5456d74b1 100644
--- a/vcproj-9/map-server.vcproj
+++ b/vcproj-9/map-server.vcproj
@@ -444,6 +444,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\sysinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\sysinfo.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\thread.c"
 				>
 			</File>
diff --git a/vcproj-9/mapcache.vcproj b/vcproj-9/mapcache.vcproj
index a9d230b36..70a0ac4a2 100644
--- a/vcproj-9/mapcache.vcproj
+++ b/vcproj-9/mapcache.vcproj
@@ -271,6 +271,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\common\sysinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\sysinfo.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\common\utils.c"
 				>
 			</File>
author	Haru <haru@dotalux.com>	2013-10-18 13:21:34 +0200
committer	Haru <haru@dotalux.com>	2014-04-17 06:09:49 +0200
commit	7b12dd06420fae973fbcc2f81f5d385e59788c78 (patch)
tree	5bad1c4f2e44f5d4b49c82fafdd46177d15b9b97
parent	8a84d46a19b0112b7e2417728b8816e8b34b7383 (diff)
download	hercules-7b12dd06420fae973fbcc2f81f5d385e59788c78.tar.gz hercules-7b12dd06420fae973fbcc2f81f5d385e59788c78.tar.bz2 hercules-7b12dd06420fae973fbcc2f81f5d385e59788c78.tar.xz hercules-7b12dd06420fae973fbcc2f81f5d385e59788c78.zip