Merge

code/CMakeLists.txt

@@ -454,8 +454,7 @@ IF(WITH_NEL)
     ENDIF()
   ENDIF()
 
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include ${LIBXML2_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include)
-  ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
   ADD_SUBDIRECTORY(nel)
 ENDIF(WITH_NEL)
 

code/CMakeModules/FindExternal.cmake

@@ -59,7 +59,7 @@ IF(EXTERNAL_FOUND)
   IF(NOT External_FIND_QUIETLY)
     MESSAGE(STATUS "Found ${EXTERNAL_NAME}: ${EXTERNAL_PATH}")
   ENDIF()
-ELSE(EXTERNAL_FOUND)
+ELSE()
   IF(External_FIND_REQUIRED)
     MESSAGE(FATAL_ERROR "Unable to find ${EXTERNAL_NAME}!")
   ELSE()

code/CMakeModules/FindMSVC.cmake

@@ -93,8 +93,13 @@ IF(NOT VC_DIR)
 ENDIF()
 
 IF(NOT VC_DIR)
-  STRING(REGEX REPLACE "/bin/.+" "" VC_DIR ${CMAKE_CXX_COMPILER})
+  IF(CMAKE_CXX_COMPILER)
-ENDIF(NOT VC_DIR)
+    SET(_COMPILER ${CMAKE_CXX_COMPILER})
+  ELSE()
+    SET(_COMPILER ${CMAKE_C_COMPILER})
+  ENDIF()
+  STRING(REGEX REPLACE "/bin/.+" "" VC_DIR ${_COMPILER})
+ENDIF()
 
 SET(VC_INCLUDE_DIR "${VC_DIR}/include")
 SET(VC_INCLUDE_DIRS ${VC_INCLUDE_DIR})

code/nel/include/nel/georges/header.h

@@ -19,8 +19,12 @@
 
 #include "nel/misc/types_nl.h"
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
 
 namespace NLGEORGES
 {

code/nel/include/nel/gui/action_handler.h

@@ -17,13 +17,16 @@
 #ifndef NL_ACTION_HANDLER_H
 #define NL_ACTION_HANDLER_H
 
-#include "nel/misc/types_nl.h"
-#include <libxml/parser.h>
 #include "nel/misc/types_nl.h"
 #include "nel/misc/debug.h"
 #include "nel/misc/xml_auto_ptr.h"
+
 #include <map>
 
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
 namespace NLGUI
 {
 

code/nel/include/nel/gui/interface_options.h

@@ -22,9 +22,12 @@
 #include "nel/misc/debug.h"
 #include "nel/misc/smart_ptr.h"
 #include "nel/misc/rgba.h"
-#include "libxml/globals.h"
 #include "nel/misc/xml_auto_ptr.h"
 
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
 namespace NL3D
 {
 	class UAnimationSet;

code/nel/include/nel/ligo/primitive.h

@@ -20,8 +20,13 @@
 #include "nel/misc/vector.h"
 #include "nel/misc/rgba.h"
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
+
 
 #include <vector>
 

code/nel/include/nel/ligo/primitive_class.h

@@ -22,8 +22,9 @@
 #include <map>
 #include <set>
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
 namespace NLLIGO
 {

code/nel/include/nel/ligo/primitive_configuration.h

@@ -21,8 +21,9 @@
 #include "nel/misc/rgba.h"
 #include <vector>
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
 namespace NLLIGO
 {

code/nel/include/nel/misc/cdb.h

@@ -25,7 +25,9 @@
 #include "string_mapper.h"
 #include "sstring.h"
 
-#include <libxml/parser.h>
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
 namespace NLMISC
 {

code/nel/include/nel/misc/i_xml.h

@@ -25,8 +25,12 @@
 #include "types_nl.h"
 #include "stream.h"
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
+typedef struct _xmlParserCtxt xmlParserCtxt;
+typedef xmlParserCtxt *xmlParserCtxtPtr;
 
 namespace NLMISC {
 
@@ -124,11 +128,11 @@ public:
 
 	/** Get the first child node pointer of type. NULL if no node of type.
 	  */
-	static xmlNodePtr getFirstChildNode (xmlNodePtr parent, xmlElementType type);
+	static xmlNodePtr getFirstChildNode (xmlNodePtr parent, sint /* xmlElementType */ type);
 
 	/** Get the next child node pointer of type. NULL if no node of type.
 	  */
-	static xmlNodePtr getNextChildNode (xmlNodePtr last, xmlElementType type);
+	static xmlNodePtr getNextChildNode (xmlNodePtr last, sint /* xmlElementType */ type);
 
 	/** Count number of sub node named with a given name for a given node.
 	  */
@@ -136,7 +140,7 @@ public:
 
 	/** Count number of sub node of type for a given node.
 	  */
-	static uint		countChildren (xmlNodePtr node, xmlElementType type);
+	static uint		countChildren (xmlNodePtr node, sint /* xmlElementType */ type);
 
 	/**
 	  * Read a property string

code/nel/include/nel/misc/o_xml.h

@@ -25,9 +25,12 @@
 #include "types_nl.h"
 #include "stream.h"
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
 
 namespace NLMISC {
 

code/nel/include/nel/misc/xml_auto_ptr.h

@@ -19,6 +19,9 @@
 #ifndef XML_AUTO_PTR_H
 #define XML_AUTO_PTR_H
 
+#include "nel/misc/types_nl.h"
+#include "nel/misc/debug.h"
+
 #include <string>
 
 /** Simple auto pointer for xml pointers
@@ -28,7 +31,7 @@ class CXMLAutoPtr
 public:
 	CXMLAutoPtr(const char *value = NULL) : _Value(value) {}
 	CXMLAutoPtr(const unsigned char *value) : _Value((const char *) value) {}
-	~CXMLAutoPtr() { destroy(); }
+	~CXMLAutoPtr();
 	operator const char *() const { return _Value; }
 	operator bool() const { return _Value != NULL; }
 	inline std::string str() const { return _Value; }
@@ -36,13 +39,7 @@ public:
 	operator const unsigned char *() const { return (const unsigned char *)  _Value; }
 	char operator * ()  const { nlassert(_Value); return *_Value; }
 	/// NB : This remove previous owned pointer with xmlFree
-	CXMLAutoPtr &operator = (const char *other)
+	CXMLAutoPtr &operator = (const char *other);
-	{
-		if (other == _Value) return *this;
-		destroy();
-		_Value = other;
-		return *this;
-	}
 
 	CXMLAutoPtr &operator = (const unsigned char *other)
 	{
@@ -54,14 +51,7 @@ public:
 private:
 	const char *_Value;
 private:
-	void destroy()
+	void destroy();
-	{
-		if (_Value)
-		{
-			xmlFree(const_cast<char *>(_Value));
-			_Value = NULL;
-		}
-	}
 
 	// We'd rather avoid problems
 	CXMLAutoPtr(const CXMLAutoPtr &/* other */)

code/nel/src/gui/stdpch.h

@@ -30,6 +30,8 @@
 #include "nel/misc/uv.h"
 #include "nel/misc/hierarchical_timer.h"
 
+#include <libxml/parser.h>
+
 #ifdef NL_OS_WINDOWS
 	#ifndef NL_COMP_MINGW
 	#	define NOMINMAX

code/nel/src/logic/CMakeLists.txt

@@ -13,6 +13,10 @@ NL_ADD_LIB_SUFFIX(nellogic)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+IF(WITH_PCH)
+  ADD_NATIVE_PRECOMPILED_HEADER(nellogic ${CMAKE_CURRENT_SOURCE_DIR}/stdlogic.h ${CMAKE_CURRENT_SOURCE_DIR}/stdlogic.cpp)
+ENDIF(WITH_PCH)
+
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nellogic LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
 ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)

code/nel/src/logic/logic_condition.cpp

@@ -15,12 +15,14 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "nel/misc/o_xml.h"
+#include "stdlogic.h"
-
 #include "nel/logic/logic_condition.h"
+
 #include "nel/logic/logic_variable.h"
 #include "nel/logic/logic_state_machine.h"
 
+#include "nel/misc/o_xml.h"
+
 using namespace NLMISC;
 using namespace std;
 

code/nel/src/logic/logic_event.cpp

@@ -15,7 +15,9 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdlogic.h"
 #include "nel/logic/logic_event.h"
+
 #include "nel/logic/logic_state_machine.h"
 
 #include "nel/net/service.h"

code/nel/src/logic/logic_state_machine.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdlogic.h"
 #include "nel/logic/logic_state_machine.h"
 
 #include "nel/net/service.h"

code/nel/src/logic/logic_variable.cpp

@@ -15,9 +15,11 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "nel/logic/logic_state_machine.h"
+#include "stdlogic.h"
 #include "nel/logic/logic_variable.h"
 
+#include "nel/logic/logic_state_machine.h"
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/logic/stdlogic.cpp

@@ -0,0 +1,17 @@
+// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "stdlogic.h"

code/nel/src/logic/stdlogic.h

@@ -0,0 +1,41 @@
+// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef NL_STDMISC_H
+#define NL_STDMISC_H
+
+#include <vector>
+#include <map>
+#include <string>
+#include <limits>
+
+#include <libxml/parser.h>
+
+#ifdef NL_OS_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	define _WIN32_WINDOWS 0x0500
+#	ifndef _WIN32_WINNT
+#		define _WIN32_WINNT 0x0500
+#	endif
+#	ifndef NL_COMP_MINGW
+#		define WINVER 0x0500
+#		define NOMINMAX
+#	endif
+#	include <WinSock2.h>
+#	include <Windows.h>
+#endif
+
+#endif // NL_STDMISC_H

code/nel/src/misc/i_xml.cpp

@@ -1030,12 +1030,12 @@ xmlNodePtr CIXml::getNextChildNode (xmlNodePtr last, const char *childName)
 
 // ***************************************************************************
 
-xmlNodePtr CIXml::getFirstChildNode (xmlNodePtr parent, xmlElementType type)
+xmlNodePtr CIXml::getFirstChildNode (xmlNodePtr parent, sint /* xmlElementType */ type)
 {
 	xmlNodePtr child = parent->children;
 	while (child)
 	{
-		if (child->type == type)
+		if (child->type == (xmlElementType)type)
 			return child;
 		child = child->next;
 	}
@@ -1044,12 +1044,12 @@ xmlNodePtr CIXml::getFirstChildNode (xmlNodePtr parent, xmlElementType type)
 
 // ***************************************************************************
 
-xmlNodePtr CIXml::getNextChildNode (xmlNodePtr last, xmlElementType type)
+xmlNodePtr CIXml::getNextChildNode (xmlNodePtr last, sint /* xmlElementType */ type)
 {
 	last = last->next;
 	while (last)
 	{
-		if (last->type == type)
+		if (last->type == (xmlElementType)type)
 			return last;
 		last = last->next;
 	}
@@ -1072,7 +1072,7 @@ uint CIXml::countChildren (xmlNodePtr node, const char *childName)
 
 // ***************************************************************************
 
-uint CIXml::countChildren (xmlNodePtr node, xmlElementType type)
+uint CIXml::countChildren (xmlNodePtr node, sint /* xmlElementType */ type)
 {
 	uint count=0;
 	xmlNodePtr child = getFirstChildNode (node, type);

code/nel/src/misc/xml_auto_ptr.cpp

@@ -0,0 +1,47 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+#include "stdmisc.h"
+#include "nel/misc/xml_auto_ptr.h"
+
+#include <libxml/parser.h>
+
+//=======================================
+void CXMLAutoPtr::destroy()
+{
+	if (_Value)
+	{
+		xmlFree(const_cast<char *>(_Value));
+		_Value = NULL;
+	}
+}
+
+//=======================================
+CXMLAutoPtr::~CXMLAutoPtr()
+{
+	destroy();
+}
+
+//=======================================
+CXMLAutoPtr &CXMLAutoPtr::operator = (const char *other)
+{
+	if (other == _Value) return *this;
+	destroy();
+	_Value = other;
+	return *this;
+}

code/nel/tools/3d/ig_elevation/CMakeLists.txt

@@ -2,12 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ig_elevation ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ig_elevation nelmisc nel3d nelligo)
 NL_DEFAULT_PROPS(ig_elevation "NeL, Tools, 3D: ig_elevation")
 NL_ADD_RUNTIME_FLAGS(ig_elevation)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ig_elevation RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)

code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt

@@ -1,11 +1,8 @@
 INCLUDE_DIRECTORIES(
 		${CMAKE_CURRENT_BINARY_DIR}
 		${CMAKE_CURRENT_SOURCE_DIR}
-		${LIBXML2_INCLUDE_DIR}
 		${NEL_INCLUDE_DIR})
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 FILE(GLOB OBJECT_VIEWER_WIDGET_SRC *.cpp *.h)
 SET(OBJECT_VIEWER_WIDGET_HDR object_viewer_widget.h)
 

code/nel/tools/georges/georges2csv/CMakeLists.txt

@@ -2,12 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(georges2csv ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(georges2csv nelmisc nelgeorges)
 NL_DEFAULT_PROPS(georges2csv "NeL, Tools, Georges: georges2csv")
 NL_ADD_RUNTIME_FLAGS(georges2csv)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS georges2csv RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT toolsgeorges)

code/nel/tools/georges/georges2csv/georges2csv.cpp

@@ -44,10 +44,6 @@
 #include "nel/georges/u_form_loader.h"
 #include "nel/georges/load_form.h"
 
-// Include from libxml2
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
 // Georges, bypassing interface
 #include "nel/georges/form.h"
 

code/nel/tools/nel_unit_test/CMakeLists.txt

@@ -2,12 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nel_unit_test ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CPPTEST_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${CPPTEST_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nel_unit_test ${CPPTEST_LIBRARIES} nelmisc nelnet nelligo)
 NL_DEFAULT_PROPS(nel_unit_test "Unit Tests")
 NL_ADD_RUNTIME_FLAGS(nel_unit_test)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DNEL_UNIT_BASE="${PROJECT_SOURCE_DIR}/tools/nel_unit_test/")
+ADD_DEFINITIONS(-DNEL_UNIT_BASE="${PROJECT_SOURCE_DIR}/tools/nel_unit_test/")
 
 INSTALL(TARGETS nel_unit_test RUNTIME DESTINATION ${NL_BIN_PREFIX})

code/ryzom/client/src/CMakeLists.txt

@@ -140,13 +140,14 @@ IF(WITH_RYZOM_CLIENT)
               ryzom_clientsheets
               ryzom_gameshare
               nelpacs
-              ${LIBXML2_LIBRARIES}
               ${LUA_LIBRARIES}
               ${LUABIND_LIBRARIES}
               ${CURL_LIBRARIES}
               ${SEVENZIP_LIBRARY}
   )
 
+  ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+
   IF(NOT APPLE AND NOT WIN32)
     TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES})
   ENDIF()

code/ryzom/client/src/interface_v3/input_handler_manager.h

@@ -19,7 +19,6 @@
 #ifndef NL_INPUT_HANDLER_MANAGER_H
 #define NL_INPUT_HANDLER_MANAGER_H
 
-#include <libxml/parser.h>
 #include "nel/misc/event_server.h"
 #include <vector>
 #include <map>
@@ -28,6 +27,10 @@
 #include "nel/gui/input_handler.h"
 #include "nel/gui/group_editbox.h"
 
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
 
 /**
  * CInputManager. Class used to manage Input Handlers. its purpose is to manage all input handler

code/ryzom/client/src/stdpch.h

@@ -116,6 +116,8 @@
 #include "game_share/msg_client_server.h"
 #include "game_share/action_target_slot.h"
 
+#include <libxml/parser.h>
+
 // Foutez pas d'include du client ici svp ! Grrr ! Hulud
 
 #ifdef NL_OS_WINDOWS

code/ryzom/common/src/game_share/stdpch.h

@@ -66,6 +66,8 @@
 
 #include <nel/georges/load_form.h>
 
+#include <libxml/parser.h>
+
 #ifdef NL_OS_WINDOWS
 #	ifndef NL_COMP_MINGW
 #		define NOMINMAX

code/ryzom/server/admin_service_default.cfg

@@ -1,27 +1,27 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-DontUseNS = 1;
+DontUseNS = 1;
-
+
-RRDToolPath = "rrdtool";
+RRDToolPath = "rrdtool";
-RRDVarPath = "save_shard/rrd_graphs";
+RRDVarPath = "save_shard/rrd_graphs";
-
+
-// Variables required to be defined by other cfgs
+// Variables required to be defined by other cfgs
-//AESHost="localhost";
+//AESHost="localhost";
-//ASWebPort="46700";
+//ASWebPort="46700";
-//ASPort="46701";
+//ASPort="46701";
-
+
-StartCommands +=
+StartCommands +=
-{
+{
-	// create the admin service module and open the web interface
+	// create the admin service module and open the web interface
-	"moduleManager.createModule AdminService as webPort="+ASWebPort,
+	"moduleManager.createModule AdminService as webPort="+ASWebPort,
-
+
-	// create a gateway for aes to connect
+	// create a gateway for aes to connect
-	"moduleManager.createModule StandardGateway as_gw",
+	"moduleManager.createModule StandardGateway as_gw",
-	// create a layer 3 server
+	// create a layer 3 server
-	"as_gw.transportAdd L3Server l3s",
+	"as_gw.transportAdd L3Server l3s",
-	"as_gw.transportOptions l3s(PeerInvisible)",
+	"as_gw.transportOptions l3s(PeerInvisible)",
-	"as_gw.transportCmd l3s(open port="+ASPort+")",
+	"as_gw.transportCmd l3s(open port="+ASPort+")",
-
+
-	// plug the as
+	// plug the as
-	"as.plug as_gw",
+	"as.plug as_gw",
-};
+};

code/ryzom/server/ai_service_default.cfg

@@ -1,198 +1,198 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-// a list of system command that run at server startup.
+// a list of system command that run at server startup.
-SystemCmd	= {};
+SystemCmd	= {};
-
+
-//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
-//- Basic (specific) heal profile parameters ---------------------------------
+//- Basic (specific) heal profile parameters ---------------------------------
-// Downtime for normal heal (on other bots of the group)
+// Downtime for normal heal (on other bots of the group)
-HealSpecificDowntime = 100;
+HealSpecificDowntime = 100;
-// Downtime for self heal
+// Downtime for self heal
-HealSpecificDowntimeSelf = 100;
+HealSpecificDowntimeSelf = 100;
-//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
-
+
-// Disable caching of ligo primitive in binary files
+// Disable caching of ligo primitive in binary files
-CachePrims = 0;
+CachePrims = 0;
-CachePrimsLog = 0;
+CachePrimsLog = 0;
-
+
-// do not log the corrected position.
+// do not log the corrected position.
-LogAcceptablePos = 0;
+LogAcceptablePos = 0;
-// do not log group creation failure
+// do not log group creation failure
-LogGroupCreationFailure = 0;
+LogGroupCreationFailure = 0;
-// do not log aliad tree owner construstion.
+// do not log aliad tree owner construstion.
-LogAliasTreeOwner = 0;
+LogAliasTreeOwner = 0;
-// do not log outpost info
+// do not log outpost info
-LogOutpostDebug = 0;
+LogOutpostDebug = 0;
-// Speed factor, for debug purpose only. Don't set to high speed factor !
+// Speed factor, for debug purpose only. Don't set to high speed factor !
-SpeedFactor = 1;
+SpeedFactor = 1;
-// Speep up the timer triggering. Set a value between 1 (normal) and INT_MAX.
+// Speep up the timer triggering. Set a value between 1 (normal) and INT_MAX.
-TimerSpeedUp = 1;
+TimerSpeedUp = 1;
-
+
-// Default timer for wander behavior
+// Default timer for wander behavior
-DefaultWanderMinTimer = 50;		// 5s
+DefaultWanderMinTimer = 50;		// 5s
-DefaultWanderMaxTimer = 100;	// 10s
+DefaultWanderMaxTimer = 100;	// 10s
-
+
-// Fame and guard behavior
+// Fame and guard behavior
-// Fame value under witch the guard attack the player in sigth
+// Fame value under witch the guard attack the player in sigth
-FameForGuardAttack = -450000;
+FameForGuardAttack = -450000;
-// The minimum of fame for guard to help the player
+// The minimum of fame for guard to help the player
-FameForGuardHelp = -200000;
+FameForGuardHelp = -200000;
-
+
-// The default aggro distance for NPC
+// The default aggro distance for NPC
-DefaultNpcAggroDist = 15;
+DefaultNpcAggroDist = 15;
-// The default escort range for escort behavior
+// The default escort range for escort behavior
-DefaultEscortRange = 10;
+DefaultEscortRange = 10;
-
+
-//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
-// Aggro                                                                    //
+// Aggro                                                                    //
-//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
-AggroReturnDistCheck = 15.0;
+AggroReturnDistCheck = 15.0;
-AggroReturnDistCheckFauna = 15.0;
+AggroReturnDistCheckFauna = 15.0;
-AggroReturnDistCheckNpc = 1.5;
+AggroReturnDistCheckNpc = 1.5;
-AggroD1Radius = 250.0;
+AggroD1Radius = 250.0;
-AggroD2Radius = 150.0;
+AggroD2Radius = 150.0;
-AggroPrimaryGroupDist = 0.0;
+AggroPrimaryGroupDist = 0.0;
-AggroPrimaryGroupCoef = 0.0;
+AggroPrimaryGroupCoef = 0.0;
-AggroSecondaryGroupDist = 0.0;
+AggroSecondaryGroupDist = 0.0;
-AggroSecondaryGroupCoef = 0.0;
+AggroSecondaryGroupCoef = 0.0;
-AggroPropagationRadius = 60.0;
+AggroPropagationRadius = 60.0;
-
+
-BotRepopFx = "";
+BotRepopFx = "";
-
+
-// GROUP KEYWORDS
+// GROUP KEYWORDS
-// used mainly in event handlers to determine to which groups events apply
+// used mainly in event handlers to determine to which groups events apply
-KeywordsGroupNpc = {
+KeywordsGroupNpc = {
-
+
-	"patrol",		// a group of bots who guard a patrol route or point
+	"patrol",		// a group of bots who guard a patrol route or point
-	"convoy",		// a group with pack animals who follow roads from place to place
+	"convoy",		// a group with pack animals who follow roads from place to place
-	"with_players",	// a group who may travel with players
+	"with_players",	// a group who may travel with players
-};
+};
-
+
-// BOT KEYWORDS
+// BOT KEYWORDS
-// used mainly in npc_state_profile to determine which ai profiles to assign to which bots
+// used mainly in npc_state_profile to determine which ai profiles to assign to which bots
-KeywordsBotNpc = {
+KeywordsBotNpc = {
-
+
-	"team_leader",		// a bot who leads the way in front of their team (and acts as leader
+	"team_leader",		// a bot who leads the way in front of their team (and acts as leader
-						// in discussion with players)
+						// in discussion with players)
-	"animal_leader",	// a bot who leads pack animals
+	"animal_leader",	// a bot who leads pack animals
-	"guard",			// a bot who is a guard of some sort (eg karavan guard)
+	"guard",			// a bot who is a guard of some sort (eg karavan guard)
-	"emissary",			// eg karavan emissary
+	"emissary",			// eg karavan emissary
-	"preacher",			// eg kami preacher
+	"preacher",			// eg kami preacher
-	"guardian",			// typically kami guardians
+	"guardian",			// typically kami guardians
-	"vip",				// someone who has an escort of players or NPCs (assumed to be harmless)
+	"vip",				// someone who has an escort of players or NPCs (assumed to be harmless)
-};
+};
-
+
-// STATE KEYWORDS
+// STATE KEYWORDS
-// used mainly in event handlers to determine to which state events apply
+// used mainly in event handlers to determine to which state events apply
-// eg: when a player goes link dead if the team that this player is escorting
+// eg: when a player goes link dead if the team that this player is escorting
-// is in a dangerous area the team may enter a 'protect ourselves and wait for
+// is in a dangerous area the team may enter a 'protect ourselves and wait for
-// players' punctual state
+// players' punctual state
-KeywordsStateNpc = {
+KeywordsStateNpc = {
-
+
-	"safe",			// eg the gathering point at town entrance
+	"safe",			// eg the gathering point at town entrance
-	"dangerous",	// eg a route through the wilds
+	"dangerous",	// eg a route through the wilds
-};
+};
-
+
-ColourNames =
+ColourNames =
-{
+{
-	"red : 0",
+	"red : 0",
-	"beige : 1",
+	"beige : 1",
-	"green : 2",
+	"green : 2",
-	"turquoise : 3",
+	"turquoise : 3",
-	"blue : 4",
+	"blue : 4",
-	"violet : 5",
+	"violet : 5",
-	"white : 6",
+	"white : 6",
-	"black : 7",
+	"black : 7",
-
+
-	"redHair:	0",
+	"redHair:	0",
-	"blackHair:	1",
+	"blackHair:	1",
-};
+};
-
+
-
+
-StartCommandsWhenMirrorReady = {
+StartCommandsWhenMirrorReady = {
-};
+};
-
+
-//---------------------------------------------------------
+//---------------------------------------------------------
-// commands for multi IA configuration
+// commands for multi IA configuration
-// For multi IA config, use the -m command line switch folowed
+// For multi IA config, use the -m command line switch folowed
-// by a semicolon separated list of command block to run.
+// by a semicolon separated list of command block to run.
-// ex :
+// ex :
-//			-mCommon:Matis:Post
+//			-mCommon:Matis:Post
-// will execute the folowing command blocks in order :
+// will execute the folowing command blocks in order :
-//			* StartCommandsWhenMirrorReadyCommon
+//			* StartCommandsWhenMirrorReadyCommon
-//			* StartCommandsWhenMirrorReadyMatis
+//			* StartCommandsWhenMirrorReadyMatis
-//			* StartCommandsWhenMirrorReadyPost
+//			* StartCommandsWhenMirrorReadyPost
-//---------------------------------------------------------
+//---------------------------------------------------------
-// common commands before loading continents
+// common commands before loading continents
-StartCommandsWhenMirrorReadyCommon =
+StartCommandsWhenMirrorReadyCommon =
-{
+{
-	"RandomPosMaxRetry 6400",
+	"RandomPosMaxRetry 6400",
-	"fightRangeRange 4 60",
+	"fightRangeRange 4 60",
-	"LogOutpostDebug  1",
+	"LogOutpostDebug  1",
-	"grpHistoryRecordLog",
+	"grpHistoryRecordLog",
-
+
-	"verboseAIProfiles",
+	"verboseAIProfiles",
-	"verboseAliasNodeTreeParserLog",
+	"verboseAliasNodeTreeParserLog",
-	"verboseCombatLog",
+	"verboseCombatLog",
-	"verboseFaunaMgrLog",
+	"verboseFaunaMgrLog",
-	"verboseFaunaParseLog",
+	"verboseFaunaParseLog",
-	"verboseNPCBotProfiles",
+	"verboseNPCBotProfiles",
-	"verboseNPCMgrLog",
+	"verboseNPCMgrLog",
-	"verboseNPCParserLog",
+	"verboseNPCParserLog",
-	"verboseNpcDescriptionMsgLog",
+	"verboseNpcDescriptionMsgLog",
-	"verbosePrimitiveParserLog",
+	"verbosePrimitiveParserLog",
-//	"verboseSwitchMultipleChangesOfAProperty",
+//	"verboseSwitchMultipleChangesOfAProperty",
-};
+};
-
+
-// commands for Newbieland continent
+// commands for Newbieland continent
-StartCommandsWhenMirrorReadyNewbieland =
+StartCommandsWhenMirrorReadyNewbieland =
-{
+{
-	"loadContinent	newbieland",
+	"loadContinent	newbieland",
-	"createStaticAIInstance	newbieland",
+	"createStaticAIInstance	newbieland",
-	"loadMapsFromCommon newbieland_all",
+	"loadMapsFromCommon newbieland_all",
-};
+};
-
+
-// commands for post continents loading
+// commands for post continents loading
-StartCommandsWhenMirrorReadyPost =
+StartCommandsWhenMirrorReadyPost =
-{
+{
-	"spawnInstances",
+	"spawnInstances",
-	"updateAI",
+	"updateAI",
-	"updateAI",
+	"updateAI",
-};
+};
-
+
-
+
-// commands for Ring continents
+// commands for Ring continents
-StartCommandsWhenMirrorReadyRing =
+StartCommandsWhenMirrorReadyRing =
-{
+{
-    "loadContinent r2_desert",
+    "loadContinent r2_desert",
-	"createDynamicAIInstance 10000",
+	"createDynamicAIInstance 10000",
-	"loadPrimitiveFile dummy.primitive",
+	"loadPrimitiveFile dummy.primitive",
-
+
-    "loadContinent r2_forest",
+    "loadContinent r2_forest",
-	"createDynamicAIInstance 10001",
+	"createDynamicAIInstance 10001",
-	"loadPrimitiveFile dummy.primitive",
+	"loadPrimitiveFile dummy.primitive",
-
+
-    "loadContinent r2_lakes",
+    "loadContinent r2_lakes",
-	"createDynamicAIInstance 10003",
+	"createDynamicAIInstance 10003",
-	"loadPrimitiveFile dummy.primitive",
+	"loadPrimitiveFile dummy.primitive",
-
+
-    "loadContinent r2_jungle",
+    "loadContinent r2_jungle",
-	"createDynamicAIInstance 10002",
+	"createDynamicAIInstance 10002",
-	"loadPrimitiveFile dummy.primitive",
+	"loadPrimitiveFile dummy.primitive",
-
+
-    "loadContinent r2_roots",
+    "loadContinent r2_roots",
-	"createDynamicAIInstance 10004",
+	"createDynamicAIInstance 10004",
-	"loadPrimitiveFile dummy.primitive",
+	"loadPrimitiveFile dummy.primitive",
-
+
-//	"spawnInstances",
+//	"spawnInstances",
-	"updateAI",
+	"updateAI",
-	"updateAI",
+	"updateAI",
-
+
-	// L5 connect to the shard unifier
+	// L5 connect to the shard unifier
-	"unifiedNetwork.addService ShardUnifier ( address="+SUAddress+" sendId external autoRetry )",
+	"unifiedNetwork.addService ShardUnifier ( address="+SUAddress+" sendId external autoRetry )",
-
+
-	// Create a shard AIS Module
+	// Create a shard AIS Module
-	"moduleManager.createModule AisControl ais",
+	"moduleManager.createModule AisControl ais",
-	// Connect AIS
+	// Connect AIS
-	"ais.plug gw"
+	"ais.plug gw"
-};
+};

code/ryzom/server/backup_service_default.cfg

@@ -1,32 +1,32 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-// ---- service NeL variables (used by ConfigFile class)
+// ---- service NeL variables (used by ConfigFile class)
-
+
-DontUseNS = 1;
+DontUseNS = 1;
-
+
-// ---- service NeL variables (used by CVariable class)
+// ---- service NeL variables (used by CVariable class)
-
+
-ListeningPort = 49990;
+ListeningPort = 49990;
-
+
-// ---- service custom variables (used by ConfigFile class)
+// ---- service custom variables (used by ConfigFile class)
-
+
-// Listening port for the Web server to connect in
+// Listening port for the Web server to connect in
-
+
-WebPort = 49898;
+WebPort = 49898;
-
+
-BSReadState = 1;
+BSReadState = 1;
-
+
-
+
-// ---- service custom variables (used by CVariable class)
+// ---- service custom variables (used by CVariable class)
-
+
-// Port for the Layer 3 interface of the backup service
+// Port for the Layer 3 interface of the backup service
-L3ListeningPort = 49950;
+L3ListeningPort = 49950;
-
+
-// template path from SaveShardRoot to find character saves
+// template path from SaveShardRoot to find character saves
-SaveTemplatePath = "$shard/characters/account_$userid_$charid$ext";
+SaveTemplatePath = "$shard/characters/account_$userid_$charid$ext";
-
+
-// character saves possible extension list
+// character saves possible extension list
-SaveExtList = "_pdr.bin _pdr.xml .bin";
+SaveExtList = "_pdr.bin _pdr.xml .bin";
-
+
-//BSFilePrefix = "R:/code/ryzom/r2_shard/";
+//BSFilePrefix = "R:/code/ryzom/r2_shard/";
-//BSFileSubst = "r2_shard/";
+//BSFileSubst = "r2_shard/";

code/ryzom/server/common.cfg

@@ -1,7 +1,7 @@
 // ---- config local variables
 
 // Used by ConfigFile in EGS and WS
-ShardId = 302; 
+ShardId = 302;
 
 // Used by CVariable in WS
 PlayerLimit = 5000;
@@ -96,5 +96,4 @@ WriteFilesDirectory	= "data_shard";
 
 // ---- service custom variables (used by ConfigFile class)
 
-
 // ---- service custom variables (used by CVariable class)

code/ryzom/server/dynamic_scenario_service_default.cfg

@@ -1,9 +1,9 @@
-
+
-DelayBeforeStartAct = 1;
+DelayBeforeStartAct = 1;
-MaxNpcs = 300;
+MaxNpcs = 300;
-MaxStaticObjects = 200;
+MaxStaticObjects = 200;
-
+
-StartCommands +=
+StartCommands +=
-{
+{
-	"unifiedNetwork.addService ShardUnifier ( address="+SUAddress+" sendId external autoRetry )",
+	"unifiedNetwork.addService ShardUnifier ( address="+SUAddress+" sendId external autoRetry )",
-};
+};

code/ryzom/server/frontend_service_default.cfg

@@ -1,104 +1,104 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-// Configure module gateway for front end operation
+// Configure module gateway for front end operation
-StartCommands +=
+StartCommands +=
-{
+{
-	// Add a security plugin (will add player info on player module proxy)
+	// Add a security plugin (will add player info on player module proxy)
-	"gw.securityCreate FESecurity",
+	"gw.securityCreate FESecurity",
-	// create a front end service transport
+	// create a front end service transport
-	"gw.transportAdd FEServer fes",
+	"gw.transportAdd FEServer fes",
-	// set the transport option (need PeerInvisible and Firewalled)
+	// set the transport option (need PeerInvisible and Firewalled)
-	"gw.transportOptions fes(PeerInvisible Firewalled)",
+	"gw.transportOptions fes(PeerInvisible Firewalled)",
-	// open the transport
+	// open the transport
-	"gw.transportCmd fes(open)",
+	"gw.transportCmd fes(open)",
-};
+};
-
+
-
+
-// UDP port for client communication
+// UDP port for client communication
-//FrontendPort = 47851;
+//FrontendPort = 47851;
-
+
-ListenAddress = FSListenHost+":"+FSUDPPort;
+ListenAddress = FSListenHost+":"+FSUDPPort;
-
+
-// Maximum size that can be read from a client message
+// Maximum size that can be read from a client message
-DatagramLength = 10000;
+DatagramLength = 10000;
-
+
-// Time-out before removing a client when it does not send any more data
+// Time-out before removing a client when it does not send any more data
-ClientTimeOut = 600000; // 10 min
+ClientTimeOut = 600000; // 10 min
-
+
-// Time-out before removing a limbo client when it does not send any more data
+// Time-out before removing a limbo client when it does not send any more data
-LimboTimeOut = 60000; // 1 min
+LimboTimeOut = 60000; // 1 min
-
+
-// Maximum bytes per game cycle sent to all clients (currently not used/implemented)
+// Maximum bytes per game cycle sent to all clients (currently not used/implemented)
-TotalBandwidth = 536870911; // <512 MB : max value for 32 bit bitsize !
+TotalBandwidth = 536870911; // <512 MB : max value for 32 bit bitsize !
-
+
-// Maximum bytes per game cycle sent to a client, including all headers
+// Maximum bytes per game cycle sent to a client, including all headers
-ClientBandwidth = 332 * BandwidthRatio; // 332 <=> 13 kbit/s at 5 Hz; 202 <=> 16 kbit/s at 10 Hz
+ClientBandwidth = 332 * BandwidthRatio; // 332 <=> 13 kbit/s at 5 Hz; 202 <=> 16 kbit/s at 10 Hz
-
+
-// Maximum bytes for impulsion channels per datagram sent to a client
+// Maximum bytes for impulsion channels per datagram sent to a client
-ImpulsionByteSize0 = 20 * BandwidthRatio;
+ImpulsionByteSize0 = 20 * BandwidthRatio;
-ImpulsionByteSize1 = 200 * BandwidthRatio;
+ImpulsionByteSize1 = 200 * BandwidthRatio;
-ImpulsionByteSize2 = 200 * BandwidthRatio;
+ImpulsionByteSize2 = 200 * BandwidthRatio;
-NbMinimalVisualBytes = 50;
+NbMinimalVisualBytes = 50;
-
+
-// Distance/delta ratio that triggers the sending of a position
+// Distance/delta ratio that triggers the sending of a position
-DistanceDeltaRatioForPos = 100;
+DistanceDeltaRatioForPos = 100;
-
+
-// Number of game cycles per front-end cycle
+// Number of game cycles per front-end cycle
-GameCycleRatio = 1;
+GameCycleRatio = 1;
-// Execution period of distance calculation
+// Execution period of distance calculation
-CalcDistanceExecutionPeriod = 8;
+CalcDistanceExecutionPeriod = 8;
-// Execution period of position prioritization
+// Execution period of position prioritization
-PositionPrioExecutionPeriod = 2;
+PositionPrioExecutionPeriod = 2;
-// Execution period of orientation prioritization
+// Execution period of orientation prioritization
-OrientationPrioExecutionPeriod = 8;
+OrientationPrioExecutionPeriod = 8;
-// Execution period of discreet properties prioritization
+// Execution period of discreet properties prioritization
-DiscreetPrioExecutionPeriod = 2;
+DiscreetPrioExecutionPeriod = 2;
-
+
-SortPrioExecutionPeriod = 1;
+SortPrioExecutionPeriod = 1;
-
+
-// Display or not the "FE" nlinfos
+// Display or not the "FE" nlinfos
-DisplayInfo = 1;
+DisplayInfo = 1;
-
+
-// Prioritizer mode (currently the only mode is 1 for DistanceDelta)
+// Prioritizer mode (currently the only mode is 1 for DistanceDelta)
-PriorityMode = 1;
+PriorityMode = 1;
-
+
-// Strategy for selecting pairs to prioritize (Power2WithCeiling=0, Scoring=1)
+// Strategy for selecting pairs to prioritize (Power2WithCeiling=0, Scoring=1)
-SelectionStrategy = 1;
+SelectionStrategy = 1;
-
+
-// Minimum number of pairs to select for prioritization
+// Minimum number of pairs to select for prioritization
-MinNbPairsToSelect = 2000;
+MinNbPairsToSelect = 2000;
-
+
-// Index of client to monitor, or 0 for no monitoring
+// Index of client to monitor, or 0 for no monitoring
-ClientMonitor = 0;
+ClientMonitor = 0;
-
+
-// Allow or not beeping
+// Allow or not beeping
-AllowBeep = 1;
+AllowBeep = 1;
-
+
-Lag = 0;				// The lag on the simulated network (used by simlag)
+Lag = 0;				// The lag on the simulated network (used by simlag)
-PacketLoss = 0;				// percentage of lost packet (used by simlag)
+PacketLoss = 0;				// percentage of lost packet (used by simlag)
-PacketDuplication = 0;			// percentage of duplicated packet (used by simlag)
+PacketDuplication = 0;			// percentage of duplicated packet (used by simlag)
-PacketDisordering = 0;			// percentage of disordered packet (used by simlag) (Lag must be >100 to use disordering)
+PacketDisordering = 0;			// percentage of disordered packet (used by simlag) (Lag must be >100 to use disordering)
-
+
-// ----------------------------------------
+// ----------------------------------------
-// Frontend/Patch mode settings
+// Frontend/Patch mode settings
-
+
-// If 1, the frontend server is used in Patch/Frontend mode (0 = only frontend mode, old behaviour)
+// If 1, the frontend server is used in Patch/Frontend mode (0 = only frontend mode, old behaviour)
-UseWebPatchServer = 1;
+UseWebPatchServer = 1;
-
+
-// If 0, the frontend service is in Patch mode at startup, and it won't accept clients unless WS tells it to do so.
+// If 0, the frontend service is in Patch mode at startup, and it won't accept clients unless WS tells it to do so.
-AcceptClientsAtStartup = 1;
+AcceptClientsAtStartup = 1;
-
+
-// Patch URL footer. PatchURL will look like 'http://223.254.124.23:43435/patch'
+// Patch URL footer. PatchURL will look like 'http://223.254.124.23:43435/patch'
-PatchingURLFooter = ":43435/patch";
+PatchingURLFooter = ":43435/patch";
-
+
-// System command to be executed when FS tries to start Web Patch server (ideally at FS startup)
+// System command to be executed when FS tries to start Web Patch server (ideally at FS startup)
-StartWebServerSysCommand = "";
+StartWebServerSysCommand = "";
-
+
-// System command to be executed when FS tries to stop Web Patch server (ideally when FS turns to frontend mode)
+// System command to be executed when FS tries to stop Web Patch server (ideally when FS turns to frontend mode)
-StopWebServerSysCommand = "";
+StopWebServerSysCommand = "";
-
+
-// Use Thread for sending
+// Use Thread for sending
-UseSendThread = 1;
+UseSendThread = 1;
-
+
-// Unidirectional Mirror mode (FS part)
+// Unidirectional Mirror mode (FS part)
-ExpediteTOCK = 1;
+ExpediteTOCK = 1;

code/ryzom/server/gpm_service_default.cfg

@@ -1,7 +1,7 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-CheckPlayerSpeed = 0;
+CheckPlayerSpeed = 0;
-SecuritySpeedFactor = 1.5;
+SecuritySpeedFactor = 1.5;
-
+
-LoadPacsPrims = 0;
+LoadPacsPrims = 0;
-LoadPacsCol = 1;
+LoadPacsCol = 1;

code/ryzom/server/input_output_service_default.cfg

@@ -1,95 +1,95 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-// ---- service NeL variables (used by ConfigFile class)
+// ---- service NeL variables (used by ConfigFile class)
-
+
-StartCommands +=
+StartCommands +=
-{
+{
-	// L5 connect to the shard unifier
+	// L5 connect to the shard unifier
-	"unifiedNetwork.addService ShardUnifier ( address="+SUAddress+" sendId external autoRetry )",
+	"unifiedNetwork.addService ShardUnifier ( address="+SUAddress+" sendId external autoRetry )",
-
+
-	// Create a gateway for global interconnection
+	// Create a gateway for global interconnection
-	// modules from different shard are visible to each other if they connect to
+	// modules from different shard are visible to each other if they connect to
-	// this gateway. SU Local module have no interest to be plugged here.
+	// this gateway. SU Local module have no interest to be plugged here.
-	"moduleManager.createModule StandardGateway glob_gw",
+	"moduleManager.createModule StandardGateway glob_gw",
-	// add a layer 3 server transport
+	// add a layer 3 server transport
-	"glob_gw.transportAdd L3Client l3c",
+	"glob_gw.transportAdd L3Client l3c",
-	// open the transport
+	// open the transport
-	"glob_gw.transportCmd l3c(connect addr="+SUHost+":"+SUGlobalPort+")",
+	"glob_gw.transportCmd l3c(connect addr="+SUHost+":"+SUGlobalPort+")",
-
+
-	// Create a gateway for logger service connection
+	// Create a gateway for logger service connection
-	"moduleManager.createModule StandardGateway lgs_gw",
+	"moduleManager.createModule StandardGateway lgs_gw",
-
+
-	// add a layer 3 server transport for master logger service
+	// add a layer 3 server transport for master logger service
-	"lgs_gw.transportAdd L3Client masterL3c",
+	"lgs_gw.transportAdd L3Client masterL3c",
-	// open the transport
+	// open the transport
-	"lgs_gw.transportCmd masterL3c(connect addr="+MasterLGSHost+":"+L3MasterLGSPort+")",
+	"lgs_gw.transportCmd masterL3c(connect addr="+MasterLGSHost+":"+L3MasterLGSPort+")",
-};
+};
-
+
-#ifndef DONT_USE_LGS_SLAVE
+#ifndef DONT_USE_LGS_SLAVE
-
+
-StartCommands +=
+StartCommands +=
-{
+{
-	// add a layer 3 server transport for slave logger service
+	// add a layer 3 server transport for slave logger service
-	"lgs_gw.transportAdd L3Client slaveL3c",
+	"lgs_gw.transportAdd L3Client slaveL3c",
-	// open the transport
+	// open the transport
-	"lgs_gw.transportCmd slaveL3c(connect addr="+SlaveLGSHost+":"+L3SlaveLGSPort+")",
+	"lgs_gw.transportCmd slaveL3c(connect addr="+SlaveLGSHost+":"+L3SlaveLGSPort+")",
-};
+};
-
+
-#endif
+#endif
-
+
-StartCommands +=
+StartCommands +=
-{
+{
-	// Create a chat unifier client
+	// Create a chat unifier client
-	"moduleManager.createModule ChatUnifierClient cuc",
+	"moduleManager.createModule ChatUnifierClient cuc",
-
+
-	// and plug it on the gateway to reach the SU ChatUnifierServer
+	// and plug it on the gateway to reach the SU ChatUnifierServer
-	"cuc.plug glob_gw",
+	"cuc.plug glob_gw",
-	"cuc.plug gw",
+	"cuc.plug gw",
-
+
-	// Create the logger service client module
+	// Create the logger service client module
-	"moduleManager.createModule LoggerServiceClient lsc",
+	"moduleManager.createModule LoggerServiceClient lsc",
-	"lsc.plug lgs_gw",
+	"lsc.plug lgs_gw",
-};
+};
-
+
-#endif
+#endif
-
+
-// ---- service NeL variables (used by CVariable class)
+// ---- service NeL variables (used by CVariable class)
-
+
-// ---- service custom variables (used by ConfigFile class)
+// ---- service custom variables (used by ConfigFile class)
-
+
-// a list of system command that can be run with "sysCmd" service command.
+// a list of system command that can be run with "sysCmd" service command.
-SystemCmd	= {};
+SystemCmd	= {};
-
+
-// IOS don't use work directory by default
+// IOS don't use work directory by default
-ReadTranslationWork = 0;
+ReadTranslationWork = 0;
-TranslationWorkPath = "translation/work";
+TranslationWorkPath = "translation/work";
-
+
-// Global shard bot name translation file. You sould overide this
+// Global shard bot name translation file. You sould overide this
-// in input_output_service.cfg to specialize the file
+// in input_output_service.cfg to specialize the file
-// depending on the shard main language.
+// depending on the shard main language.
-BotNameTranslationFile = "bot_names.txt";
+BotNameTranslationFile = "bot_names.txt";
-
+
-// Global shard event faction translation file. You sould override this
+// Global shard event faction translation file. You sould override this
-// in input_output_service.cfg to specialize the file
+// in input_output_service.cfg to specialize the file
-// depending on the shard main language.
+// depending on the shard main language.
-EventFactionTranslationFile = "event_factions.txt";
+EventFactionTranslationFile = "event_factions.txt";
-
+
-
+
-// ---- service custom variables (used by CVariable class)
+// ---- service custom variables (used by CVariable class)
-
+
-// Activate/deactivate debugging of missing paremeter replacement
+// Activate/deactivate debugging of missing paremeter replacement
-DebugReplacementParameter = 1;
+DebugReplacementParameter = 1;
-
+
-// Default verbose debug flags:
+// Default verbose debug flags:
-//-----------------------------
+//-----------------------------
-
+
-// Log bot name translation from 'BotNameTranslationFile'
+// Log bot name translation from 'BotNameTranslationFile'
-VerboseNameTranslation = 1;
+VerboseNameTranslation = 1;
-// Log chat management operation
+// Log chat management operation
-VerboseChatManagement = 1;
+VerboseChatManagement = 1;
-// Log chat event
+// Log chat event
-VerboseChat = 1;
+VerboseChat = 1;
-// Log string manager message
+// Log string manager message
-VerboseStringManager = 1;
+VerboseStringManager = 1;
-// Log the string manager parsing message
+// Log the string manager parsing message
-VerboseStringManagerParser = 0;
+VerboseStringManagerParser = 0;

code/ryzom/server/mail_forum_service_default.cfg

@@ -1,29 +1,29 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-// ---- service NeL variables (used by ConfigFile class)
+// ---- service NeL variables (used by ConfigFile class)
-
+
-DontUseNS = 1;
+DontUseNS = 1;
-
+
-// ---- service NeL variables (used by CVariable class)
+// ---- service NeL variables (used by CVariable class)
-
+
-// ---- service custom variables (used by ConfigFile class)
+// ---- service custom variables (used by ConfigFile class)
-
+
-
+
-// ---- service custom variables (used by CVariable class)
+// ---- service custom variables (used by CVariable class)
-
+
-WebRootDirectory = "save_shard/www";
+WebRootDirectory = "save_shard/www";
-
+
-// Set if Hall of Fame generator is enabled
+// Set if Hall of Fame generator is enabled
-HoFEnableGenerator = 1;
+HoFEnableGenerator = 1;
-
+
-// Set if HoF generator is verbose
+// Set if HoF generator is verbose
-HoFVerbose = 0;
+HoFVerbose = 0;
-
+
-// Directory where HDT files are
+// Directory where HDT files are
-HoFHDTDirectory = "/local/www/hof/hdt";
+HoFHDTDirectory = "/local/www/hof/hdt";
-
+
-// HoF generator maximum update period in milliseconds
+// HoF generator maximum update period in milliseconds
-HoFGeneratorUpdatePeriod = 200;
+HoFGeneratorUpdatePeriod = 200;
-
+
-// HoF generator directory update period in seconds
+// HoF generator directory update period in seconds
-HoFGeneratorDirUpdatePeriod = 60;
+HoFGeneratorDirUpdatePeriod = 60;

code/ryzom/server/mirror_service_default.cfg

@@ -1,6 +1,6 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-// ---- service custom variables (used by ConfigFile class)
+// ---- service custom variables (used by ConfigFile class)
-
+
-// Linux only
+// Linux only
-DestroyGhostSegments = 1;
+DestroyGhostSegments = 1;

code/ryzom/server/naming_service_default.cfg

@@ -1,7 +1,7 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-SId = 1;
+SId = 1;
-DontUseNS = 1;
+DontUseNS = 1;
-
+
-UniqueOnShardServices = {}; // { "EGS", "GPMS", "IOS", "TICKS", "WS", "AIS", "DSS" };
+UniqueOnShardServices = {}; // { "EGS", "GPMS", "IOS", "TICKS", "WS", "AIS", "DSS" };
-UniqueByMachineServices = {}; // { "MS" };
+UniqueByMachineServices = {}; // { "MS" };

code/ryzom/server/session_browser_server.cfg

@@ -37,7 +37,7 @@ DontUseSU = 0;
 
 HomeMainlandNames =
 {
-"302", 	"Open",	"open",
+	"302", 	"Open",	"open",
 };
 
 // The max number of ring points (aka ring access) for each ecosystem

code/ryzom/server/session_browser_server_default.cfg

@@ -1 +1 @@
-#include "common.cfg"
+#include "common.cfg"

code/ryzom/server/shard_unifier_service_default.cfg

@@ -1,33 +1,33 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-DontUseNS = 1;
+DontUseNS = 1;
-
+
-StartCommands +=
+StartCommands +=
-{
+{
-    // Create a gateway for global interconnection
+    // Create a gateway for global interconnection
-    // modules from different shard are visible to each other if they connect to
+    // modules from different shard are visible to each other if they connect to
-    // this gateway. SU Local module have no interest to be plugged here.
+    // this gateway. SU Local module have no interest to be plugged here.
-    "moduleManager.createModule StandardGateway glob_gw",
+    "moduleManager.createModule StandardGateway glob_gw",
-    // add a layer 3 server transport
+    // add a layer 3 server transport
-    "glob_gw.transportAdd L3Server l3s",
+    "glob_gw.transportAdd L3Server l3s",
-    // open the transport
+    // open the transport
-    "glob_gw.transportCmd l3s(open port="+SUGlobalPort+")",
+    "glob_gw.transportCmd l3s(open port="+SUGlobalPort+")",
-    // Create a session manager module
+    // Create a session manager module
-    "moduleManager.createModule RingSessionManager rsm web(port=49999) ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+") nel_db(host="+DBHost+" user="+DBNelUser+" password="+DBNelPass+" base="+DBNelName+")",
+    "moduleManager.createModule RingSessionManager rsm web(port=49999) ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+") nel_db(host="+DBHost+" user="+DBNelUser+" password="+DBNelPass+" base="+DBNelName+")",
-    "rsm.plug gw",
+    "rsm.plug gw",
-    // Create a login service module
+    // Create a login service module
-    "moduleManager.createModule LoginService ls ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+") web(port=49998) nel_db(host="+DBHost+" user="+DBNelUser+" password="+DBNelPass+" base="+DBNelName+")",
+    "moduleManager.createModule LoginService ls ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+") web(port=49998) nel_db(host="+DBHost+" user="+DBNelUser+" password="+DBNelPass+" base="+DBNelName+")",
-    "ls.plug gw",
+    "ls.plug gw",
-    // Create a character synchronization module
+    // Create a character synchronization module
-    "moduleManager.createModule CharacterSynchronisation cs fake_edit_char ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+")",
+    "moduleManager.createModule CharacterSynchronisation cs fake_edit_char ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+")",
-    "cs.plug gw",
+    "cs.plug gw",
-    // Create entity locator module
+    // Create entity locator module
-    "moduleManager.createModule EntityLocator el ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+") nel_db(host="+DBHost+" user="+DBNelUser+" password="+DBNelPass+" base="+DBNelName+")",
+    "moduleManager.createModule EntityLocator el ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+") nel_db(host="+DBHost+" user="+DBNelUser+" password="+DBNelPass+" base="+DBNelName+")",
-    "el.plug gw",
+    "el.plug gw",
-    // Create a mail forum notifier forwarder
+    // Create a mail forum notifier forwarder
-    "moduleManager.createModule MailForumNotifierFwd mfnfwd ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+") web(port=49897)",
+    "moduleManager.createModule MailForumNotifierFwd mfnfwd ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+") web(port=49897)",
-    "mfnfwd.plug gw",
+    "mfnfwd.plug gw",
-    // Create a chat unifier server module
+    // Create a chat unifier server module
-    "moduleManager.createModule ChatUnifierServer cus ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+")",
+    "moduleManager.createModule ChatUnifierServer cus ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+")",
-    "cus.plug gw",
+    "cus.plug gw",
-};
+};

code/ryzom/server/src/ai_share/CMakeLists.txt

@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 NL_TARGET_LIB(ryzom_aishare ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ryzom_aishare
 						ryzom_gameshare
 						ryzom_servershare
@@ -16,8 +14,6 @@ NL_DEFAULT_PROPS(ryzom_aishare "Ryzom, Library: AI Shared")
 NL_ADD_RUNTIME_FLAGS(ryzom_aishare)
 NL_ADD_LIB_SUFFIX(ryzom_aishare)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_aishare ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)

code/ryzom/server/src/entities_game_service/CMakeLists.txt

@@ -89,7 +89,7 @@ ADD_EXECUTABLE(ryzom_entities_game_service WIN32
 	${SRC_STABLES}
 	${SRC_TEAM_MANAGER})
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_entities_game_service
 						ryzom_adminmodules
@@ -98,9 +98,6 @@ TARGET_LINK_LIBRARIES(ryzom_entities_game_service
 						ryzom_aishare
 						ryzom_pd
 						ryzom_gameplaymodule
-						${LIBXML2_LIBRARIES}
-						${MYSQL_LIBRARIES}
-						${ZLIB_LIBRARIES}
 						nelmisc
 						nelnet
 						nelgeorges

code/ryzom/server/src/gpm_service/stdpch.h

@@ -18,7 +18,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <libxml/parser.h>
 #include <math.h>
 #include <stddef.h>
 #include <stdio.h>

code/ryzom/server/src/shard_unifier_service/CMakeLists.txt

@@ -2,16 +2,13 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_shard_unifier_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_shard_unifier_service
 						ryzom_adminmodules
 						ryzom_gameshare
 						ryzom_servershare
-						${LIBXML2_LIBRARIES} 
+						nelmisc
-						${MYSQL_LIBRARIES}
-						${ZLIB_LIBRARY}
-						nelmisc 
 						nelnet
 						nelgeorges)
 

code/ryzom/server/src/tick_service/CMakeLists.txt

@@ -2,11 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_tick_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+
 TARGET_LINK_LIBRARIES(ryzom_tick_service
 						ryzom_adminmodules
 						ryzom_gameshare
-						${LIBXML2_LIBRARIES}
 						nelmisc
 						nelnet
 						nelgeorges)

code/ryzom/server/tick_service_default.cfg

@@ -1,8 +1,8 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-/// A list of vars to graph for TS
+/// A list of vars to graph for TS
-GraphVars +=
+GraphVars +=
-{
+{
-	"TotalSpeedLoop", 	"60000",	// low rez, every minutes
+	"TotalSpeedLoop", 	"60000",	// low rez, every minutes
-	"TotalSpeedLoop", 	"0",		// high rez, every tick
+	"TotalSpeedLoop", 	"0",		// high rez, every tick
-};
+};

code/ryzom/server/welcome_service_default.cfg

@@ -1,38 +1,38 @@
-#include "common.cfg"
+#include "common.cfg"
-
+
-// short name of the frontend service
+// short name of the frontend service
-FrontendServiceName = "FS";
+FrontendServiceName = "FS";
-
+
-// in ring architecture, we no more use the legacy LS
+// in ring architecture, we no more use the legacy LS
-DontUseLS = 1;
+DontUseLS = 1;
-
+
-// if any of this services is not connected, the WS is closed.
+// if any of this services is not connected, the WS is closed.
-ExpectedServices = { "FS", "MS", "EGS", "GPMS", "IOS", "TICKS" };
+ExpectedServices = { "FS", "MS", "EGS", "GPMS", "IOS", "TICKS" };
-
+
-// Access level to shard
+// Access level to shard
-// 0: only dev
+// 0: only dev
-// 1: dev + privileged users (see also OpenGroups variable)
+// 1: dev + privileged users (see also OpenGroups variable)
-// 2: open for all
+// 2: open for all
-ShardOpen = 2;
+ShardOpen = 2;
-
+
-// File that contains the ShardOpen value (used to override ShardOpen value through AES' command createFile)
+// File that contains the ShardOpen value (used to override ShardOpen value through AES' command createFile)
-// For instance, ShardOpen default value is 0, then AES creates a file to set ShardOpen to 2. If WS crashes,
+// For instance, ShardOpen default value is 0, then AES creates a file to set ShardOpen to 2. If WS crashes,
-// ShardOpen is still set to 2 when it relaunches...
+// ShardOpen is still set to 2 when it relaunches...
-// ShardOpenStateFile = "/tmp/shard_open_state";
+// ShardOpenStateFile = "/tmp/shard_open_state";
-
+
-// Privileged Groups
+// Privileged Groups
-OpenGroups = ":GM:SGM:G:SG:GUEST:";
+OpenGroups = ":GM:SGM:G:SG:GUEST:";
-
+
-UsePatchMode = 0;
+UsePatchMode = 0;
-
+
-// create welcome service module
+// create welcome service module
-StartCommands +=
+StartCommands +=
-{
+{
-	// create the service
+	// create the service
-	"moduleManager.createModule WelcomeService ws",
+	"moduleManager.createModule WelcomeService ws",
-	// plug it in the gateway
+	// plug it in the gateway
-	"ws.plug gw",
+	"ws.plug gw",
-
+
-	// add the SU service
+	// add the SU service
-	"unifiedNetwork.addService ShardUnifier ( address="+SUAddress+" sendId external autoRetry )",
+	"unifiedNetwork.addService ShardUnifier ( address="+SUAddress+" sendId external autoRetry )",
-};
+};

code/ryzom/tools/assoc_mem/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(assoc_mem ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(assoc_mem nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(assoc_mem "Ryzom, Tools, Misc: assoc_mem")
 NL_ADD_RUNTIME_FLAGS(assoc_mem)

code/ryzom/tools/client/client_patcher/CMakeLists.txt

@@ -15,9 +15,7 @@ ADD_DEFINITIONS(-DRZ_USE_CUSTOM_PATCH_SERVER)
 ADD_EXECUTABLE(ryzom_client_patcher ${SRC})
 
 INCLUDE_DIRECTORIES(
-			${LIBXML2_INCLUDE_DIR}
 			${CURL_INCLUDE_DIRS}
-			${ZLIB_INCLUDE_DIR}
 			${CMAKE_SOURCE_DIR}/ryzom/client/src
 )
 
@@ -26,7 +24,6 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
 				nelnet
 				ryzom_gameshare
 				ryzom_sevenzip
-				${ZLIB_LIBRARIES}
 				${CURL_LIBRARIES})
 
 IF(APPLE)
@@ -34,7 +31,7 @@ IF(APPLE)
   TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY})
 ENDIF(APPLE)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
+ADD_DEFINITIONS(${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
 
 NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher")
 NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher)

code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt

@@ -2,14 +2,13 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(r2_islands_textures ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR})
+
 TARGET_LINK_LIBRARIES(r2_islands_textures
 					ryzom_gameshare
 					ryzom_aishare
-					${LIBXML2_LIBRARIES} 
 					nelmisc
 					nel3d)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(r2_islands_textures "Ryzom, Tools, Server: R2 Islands Textures")
 NL_ADD_RUNTIME_FLAGS(r2_islands_textures)

code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(alias_synchronizer ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(alias_synchronizer nelmisc nelligo)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(alias_synchronizer "Ryzom, Tools, Misc: Alias Synchronizer")
 NL_ADD_RUNTIME_FLAGS(alias_synchronizer)

code/ryzom/tools/leveldesign/export/CMakeLists.txt

@@ -3,15 +3,11 @@ FILE(GLOB PRIV_H *.h)
 
 NL_TARGET_LIB(ryzom_export ${PRIV_H} ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs)
 NL_DEFAULT_PROPS(ryzom_export "Ryzom, Library, World: Export Tools")
 NL_ADD_RUNTIME_FLAGS(ryzom_export)
 NL_ADD_LIB_SUFFIX(ryzom_export)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_export LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
 ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)

code/ryzom/tools/leveldesign/mp_generator/CMakeLists.txt

@@ -2,15 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(mp_generator ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(mp_generator nelmisc)
-
-TARGET_LINK_LIBRARIES(mp_generator
-						${LIBXML2_LIBRARIES}
-						nelmisc)
 
 NL_DEFAULT_PROPS(mp_generator "Ryzom, Tools: MP Generator")
 NL_ADD_RUNTIME_FLAGS(mp_generator)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS mp_generator RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt

@@ -2,15 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(named2csv ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(named2csv nelmisc)
-
-TARGET_LINK_LIBRARIES(named2csv
-						${LIBXML2_LIBRARIES}
-						nelmisc)
 
 NL_DEFAULT_PROPS(named2csv "Ryzom, Tools: Named Items to CSV")
 NL_ADD_RUNTIME_FLAGS(named2csv)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS named2csv RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt

@@ -2,14 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(prim_export ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(prim_export	
 					nelmisc
 					nelligo
 					nel3d
-					nelgeorges
+					nelgeorges)
-					${LIBXML2_LIBRARIES})
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(prim_export "Ryzom, Tools, World: Primitive Export")
 NL_ADD_RUNTIME_FLAGS(prim_export)

code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(uni_conv ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(uni_conv nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(uni_conv "Ryzom, Tools, Misc: Unicode Conversion Tool")
 NL_ADD_RUNTIME_FLAGS(uni_conv)

code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(land_export ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(land_export nelmisc nelligo ryzom_landexport)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(land_export "Ryzom, Tools, World: Land Export")
 NL_ADD_RUNTIME_FLAGS(land_export)

code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt

@@ -3,15 +3,11 @@ FILE(GLOB PRIV_H *.h)
 
 NL_TARGET_LIB(ryzom_landexport ${PRIV_H} ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ryzom_landexport ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs)
 NL_DEFAULT_PROPS(ryzom_landexport "Ryzom, Library, World: Land Export")
 NL_ADD_RUNTIME_FLAGS(ryzom_landexport)
 NL_ADD_LIB_SUFFIX(ryzom_landexport)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_landexport LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
 ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)

code/ryzom/tools/make_alias_file/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(make_alias_file ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_alias_file nelmisc nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(make_alias_file "Ryzom, Tools, Misc: Make Alias File")
 NL_ADD_RUNTIME_FLAGS(make_alias_file)

code/ryzom/tools/make_anim_by_race/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(make_anim_by_race ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_anim_by_race nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(make_anim_by_race "Ryzom, Tools, Misc: Make Anim By Race")
 NL_ADD_RUNTIME_FLAGS(make_anim_by_race)

code/ryzom/tools/patch_gen/CMakeLists.txt

@@ -1,8 +1,6 @@
 SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h)
 SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
 TARGET_LINK_LIBRARIES(patch_gen ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
 NL_DEFAULT_PROPS(patch_gen "Ryzom, Tools: Patch Generator")
@@ -13,7 +11,5 @@ TARGET_LINK_LIBRARIES(patch_gen_service ryzom_gameshare nelmisc nelnet nelligo n
 NL_DEFAULT_PROPS(patch_gen_service "Ryzom, Tools: Patch Generator Service")
 NL_ADD_RUNTIME_FLAGS(patch_gen_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS patch_gen RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)
 INSTALL(TARGETS patch_gen_service RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/pd_parser/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(pd_parser ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(pd_parser nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(pd_parser "Ryzom, Tools: PD Parser")
 NL_ADD_RUNTIME_FLAGS(pd_parser)

code/ryzom/tools/pdr_util/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(pdr_util ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(pdr_util ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(pdr_util "Ryzom, Tools: PDR Utility")
 NL_ADD_RUNTIME_FLAGS(pdr_util)

code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt

@@ -2,17 +2,14 @@ FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SE
 
 ADD_EXECUTABLE(ai_build_wmap ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR})
-TARGET_LINK_LIBRARIES(ai_build_wmap	
+
+TARGET_LINK_LIBRARIES(ai_build_wmap
 					ryzom_gameshare
 					ryzom_aishare
-					${LIBXML2_LIBRARIES} 
 					nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(ai_build_wmap "Ryzom, Tools, Server: AI Build World Map")
 NL_ADD_RUNTIME_FLAGS(ai_build_wmap)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ai_build_wmap RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/sheets_packer/CMakeLists.txt

@@ -7,14 +7,14 @@ ADD_EXECUTABLE(sheets_packer	${SRC}
 				${CMAKE_SOURCE_DIR}/ryzom/client/src/sheet_manager.h)
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/ryzom/client/src)
+
 TARGET_LINK_LIBRARIES(sheets_packer	
 					ryzom_clientsheets
 					ryzom_gameshare
 					nelmisc
 					nelgeorges
 					nelnet
-					nelligo
+					nelligo)
-					${LIBXML2_LIBRARIES})
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 

code/ryzom/tools/sheets_packer_shard/CMakeLists.txt

@@ -13,7 +13,8 @@ ADD_EXECUTABLE(sheets_packer_shard	${SRC} ${EGSSHEETS}
 				${CMAKE_SOURCE_DIR}/ryzom/server/src/ai_service/commands_mlf.cpp)
 
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/ryzom/common/src ${CMAKE_SOURCE_DIR}/ryzom/server/src ${CMAKE_SOURCE_DIR}/ryzom/tools/sheets_packer_shard ${CMAKE_SOURCE_DIR}/ryzom/server/src/entities_game_service)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ryzom/common/src ${CMAKE_SOURCE_DIR}/ryzom/server/src ${CMAKE_SOURCE_DIR}/ryzom/tools/sheets_packer_shard ${CMAKE_SOURCE_DIR}/ryzom/server/src/entities_game_service)
+
 TARGET_LINK_LIBRARIES(sheets_packer_shard
 					ryzom_gameshare
 					ryzom_servershare
@@ -21,10 +22,7 @@ TARGET_LINK_LIBRARIES(sheets_packer_shard
 					nelmisc
 					nelgeorges
 					nelnet
-					nelligo
+					nelligo)
-					${LIBXML2_LIBRARIES})
-
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(sheets_packer_shard "Ryzom, Tools: Sheets Packer Shard")
 NL_ADD_RUNTIME_FLAGS(sheets_packer_shard)

code/ryzom/tools/skill_extractor/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(skill_extractor ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(skill_extractor nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(skill_extractor "Ryzom, Tools, Misc: Skill Extractor")
 NL_ADD_RUNTIME_FLAGS(skill_extractor)

code/ryzom/tools/stats_scan/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(stats_scan WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(stats_scan ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(stats_scan "Ryzom, Tools, Misc: Stats Scan")
 NL_ADD_RUNTIME_FLAGS(stats_scan)

code/ryzom/tools/translation_tools/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(translation_tools ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(translation_tools nelmisc nelligo nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(translation_tools "Ryzom, Tools, Misc: Translation Tools")
 NL_ADD_RUNTIME_FLAGS(translation_tools)