.gitattributes

@@ -1,18 +0,0 @@
-*.cpp ident
-*.h ident
-
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.c text
-*.h text
-*.cs text
-*.jade text
-*.json text
-*.js text
-*.css text
-*.htm text
-*.txt text
-*.sh text eol=lf

.gitignore

@@ -267,7 +267,6 @@ web/public_php/db_version_tool
 web/public_php/db_version_web
 web/public_php/role_service
 web/public_php/role_support
-web/public_php/role_admin
 web/public_php/role_domain
 web/public_php/db_version_ring
 web/public_php/config_user.php

CMakeLists.txt

@@ -79,8 +79,8 @@ ENDIF()
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(RyzomCore CXX C)
-SET(NL_VERSION_MAJOR 4)
-SET(NL_VERSION_MINOR 0)
+SET(NL_VERSION_MAJOR 1)
+SET(NL_VERSION_MINOR 1)
 SET(NL_VERSION_PATCH 0 CACHE STRING "Patch version")
 SET(YEAR "2001-${CURRENT_YEAR}")
 SET(AUTHOR "Winch Gate and The Ryzom Core Community")
@@ -124,14 +124,14 @@ RYZOM_SETUP_PREFIX_PATHS()
 
 #-----------------------------------------------------------------------------
 # Default values for URL's
-SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL     "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Create Account URL")
-SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL       "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Edit Account URL")
-SET(RYZOM_CLIENT_FORGET_PASSWORD_URL    "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Forget Password URL")
-SET(RYZOM_CLIENT_PATCH_URL              "https://cdn.ryzom.dev/core4/patch/" CACHE STRING "Ryzom Client Patch URL")
-SET(RYZOM_CLIENT_APP_NAME               "core4")
+SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL  "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Create Account URL")
+SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL    "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Edit Account URL")
+SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Forget Password URL")
+SET(RYZOM_CLIENT_PATCH_URL           "https://cdn.ryzom.dev/open/patch/" CACHE STRING "Ryzom Client Patch URL")
+SET(RYZOM_CLIENT_APP_NAME            "default")
 
-SET(RYZOM_CLIENT_RELEASENOTES_URL       "https://core4.ryzom.dev/releasenotes/index.php" CACHE STRING "Ryzom Client Release Notes URL")
-SET(RYZOM_CLIENT_RELEASENOTES_RING_URL  "https://core4.ryzom.dev/releasenotes_ring/index.php" CACHE STRING "Ryzom Client Release Notes URL")
+SET(RYZOM_WEBIG_MAIN_URL             "https://open.ryzom.dev/" CACHE STRING "Ryzom Client WebIG Main URL")
+SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "open.ryzom.dev" CACHE STRING "Ryzom Client WebIG Trusted Domain")
 
 #-----------------------------------------------------------------------------
 # urls when compiling ryzom live client
@@ -145,9 +145,6 @@ IF(WITH_RYZOM_LIVE)
 
   SET(RYZOM_WEBIG_MAIN_URL             "https://app.ryzom.com/")
   SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "app.ryzom.com")
-
-  SET(RYZOM_CLIENT_RELEASENOTES_URL       "https://app.ryzom.com/releasenotes/index.php")
-  SET(RYZOM_CLIENT_RELEASENOTES_RING_URL  "https://app.ryzom.com/releasenotes_ring/index.php")
 ENDIF()
 
 #-----------------------------------------------------------------------------

CMakeModules/FindIconv.cmake

@@ -16,14 +16,7 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
 
 FIND_PATH(ICONV_INCLUDE_DIR iconv.h HINTS /sw/include/ PATHS /opt/local) 
  
-FIND_LIBRARY(ICONV_LIBRARIES_RELEASE NAMES iconv libiconv c PATHS /opt/local)
-FIND_LIBRARY(ICONV_LIBRARIES_DEBUG NAMES iconvd libiconvd c PATHS /opt/local)
-
-IF (ICONV_LIBRARIES_RELEASE AND ICONV_LIBRARIES_DEBUG)
-  SET(ICONV_LIBRARIES optimized ${ICONV_LIBRARIES_RELEASE} debug ${ICONV_LIBRARIES_DEBUG})
-ELSE()
-  SET(ICONV_LIBRARIES ${ICONV_LIBRARIES_RELEASE})
-ENDIF()
+FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c PATHS /opt/local)
  
 IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
    SET(ICONV_FOUND TRUE) 
@@ -67,6 +60,5 @@ ENDIF()
 MARK_AS_ADVANCED(
   ICONV_INCLUDE_DIR
   ICONV_LIBRARIES
-  ICONV_LIBRARIES_DEBUG
   ICONV_SECOND_ARGUMENT_IS_CONST
 )

CMakeModules/FindLua53.cmake

@@ -38,25 +38,11 @@ find_path(LUA_INCLUDE_DIR lua.h
   /opt
 )
 
-FIND_LIBRARY(LUA_LIBRARY
+find_library(LUA_LIBRARY
   NAMES lua53 lua5.3 lua-5.3 lua
   HINTS
-    $ENV{LUA_DIR}
-  PATH_SUFFIXES lib64 lib
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-
-FIND_LIBRARY(LUA_LIBRARY_DEBUG
-  NAMES lua53-d lua5.3-d lua-5.3-d lua-d lua53d lua5.3d lua-5.3d luad
-  HINTS
-    $ENV{LUA_DIR}
-  PATH_SUFFIXES lib64 lib
+    ENV LUA_DIR
+  PATH_SUFFIXES lib
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
@@ -73,11 +59,7 @@ if(LUA_LIBRARY)
     set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
   # For Windows and Mac, don't need to explicitly include the math library
   else()
-    if (LUA_LIBRARY_DEBUG)
-      set( LUA_LIBRARIES optimized ${LUA_LIBRARY} debug ${LUA_LIBRARY_DEBUG} CACHE STRING "Lua Libraries")
-    else()
-      set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
-    endif()
+    set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
   endif()
 endif()
 
@@ -95,5 +77,5 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua53
                                   REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
                                   VERSION_VAR LUA_VERSION_STRING)
 
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_LIBRARY_DEBUG LUA_MATH_LIBRARY)
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
 

CMakeModules/FindLua54.cmake

@@ -1,99 +0,0 @@
-# Locate Lua library
-# This module defines
-#  LUA54_FOUND, if false, do not try to link to Lua
-#  LUA_LIBRARIES
-#  LUA_INCLUDE_DIR, where to find lua.h
-#  LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
-#
-# Note that the expected include convention is
-#  #include "lua.h"
-# and not
-#  #include <lua/lua.h>
-# This is because, the lua location is not standardized and may exist
-# in locations other than lua/
-
-#=============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-find_path(LUA_INCLUDE_DIR lua.h
-  HINTS
-    ENV LUA_DIR
-  PATH_SUFFIXES include/lua54 include/lua5.4 include/lua-5.4 include/lua include
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt
-)
-
-FIND_LIBRARY(LUA_LIBRARY
-  NAMES lua54 lua5.4 lua-5.4 lua
-  HINTS
-    $ENV{LUA_DIR}
-  PATH_SUFFIXES lib64 lib
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-
-FIND_LIBRARY(LUA_LIBRARY_DEBUG
-  NAMES lua54-d lua5.4-d lua-5.4-d lua-d lua54d lua5.4d lua-5.4d luad
-  HINTS
-    $ENV{LUA_DIR}
-  PATH_SUFFIXES lib64 lib
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-
-if(LUA_LIBRARY)
-  # include the math library for Unix
-  if(UNIX AND NOT APPLE AND NOT BEOS)
-    find_library(LUA_MATH_LIBRARY m)
-    set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
-  # For Windows and Mac, don't need to explicitly include the math library
-  else()
-    if (LUA_LIBRARY_DEBUG)
-      set( LUA_LIBRARIES optimized ${LUA_LIBRARY} debug ${LUA_LIBRARY_DEBUG} CACHE STRING "Lua Libraries")
-    else()
-      set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
-    endif()
-  endif()
-endif()
-
-if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-  file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua .+\"")
-
-  string(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
-  unset(lua_version_str)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua54
-                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
-                                  VERSION_VAR LUA_VERSION_STRING)
-
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_LIBRARY_DEBUG LUA_MATH_LIBRARY)
-

CMakeModules/FindLuabind.cmake

@@ -10,32 +10,18 @@ MACRO(FIND_CORRECT_LUA_VERSION)
   IF(LUABIND_LIBRARY_RELEASE MATCHES "\\.so")
     INCLUDE(CheckDepends)
 
-    # check for Lua 5.4
-    SET(LUA54_LIBRARIES liblua5.4 liblua-5.4 liblua.so.5.4)
+    # check for Lua 5.3
+    SET(LUA53_LIBRARIES liblua5.3 liblua-5.3 liblua.so.5.3)
 
-    FOREACH(_LIB ${LUA54_LIBRARIES})
+    FOREACH(_LIB ${LUA53_LIBRARIES})
       CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE _LIB LUALIB_FOUND)
       IF(LUALIB_FOUND)
-        MESSAGE(STATUS "Luabind is using Lua 5.4")
-        FIND_PACKAGE(Lua54 REQUIRED)
+        MESSAGE(STATUS "Luabind is using Lua 5.3")
+        FIND_PACKAGE(Lua53 REQUIRED)
         BREAK()
       ENDIF()
     ENDFOREACH()
 
-    IF(NOT LUALIB_FOUND)
-      # check for Lua 5.3
-      SET(LUA53_LIBRARIES liblua5.3 liblua-5.3 liblua.so.5.3)
-
-      FOREACH(_LIB ${LUA53_LIBRARIES})
-        CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE _LIB LUALIB_FOUND)
-        IF(LUALIB_FOUND)
-          MESSAGE(STATUS "Luabind is using Lua 5.3")
-          FIND_PACKAGE(Lua53 REQUIRED)
-          BREAK()
-        ENDIF()
-      ENDFOREACH()
-    ENDIF()
-
     IF(NOT LUALIB_FOUND)
       # check for Lua 5.2
       SET(LUA52_LIBRARIES liblua5.2 liblua-5.2 liblua.so.5.2)

CMakeModules/nel.cmake

@@ -393,7 +393,6 @@ MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
   OPTION(WITH_LUA51               "Build Ryzom Core using Lua 5.1"                ON )
   OPTION(WITH_LUA52               "Build Ryzom Core using Lua 5.2"                OFF)
   OPTION(WITH_LUA53               "Build Ryzom Core using Lua 5.3"                OFF)
-  OPTION(WITH_LUA54               "Build Ryzom Core using Lua 5.4"                OFF)
   OPTION(WITH_RYZOM_CLIENT_UAC    "Ask to run as Administrator"                   OFF)
   OPTION(WITH_RYZOM_PATCH         "Enable Ryzom in-game patch support"            OFF)
   OPTION(WITH_RYZOM_CUSTOM_PATCH_SERVER "Only use patch server from CFG file"     OFF)

config.h.cmake

@@ -42,9 +42,6 @@
 #cmakedefine RYZOM_WEBIG_MAIN_URL "${RYZOM_WEBIG_MAIN_URL}"
 #cmakedefine RYZOM_WEBIG_TRUSTED_DOMAIN "${RYZOM_WEBIG_TRUSTED_DOMAIN}"
 
-#cmakedefine RYZOM_CLIENT_RELEASENOTES_RING_URL "${RYZOM_CLIENT_RELEASENOTES_RING_URL}"
-#cmakedefine RYZOM_CLIENT_RELEASENOTES_URL "${RYZOM_CLIENT_RELEASENOTES_URL}"
-
 #cmakedefine AUTHOR "${AUTHOR}"
 #cmakedefine YEAR "${YEAR}"
 #cmakedefine COPYRIGHT "${COPYRIGHT}"

nel/include/nel/gui/group_html.h

@@ -85,10 +85,7 @@ namespace NLGUI
 			/// Language code of the browser( e.g.: en, hu )
 			std::string languageCode;
 			/// List of domains the widget can consider secure.
-			std::vector<std::string> trustedDomains;
-			/// Web server
-			std::string webServer;
-			std::string webServerDomain;
+			std::vector< std::string > trustedDomains;
 			/// Maximum concurrent MultiCurl connections per CGroupHTML instance
 			sint32 curlMaxConnections;
 

nel/include/nel/gui/group_list.h

@@ -99,8 +99,6 @@ namespace NLGUI
 		// Get the number of active children
 		uint getNumActiveChildren() const;
 
-		uint getMaxElements() const { return _MaxElements; }
-
 		/**
 		* set the template that will be used to add text;
 		* \templ : a CViewText object. Only its font size, color and shadow are required.

nel/include/nel/gui/interface_element.h

@@ -3,7 +3,7 @@
 //
 // This source file has been modified by the following contributors:
 // Copyright (C) 2013-2014  Laszlo KIS-ADAM (dfighter) <dfighter1985@gmail.com>
-// Copyright (C) 2019-2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
+// Copyright (C) 2019  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as
@@ -383,6 +383,7 @@ namespace NLGUI
 		void dummySet(const std::string &value);
 
 	public:
+
 		// export some properties
 		REFLECT_EXPORT_START(CInterfaceElement, CReflectable)
 			REFLECT_BOOL ("active", getActive, setActive);
@@ -397,7 +398,6 @@ namespace NLGUI
 			REFLECT_SINT32 ("h_real", getHReal, dummySet);
 			REFLECT_STRING ("id", getIdByValue, dummySet);
 			REFLECT_STRING ("sizeref", getSizeRefAsString, setSizeRef);
-			REFLECT_STRING ("posparent", getPosParent, setPosParent);
 			REFLECT_LUA_METHOD("updateCoords", luaUpdateCoords);
 			REFLECT_LUA_METHOD("invalidateCoords", luaInvalidateCoords);
 			REFLECT_LUA_METHOD("invalidateContent", luaInvalidateContent);
@@ -525,8 +525,6 @@ namespace NLGUI
 		void setSizeParent( const std::string &id );
 		void getSizeParent( std::string &id ) const;
 		
-		std::string getPosParent() const;
-		
 		void setSerializable( bool b ){ serializable = b; }
 		bool IsSerializable() const{ return serializable; }
 

nel/include/nel/gui/widget_manager.h

@@ -489,8 +489,6 @@ namespace NLGUI
 		uint8 getGlobalContainerAlpha() const { return _GlobalContainerAlpha; }
 		uint8 getGlobalRolloverFactorContent() const { return _GlobalRolloverFactorContent; }
 		uint8 getGlobalRolloverFactorContainer() const { return _GlobalRolloverFactorContainer; }
-		uint8 getContextHelpContentAlpha() const { return _ContextHelpContentAlpha; }
-		uint8 getContextHelpContainerAlpha() const { return _ContextHelpContainerAlpha; }
 
 		void updateGlobalAlphas();
 		void resetGlobalAlphasProps();
@@ -610,16 +608,12 @@ namespace NLGUI
 		NLMISC::CCDBNodeLeaf *_GlobalContainerAlphaDB;
 		NLMISC::CCDBNodeLeaf *_GlobalContentRolloverFactorDB;
 		NLMISC::CCDBNodeLeaf *_GlobalContainerRolloverFactorDB;
-		NLMISC::CCDBNodeLeaf * _ContextHelpContentAlphaDB;
-		NLMISC::CCDBNodeLeaf * _ContextHelpContainerAlphaDB;
 		
 		uint8 _ContainerAlpha;
 		uint8 _GlobalContentAlpha;
 		uint8 _GlobalContainerAlpha;
 		uint8 _GlobalRolloverFactorContent;
 		uint8 _GlobalRolloverFactorContainer;
-		uint8 _ContextHelpContentAlpha;
-		uint8 _ContextHelpContainerAlpha;
 
 		bool _MouseHandlingEnabled;
 		
@@ -660,8 +654,6 @@ namespace NLGUI
 		bool _GroupSelection;
 		bool multiSelection;
 		uint32 _WidgetCount;
-
-		std::set<std::string> m_LoggedMissingElement;
 	};
 
 }

nel/include/nel/misc/common.h

@@ -412,13 +412,8 @@ public:
 	Exception();
 	Exception(const std::string &reason);
 	Exception(const char *format, ...);
-#if defined(NL_COMP_GCC) && (GCC_VERSION < 40800)
-	virtual ~Exception() throw() {}
-	virtual const char      *what() const throw();
-#else
 	virtual ~Exception() NL_OVERRIDE {}
 	virtual const char	*what() const throw() NL_OVERRIDE;
-#endif
 };
 
 

nel/include/nel/misc/entity_id.h

@@ -25,7 +25,6 @@
 #include "debug.h"
 #include "common.h"
 #include "stream.h"
-#include "wang_hash.h"
 
 namespace NLMISC {
 
@@ -578,7 +577,6 @@ public:
 };*/
 
 // Traits for hash_map using CEntityId
-#if 0
 struct CEntityIdHashMapTraits
 {
 	enum { bucket_size = 4, min_buckets = 8 };
@@ -598,27 +596,7 @@ struct CEntityIdHashMapTraits
 		return id1.getShortId() < id2.getShortId();
 	}
 };
-#else
-struct CEntityIdHashMapTraits
-{
-	enum { bucket_size = 4, min_buckets = 8 };
-	CEntityIdHashMapTraits() { }
-	size_t operator() (const NLMISC::CEntityId &id ) const
-	{
-		uint64 hash64 = id.getUniqueId();
-		if (sizeof(size_t) == 8)
-		{
-			return (size_t)NLMISC::wangHash64(hash64);
-		}
-		else
-		{
-			uint32 hash32a = NLMISC::wangHash((uint32)(hash64 & 0xFFFFFFFF));
-			uint32 hash32b = NLMISC::wangHash((uint32)(hash64 >> 32));
-			return hash32a ^ hash32b;
-		}
-	}
-};
-#endif
+
 
 /*inline std::stringstream &operator << (std::stringstream &__os, const CEntityId &__t)
 {

nel/include/nel/misc/file.h

@@ -41,11 +41,8 @@ struct EFile : public EStream
 	EFile (const std::string& filename) : EStream( "Unknown file error in '"+filename+"'" ), Filename(filename) {}
 	EFile (const std::string& filename, const std::string& text, bool ) : EStream( text ), Filename(filename) {}
 
-#if defined(NL_COMP_GCC) && (GCC_VERSION < 40800)
-	virtual ~EFile() throw() {}
-#else
 	virtual ~EFile() NL_OVERRIDE {}
-#endif
+
 	std::string Filename;
 };
 

nel/include/nel/misc/stream.h

@@ -81,12 +81,7 @@ struct EStream : public Exception
 
 	EStream( const IStream &f, const std::string& str );
 
-#if defined(NL_COMP_GCC) && (GCC_VERSION < 40800)
-	virtual ~EStream() throw() {}
-#else
 	virtual ~EStream() NL_OVERRIDE {}
-#endif
-
 
 	// May Not be Filled...
 	std::string	StreamName;

nel/include/nel/net/message.h

@@ -1,9 +1,6 @@
 // NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 //
-// This source file has been modified by the following contributors:
-// Copyright (C) 2020  Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
-//
 // 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
@@ -95,11 +92,6 @@ public:
 	/// exchange memory data
 	void swap(CMessage &other);
 
-#ifdef NL_CPP14
-	/// Move operator
-	CMessage &operator=(CMessage &&other) noexcept { swap(other); return *this; }
-#endif
-
 	/// Sets the message type as a string and put it in the buffer if we are in writing mode
 	void setType (const std::string &name, TMessageType type=OneWay);
 

nel/include/nel/pacs/move_container.h

@@ -244,7 +244,7 @@ private:
 												CCollisionOTStaticInfo *staticColInfo);
 
 	// Add a trigger in the trigger array
-	bool						newTrigger (CMovePrimitive* first, CMovePrimitive* second, const CCollisionDesc& desc, uint triggerType);
+	void						newTrigger (CMovePrimitive* first, CMovePrimitive* second, const CCollisionDesc& desc, uint triggerType);
 
 	// Clear modified primitive list
 	void						clearModifiedList (uint8 worldImage);

nel/include/nel/pacs/move_primitive.h

@@ -251,28 +251,6 @@ public:
 		_Height=height;
 	}
 
-	void setZFinalPosition(float pos)
-	{
-		_ZFinalPosition = pos;
-	}
-
-	float getZFinalPosition()
-	{
-		return _ZFinalPosition;
-	}
-
-
-	bool haveZOffset()
-	{
-		return _HaveZOffset;
-	}
-
-	void enableZOffset(bool enabled)
-	{
-		_HaveZOffset = enabled;
-	}
-
-
 	/**
 	  * Set the cylinder size. Only for cylinder.
 	  *
@@ -488,11 +466,6 @@ private:
 
 	// Iteration count
 	sint32				_IterationCount;
-
-	float 				_ZOffset;
-	float 				_ZFinalPosition;
-	bool				_HaveZOffset;
-
 };
 
 } // NLPACS

nel/include/nel/pacs/u_move_primitive.h

@@ -114,12 +114,6 @@ public:
 		  * This is an overlap trigger. This trigger is actived each time the object overlap the trigger.
 		  */
 		OverlapTrigger=0x400,
-
-		/**
-		  * This is an stairs trigger. This trigger is actived each time the object overlap the trigger and change Z position.
-		  */
-		OverlapStairsTrigger=0x800,
-
 	};
 
 	/**
@@ -280,14 +274,6 @@ public:
 	  */
 	virtual float			getHeight () const =0;
 
-	virtual void setZFinalPosition(float pos) =0;
-
-	virtual float getZFinalPosition() =0;
-
-	virtual bool haveZOffset() =0;
-
-	virtual void enableZOffset(bool enabled) =0;
-
 	/**
 	  * Set the cylinder size. Only for cylinder.
 	  *

nel/include/nel/web/http_package_provider.h

@@ -52,11 +52,7 @@ public:
 	/// filePath: [out] ex. /games/nel/stream/00/00/000000000..
 	/// hash: [in]
 	/// name: [in] name for debugging purposes
-	#if defined(NL_COMP_GCC) && (GCC_VERSION < 40800)
-		virtual bool getFile(std::string &filePath, const NLMISC::CHashKey &hash, const std::string &name);
-	#else
-		virtual bool getFile(std::string &filePath, const NLMISC::CHashKey &hash, const std::string &name) NL_OVERRIDE;
-	#endif
+	virtual bool getFile(std::string &filePath, const NLMISC::CHashKey &hash, const std::string &name) NL_OVERRIDE;
 	
 public:
 	/// Set storage path (ex. stream/)

nel/src/3d/driver/direct3d/driver_direct3d_pixel_program.cpp

@@ -1,7 +1,7 @@
 /** \file driver_direct3d_pixel_program.cpp
  * Direct 3d driver implementation
  *
- * $Id$
+ * $Id: driver_direct3d_pixel_program.cpp,v 1.1.2.4 2007/07/09 15:26:35 legallo Exp $
  *
  * \todo manage better the init/release system (if a throw occurs in the init, we must release correctly the driver)
  */

nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp

@@ -1,7 +1,7 @@
 /** \file driver_opengl_pixel_program.cpp
  * OpenGL driver implementation for pixel program manipulation.
  *
- * $Id$
+ * $Id: driver_opengl_pixel_program.cpp,v 1.1.2.4 2007/07/09 15:29:00 legallo Exp $
  *
  * \todo manage better the init/release system (if a throw occurs in the init, we must release correctly the driver)
  */

nel/src/gui/css_background_renderer.cpp

@@ -428,7 +428,7 @@ namespace NLGUI
 
 		if (bg.repeatX == CSS_VALUE_ROUND)
 		{
-			sint numTiles = std::max(1, (sint)std::ceil(((float)areaW / texW) - 0.5f));
+			sint numTiles = std::max(1, (sint)std::round((float)areaW / texW));
 			texW = areaW / numTiles;
 			if (bg.height.isAuto() && bg.repeatY != CSS_VALUE_ROUND)
 			{
@@ -439,7 +439,7 @@ namespace NLGUI
 
 		if (bg.repeatY == CSS_VALUE_ROUND)
 		{
-			sint numTiles = std::max(1, (sint)std::ceil(((float)areaH / texH) - 0.5f));
+			sint numTiles = std::max(1, (sint)std::round((float)areaH / texH));
 			texH = areaH / numTiles;
 			if (bg.width.isAuto() && bg.repeatX != CSS_VALUE_ROUND)
 			{

nel/src/gui/css_length.cpp

@@ -30,10 +30,9 @@ namespace NLGUI
 
 bool CSSLength::parseValue(const std::string &value, bool allowPercent, bool allowNegative)
 {
-	static const std::string knownUnitsArr[] = {
+	static const std::set<std::string> knownUnits = {
 		"%", "rem", "em", "px", "pt", "vw", "vh", "vi", "vb", "vmin", "vmax"
 	};
-	static const std::set<std::string> knownUnits(knownUnitsArr, &knownUnitsArr[sizeof(knownUnitsArr) / sizeof(knownUnitsArr[0])]);
 
 	std::string::size_type pos = 0;
 	std::string::size_type len = value.size();

nel/src/gui/group_html.cpp

@@ -408,11 +408,8 @@ namespace NLGUI
 	// Check if domain is on TrustedDomain
 	bool CGroupHTML::isTrustedDomain(const string &domain)
 	{
-		if (domain == options.webServerDomain)
-			return true;
-
 		vector<string>::iterator it;
-		it = find(options.trustedDomains.begin(), options.trustedDomains.end(), domain);
+		it = find ( options.trustedDomains.begin(), options.trustedDomains.end(), domain);
 		return it != options.trustedDomains.end();
 	}
 
@@ -3424,16 +3421,6 @@ namespace NLGUI
 			string finalUrl;
 			bool isLocal = lookupLocalFile (finalUrl, _URL.c_str(), true);
 
-			if (!isLocal && _URL.c_str()[0] == '/')
-			{
-				if (options.webServer.empty())
-				{
-					// Try again later
-					return;
-				}
-				finalUrl = options.webServer + finalUrl;
-			}
-
 			_URL = finalUrl;
 
 			CUrlParser uri (_URL);

nel/src/gui/interface_element.cpp

@@ -438,14 +438,6 @@ namespace NLGUI
 		parseSizeRef(sizeref.c_str());
 	}
 
-	// ------------------------------------------------------------------------------------------------
-	std::string CInterfaceElement::getPosParent() const
-	{
-		std::string id;
-		getPosParent(id);
-		return id;
-	}
-
 	// ------------------------------------------------------------------------------------------------
 	std::string CInterfaceElement::getSizeRefAsString() const
 	{

nel/src/gui/libwww.cpp

@@ -208,10 +208,9 @@ namespace NLGUI
 	// ***************************************************************************
 	bool getCssLength (float &value, std::string &unit, const std::string &str, bool neg)
 	{
-		static const std::string knownUnitsArr[] = {
+		static const std::set<std::string> knownUnits = {
 			"%", "rem", "em", "px", "pt", "vw", "vh", "vi", "vb", "vmin", "vmax"
 		};
-		static const std::set<std::string> knownUnits(knownUnitsArr, &knownUnitsArr[sizeof(knownUnitsArr) / sizeof(knownUnitsArr[0])]);
 
 		std::string::size_type pos = 0;
 		std::string::size_type len = str.size();

nel/src/gui/widget_manager.cpp

@@ -435,22 +435,7 @@ namespace NLGUI
 			CWidgetManager::SMasterGroup &rMG = _MasterGroups[nMasterGroup];
 			CInterfaceElement *pIEL = rMG.Group->getElement (sEltId);
 			if (pIEL != NULL)
-			{
-#if !FINAL_VERSION
-				if (m_LoggedMissingElement.find(sEltId) != m_LoggedMissingElement.end())
-				{
-					m_LoggedMissingElement.erase(sEltId);
-					nlwarning("Previously missing UI element with Id '%s' was now found!", sEltId.c_str());
-				}
-#endif
 				return pIEL;
-			}
-		}
-
-		if (m_LoggedMissingElement.find(sEltId) == m_LoggedMissingElement.end())
-		{
-			m_LoggedMissingElement.insert(sEltId);
-			nlwarning("Could not find UI element from Id '%s'...", sEltId.c_str());
 		}
 		return NULL;
 	}
@@ -1798,65 +1783,29 @@ namespace NLGUI
 				/** If there's a modal box around, should be sure that the context help doesn't intersect it.
 				  * If this is the case, we just disable it, unless the tooltip was generated by the current modal window
 				  */
-				
-				bool draw = false;
 				if ( hasModal() )
 				{
 					CInterfaceGroup *mw = getModal().ModalWindow;
 					if (mw && mw->isIn(*groupContextHelp))
 					{
 						if (_CurCtrlContextHelp->isSonOf(mw))
-							draw = true;
+						{
+							groupContextHelp->executeLuaScriptOnDraw();
+							groupContextHelp->draw ();
+							// flush layers
+							CViewRenderer::getInstance()->flush();
+						}
 					}
 					else
-						draw = true;
-				}
-				else
-					draw = true;
-
-				if (draw) {
-					// apply opacity settings
-					const std::vector< CViewBase* > &vs = groupContextHelp->getViews();
-					// content opacity: only target views or else breaks
-					for( uint i = 0; i < vs.size(); ++i)
 					{
-						CViewBase *pVB = vs[i];
-						pVB->setAlpha(_ContextHelpContentAlpha);
-					}
-					// go into sub groups and apply opacity to views and controls (this is mainly for crystallized_spell_context_help)
-					const std::vector<CInterfaceGroup*> &rG = groupContextHelp->getGroups();
-					if (!rG.empty()) {
-						for(uint i = 0; i < rG.size(); ++i) {
-							const std::vector< CInterfaceGroup* > &vs = rG[i]->getGroups();
-							if (!vs.empty()) {
-								for( uint j = 0; j < vs.size(); ++j)
-								{
-									const std::vector< CViewBase* > &vb = vs[j]->getViews();
-									if (!vb.empty()) {
-										for( uint k = 0; k < vb.size(); ++k)
-										{
-											CViewBase *pVB = vb[k];
-											pVB->setAlpha(_ContextHelpContentAlpha);
-										}
-									}
-								}
-							}
-							const std::vector< CViewBase* > &vb = rG[i]->getViews();
-							if (!vb.empty()) {
-								for( uint k = 0; k < vb.size(); ++k)
-								{
-									CViewBase *pVB = vb[k];
-									pVB->setAlpha(_ContextHelpContentAlpha);
-								}
-							}
-						}
+						groupContextHelp->executeLuaScriptOnDraw();
+						groupContextHelp->draw ();
+						// flush layers
+						CViewRenderer::getInstance()->flush();
 					}
-					// container opacity
-					CInterfaceGroup* container = dynamic_cast<CInterfaceGroup*>(groupContextHelp->findFromShortId("border"));
-					if (container)
-						container->setAlpha(_ContextHelpContainerAlpha);
-
-					// draw the tooltip
+				}
+				else
+				{
 					groupContextHelp->executeLuaScriptOnDraw();
 					groupContextHelp->draw ();
 					// flush layers
@@ -2355,16 +2304,16 @@ namespace NLGUI
 				SModalWndInfo mwi = getModal();
 				if (mwi.ModalExitKeyPushed)
 					disableModalWindow();
-
-				handled= true;
 			}
+		}
 
+		// Manage "quit window" If the Key is ESCAPE, no captureKeyboard
+		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keydown && eventDesc.getKey() == NLMISC::KeyESCAPE )
+		{
+			// Get the last escapable active top window. NB: this is ergonomically better.
 			CInterfaceGroup	*win= getLastEscapableTopWindow();
-			if ( win )
+			if( win )
 			{
-				// Manage "quit window" If the Key is ESCAPE, no captureKeyboard
-				// Get the last escapable active top window. NB: this is ergonomically better.
-
 				// If the window is a modal, must pop it.
 				if( dynamic_cast<CGroupModal*>(win) )
 				{
@@ -2450,13 +2399,7 @@ namespace NLGUI
 			}
 		}
 
-	    if (eventDesc.getKeyEventType() == CEventDescriptorKey::keydown && eventDesc.getKey() == NLMISC::KeyESCAPE && !handled && !isKeyboardCaptured())
-	    {
-		    CAHManager::getInstance()->runActionHandler("enter_modal", NULL, "group=ui:interface:quit_dialog");
-		    handled = true;
-	    }
-
-	    // General case: handle it in the Captured keyboard
+		// General case: handle it in the Captured keyboard
 		if ( getCaptureKeyboard() != NULL && !handled)
 		{
 			bool result = getCaptureKeyboard()->handleEvent(evnt);
@@ -3395,17 +3338,11 @@ namespace NLGUI
 			nlassert(_GlobalContentRolloverFactorDB);
 			_GlobalContainerRolloverFactorDB = CDBManager::getInstance()->getDbProp("UI:SAVE:CONTAINER_ROLLOVER_FACTOR");
 			nlassert(_GlobalContainerRolloverFactorDB);
-			_ContextHelpContentAlphaDB = CDBManager::getInstance()->getDbProp("UI:SAVE:CONTEXT_HELP_CONTENT_ALPHA");
-			nlassert(_ContextHelpContentAlphaDB);
-			_ContextHelpContainerAlphaDB = CDBManager::getInstance()->getDbProp("UI:SAVE:CONTEXT_HELP_CONTAINER_ALPHA");
-			nlassert(_ContextHelpContainerAlphaDB);
 		}
 		_GlobalContentAlpha = (uint8)_GlobalContentAlphaDB->getValue32();
 		_GlobalContainerAlpha = (uint8)_GlobalContainerAlphaDB->getValue32();
 		_GlobalRolloverFactorContent = (uint8)_GlobalContentRolloverFactorDB->getValue32();
 		_GlobalRolloverFactorContainer = (uint8)_GlobalContainerRolloverFactorDB->getValue32();
-		_ContextHelpContentAlpha = (uint8)_ContextHelpContentAlphaDB->getValue32();
-		_ContextHelpContainerAlpha = (uint8)_ContextHelpContainerAlphaDB->getValue32();
 	}
 
 	void CWidgetManager::resetGlobalAlphasProps()
@@ -3414,8 +3351,6 @@ namespace NLGUI
 		_GlobalContainerAlphaDB = NULL;
 		_GlobalContentRolloverFactorDB = NULL;
 		_GlobalContainerRolloverFactorDB = NULL;
-		_ContextHelpContentAlphaDB = NULL;
-		_ContextHelpContainerAlphaDB = NULL;
 	}
 
 	void CWidgetManager::registerNewScreenSizeHandler( INewScreenSizeHandler *handler )
@@ -3949,8 +3884,6 @@ namespace NLGUI
 		_GlobalRolloverFactorContent = 255;
 		_GlobalRolloverFactorContainer = 255;
 		_AlphaRolloverSpeedDB = NULL;
-		_ContextHelpContentAlpha = 255;
-		_ContextHelpContainerAlpha = 255;
 
 		_MouseHandlingEnabled = true;
 		_MouseOverWindow = false;

nel/src/misc/seven_zip.cpp

@@ -17,7 +17,6 @@
 // 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/seven_zip.h>
 
 #include <nel/misc/types_nl.h>

nel/src/net/unified_network.cpp

@@ -266,14 +266,9 @@ void	uncbServiceIdentification(CMessage &msgin, TSockId from, CCallbackNetBase &
 
 	nlinfo ("HNETL5: + connect ident '%s' %s-%hu pos %hu ext %d", from->asString().c_str(), inSName.c_str(), inSid.get(), (uint16)pos, (uint8)isExternal);
 
-	if (isExternal)
+	if(isExternal)
 	{
-
-#ifdef NL_OS_WINDOWS
-		pos = 0;
-#else
-		nlassert(pos == 0);
-#endif
+		nlassert (pos == 0);
 	}
 
 	if (inSid.get() == 0)

nel/src/pacs/move_container.cpp

@@ -918,10 +918,8 @@ bool CMoveContainer::evalPrimAgainstPrimCollision (double beginTime, CMovePrimit
 			|| (otherPrimitive->getTriggerType()&UMovePrimitive::EnterTrigger));
 		bool exit = (beginTime<=lastTime) && (lastTime<_DeltaTime) && ((primitive->getTriggerType()&UMovePrimitive::ExitTrigger)
 			|| (otherPrimitive->getTriggerType()&UMovePrimitive::ExitTrigger));
-		bool overlap = ((firstTime<=beginTime) && (lastTime>_DeltaTime) && ((primitive->getTriggerType()&UMovePrimitive::OverlapTrigger)
-			|| (otherPrimitive->getTriggerType()&UMovePrimitive::OverlapTrigger)) ||
-		(firstTime<=beginTime) && (lastTime>_DeltaTime) && ((primitive->getTriggerType()&UMovePrimitive::OverlapStairsTrigger)
-			|| (otherPrimitive->getTriggerType()&UMovePrimitive::OverlapStairsTrigger)));
+		bool overlap = (firstTime<=beginTime) && (lastTime>_DeltaTime) && ((primitive->getTriggerType()&UMovePrimitive::OverlapTrigger)
+			|| (otherPrimitive->getTriggerType()&UMovePrimitive::OverlapTrigger));
 		bool contact = ( beginTime<((firstTime+lastTime)/2) ) && (firstTime<=_DeltaTime);
 		bool collision = contact && (primitive->isObstacle() && otherPrimitive->isObstacle ());
 
@@ -1213,7 +1211,7 @@ void CMoveContainer::newCollision (CMovePrimitive* first, const CCollisionSurfac
 
 // ***************************************************************************
 
-bool CMoveContainer::newTrigger (CMovePrimitive* first, CMovePrimitive* second, const CCollisionDesc& desc, uint triggerType)
+void CMoveContainer::newTrigger (CMovePrimitive* first, CMovePrimitive* second, const CCollisionDesc& desc, uint triggerType)
 {
 	// Element index
 	uint index=(uint)_Triggers.size();
@@ -1226,14 +1224,6 @@ bool CMoveContainer::newTrigger (CMovePrimitive* first, CMovePrimitive* second,
 	_Triggers[index].Object1=second->UserData;
 	_Triggers[index].CollisionDesc=desc;
 	_Triggers[index].CollisionType = uint8(triggerType);
-
-
-	if (second->_StaticFlags&UMovePrimitive::OverlapStairsTrigger) {
-		nlinfo("Col Stairs height %f", second->getHeight());
-		return true;
-	}
-
-	return false;
 }
 
 // ***************************************************************************
@@ -1669,17 +1659,8 @@ void CMoveContainer::reaction (const CCollisionOTInfo& first)
 					newTrigger (dynInfo->getFirstPrimitive (), dynInfo->getSecondPrimitive (), dynInfo->getCollisionDesc (), UTriggerInfo::In);
 				if (dynInfo->isExit())
 					newTrigger (dynInfo->getFirstPrimitive (), dynInfo->getSecondPrimitive (), dynInfo->getCollisionDesc (), UTriggerInfo::Out);
-				if (dynInfo->isInside()) {
-					if (newTrigger (dynInfo->getFirstPrimitive (), dynInfo->getSecondPrimitive (), dynInfo->getCollisionDesc (), UTriggerInfo::Inside))
-					{
-						dynInfo->getFirstPrimitive()->enableZOffset(true);
-						CVectorD first_pos = dynInfo->getFirstPrimitive()->getFinalPosition(dynInfo->getFirstWorldImage());
-						CVectorD second_pos = dynInfo->getSecondPrimitive()->getFinalPosition(dynInfo->getSecondWorldImage());
-						dynInfo->getFirstPrimitive()->setZFinalPosition(second_pos.z+dynInfo->getSecondPrimitive()->getHeight()-10.0f);
-					}
-				}
-				if (dynInfo->isExit())
-					newTrigger (dynInfo->getFirstPrimitive (), dynInfo->getSecondPrimitive (), dynInfo->getCollisionDesc (), UTriggerInfo::Out);
+				if (dynInfo->isInside())
+					newTrigger (dynInfo->getFirstPrimitive (), dynInfo->getSecondPrimitive (), dynInfo->getCollisionDesc (), UTriggerInfo::Inside);
 			}
 		}
 	}

nel/src/pacs/move_primitive.cpp

@@ -49,8 +49,6 @@ CMovePrimitive::CMovePrimitive (CMoveContainer* container, uint8 firstWorldImage
 	_StaticFlags=0;
 	_RootOTInfo=NULL;
 	_LastTestTime=0xffffffff;
-	_ZOffset = 0;
-	_HaveZOffset = false;
 
 	// Ptr table alloc
 	_WorldImages=_Container->allocateWorldImagesPtrs (numWorldImage);
@@ -151,11 +149,6 @@ bool CMovePrimitive::isTriggered (CMovePrimitive& second, bool enter, bool exit)
 {
 	// Generate a trigger ?
 
-
-	// Is one of them is a stairs trigger ?
-	if ( second._StaticFlags&OverlapStairsTrigger )
-		return true;
-
 	// Is the two are not triggers ?
 	if ( ( (_StaticFlags&TriggerMask) == NotATrigger ) && ( (second._StaticFlags&TriggerMask) == NotATrigger ) )
 		return false;

nel/src/sound/sound.cpp

@@ -262,7 +262,7 @@ void				CSound::importForm(const std::string& filename, NLGEORGES::UFormElm& roo
 	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_GROUP_CONTROLLER);
 #else
 	std::string groupControllerPath;
-	root.getValueByName(groupControllerPath, ".GroupController");
+	root.getValueByName(groupControllerPath, ".GroupControllerPath");
 	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(groupControllerPath);
 #endif
 

nel/tools/build_gamedata/0_setup.py

@@ -65,220 +65,158 @@ if not args.noconf:
 	except NameError:
 		BuildQuality = 1
 	try:
-		if args.preset:
-			DummyUnknownName
-		RemapLocalFrom
+		if not args.preset:
+			ToolDirectories
 	except NameError:
-		RemapLocalFrom = 'R:'
-	try:
-		if args.preset:
-			DummyUnknownName
-		RemapLocalTo
-	except NameError:
-		RemapLocalTo = os.getenv('RC_ROOT').replace('\\', '/')
-		if (not RemapLocalTo) or (not ':' in RemapLocalTo):
-			RemapLocalTo = 'R:'
-	try:
-		if args.preset:
-			DummyUnknownName
-		ToolDirectories
-	except NameError:
-		ToolDirectories = [ 'R:/distribution/nel_tools_win_x64', 'R:/distribution/ryzom_tools_win_x64' ]
+		ToolDirectories = [ 'R:/distribution/nel_tools_win_x64-distribution', 'R:/distribution/ryzom_tools_win_x64-distribution' ]
 	try:
 		ToolSuffix
 	except NameError:
 		ToolSuffix = ".exe"
 	try:
-		if args.preset:
-			DummyUnknownName
-		ScriptDirectory
+		if not args.preset:
+			ScriptDirectory
 	except NameError:
 		ScriptDirectory = "R:/code/nel/tools/build_gamedata"
 	try:
-		if args.preset:
-			DummyUnknownName
-		WorkspaceDirectory
+		if not args.preset:
+			WorkspaceDirectory
 	except NameError:
 		WorkspaceDirectory = "R:/leveldesign/workspace"
 	try:
-		if args.preset:
-			DummyUnknownName
-		DatabaseDirectory
+		if not args.preset:
+			DatabaseDirectory
 	except NameError:
 		DatabaseDirectory = "R:/graphics"
 	try:
-		if args.preset:
-			DummyUnknownName
-		SoundDirectory
+		if not args.preset:
+			SoundDirectory
 	except NameError:
 		SoundDirectory = "R:/sound"
 	try:
-		if args.preset:
-			DummyUnknownName
-		SoundDfnDirectory
+		if not args.preset:
+			SoundDfnDirectory
 	except NameError:
 		SoundDfnDirectory = "R:/sound/DFN"
 	try:
-		if args.preset:
-			DummyUnknownName
-		ExportBuildDirectory
+		if not args.preset:
+			ExportBuildDirectory
 	except NameError:
 		ExportBuildDirectory = "R:/pipeline/export"
 	try:
-		if args.preset:
-			DummyUnknownName
-		InstallDirectory
+		if not args.preset:
+			InstallDirectory
 	except NameError:
 		InstallDirectory = "R:/pipeline/install"
 	try:
-		if args.preset:
-			DummyUnknownName
-		ClientDevDirectory
+		if not args.preset:
+			ClientDevDirectory
 	except NameError:
 		ClientDevDirectory = "R:/pipeline/client_dev"
 	try:
-		if args.preset:
-			DummyUnknownName
-		ClientDevLiveDirectory
-	except NameError:
-		ClientDevLiveDirectory = "R:/pipeline/client_dev_live"
-	try:
-		if args.preset:
-			DummyUnknownName
-		ClientPatchDirectory
+		if not args.preset:
+			ClientPatchDirectory
 	except NameError:
 		ClientPatchDirectory = "R:/pipeline/client_patch"
 	try:
-		if args.preset:
-			DummyUnknownName
-		ClientInstallDirectory
+		if not args.preset:
+			ClientInstallDirectory
 	except NameError:
 		ClientInstallDirectory = "R:/pipeline/client_install"
 	try:
-		if args.preset:
-			DummyUnknownName
-		ShardInstallDirectory
+		if not args.preset:
+			ShardInstallDirectory
 	except NameError:
 		ShardInstallDirectory = "R:/pipeline/shard"
 	try:
-		if args.preset:
-			DummyUnknownName
-		ShardDevDirectory
-	except NameError:
-		ShardDevDirectory = "R:/pipeline/shard_dev"
-	try:
-		if args.preset:
-			DummyUnknownName
-		WorldEditInstallDirectory
+		if not args.preset:
+			WorldEditInstallDirectory
 	except NameError:
 		WorldEditInstallDirectory = "R:/pipeline/worldedit"
 	try:
-		if args.preset:
-			DummyUnknownName
-		WorldEditorFilesDirectory
+		if not args.preset:
+			WorldEditorFilesDirectory
 	except NameError:
 		WorldEditorFilesDirectory = "R:/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files"
 	try:
-		if args.preset:
-			DummyUnknownName
-		LeveldesignDirectory
+		if not args.preset:
+			LeveldesignDirectory
 	except NameError:
 		LeveldesignDirectory = "R:/leveldesign"
 	try:
-		if args.preset:
-			DummyUnknownName
-		LeveldesignDfnDirectory
+		if not args.preset:
+			LeveldesignDfnDirectory
 	except NameError:
 		LeveldesignDfnDirectory = "R:/leveldesign/DFN"
 	try:
-		if args.preset:
-			DummyUnknownName
-		LeveldesignWorldDirectory
+		if not args.preset:
+			LeveldesignWorldDirectory
 	except NameError:
 		LeveldesignWorldDirectory = "R:/leveldesign/world"
 	try:
-		if args.preset:
-			DummyUnknownName
-		PrimitivesDirectory
+		if not args.preset:
+			PrimitivesDirectory
 	except NameError:
 		PrimitivesDirectory = "R:/leveldesign/primitives"
 	try:
-		if args.preset:
-			DummyUnknownName
-		LeveldesignDataCommonDirectory
+		if not args.preset:
+			LeveldesignDataCommonDirectory
 	except NameError:
 		LeveldesignDataCommonDirectory = "R:/leveldesign/common"
 	try:
-		if args.preset:
-			DummyUnknownName
-		LeveldesignDataShardDirectory
+		if not args.preset:
+			LeveldesignDataShardDirectory
 	except NameError:
 		LeveldesignDataShardDirectory = "R:/leveldesign/shard"
 	try:
-		if args.preset:
-			DummyUnknownName
-		TranslationDirectory
+		if not args.preset:
+			TranslationDirectory
 	except NameError:
 		TranslationDirectory = "R:/leveldesign/translation"
 	try:
-		if args.preset:
-			DummyUnknownName
-		GamedevDirectory
+		if not args.preset:
+			GamedevDirectory
 	except NameError:
 		GamedevDirectory = "R:/code/ryzom/client/data/gamedev"
 	try:
-		if args.preset:
-			DummyUnknownName
-		DataCommonDirectory
+		if not args.preset:
+			DataCommonDirectory
 	except NameError:
 		DataCommonDirectory = "R:/code/ryzom/common/data_common"
 	try:
-		if args.preset:
-			DummyUnknownName
-		DataShardDirectory
+		if not args.preset:
+			DataShardDirectory
 	except NameError:
 		DataShardDirectory = "R:/code/ryzom/server/data_shard"
 	try:
-		if args.preset:
-			DummyUnknownName
-		WindowsExeDllCfgDirectories
+		if not args.preset:
+			WindowsExeDllCfgDirectories
 	except NameError:
 		# TODO: Separate 64bit and 32bit
 		WindowsExeDllCfgDirectories = [ '', 'R:/build/fv_x64/bin/Release', 'R:/distribution/external_x64', 'R:/code/ryzom/client', '', '', '' ]
 	try:
-		if args.preset:
-			DummyUnknownName
-		LinuxServiceExecutableDirectory
-	except NameError:
-		LinuxServiceExecutableDirectory = "R:/build/server_gcc/bin"
-	try:
-		if args.preset:
-			DummyUnknownName
-		LinuxClientExecutableDirectory
+		if not args.preset:
+			LinuxServiceExecutableDirectory
 	except NameError:
-		LinuxClientExecutableDirectory = "R:/build/client_gcc/bin"
+		LinuxServiceExecutableDirectory = "R:/build/gcc_server/bin"
 	try:
-		if args.preset:
-			DummyUnknownName
-		PatchmanDevDirectory
+		if not args.preset:
+			LinuxClientExecutableDirectory
 	except NameError:
-		PatchmanDevDirectory = "R:/patchman/terminal_dev"
+		LinuxClientExecutableDirectory = "R:/build/gcc_client/bin"
 	try:
-		if args.preset:
-			DummyUnknownName
-		PatchmanCfgAdminDirectory
+		if not args.preset:
+			PatchmanCfgAdminDirectory
 	except NameError:
 		PatchmanCfgAdminDirectory = "R:/patchman/admin_install"
 	try:
-		if args.preset:
-			DummyUnknownName
-		PatchmanCfgDefaultDirectory
+		if not args.preset:
+			PatchmanCfgDefaultDirectory
 	except NameError:
 		PatchmanCfgDefaultDirectory = "R:/patchman/default"
 	try:
-		if args.preset:
-			DummyUnknownName
-		PatchmanBridgeServerDirectory
+		if not args.preset:
+			PatchmanBridgeServerDirectory
 	except NameError:
 		PatchmanBridgeServerDirectory = "R:/pipeline/bridge_server"
 	try:
@@ -338,11 +276,9 @@ if not args.noconf:
 		ExportBuildDirectory = askVar(log, "[OUT] Export Build Directory", ExportBuildDirectory).replace("\\", "/")
 		InstallDirectory = askVar(log, "[OUT] Install Directory", InstallDirectory).replace("\\", "/")
 		ClientDevDirectory = askVar(log, "[OUT] Client Dev Directory", ClientDevDirectory).replace("\\", "/")
-		ClientDevLiveDirectory = askVar(log, "[OUT] Client Dev Live Directory", ClientDevLiveDirectory).replace("\\", "/")
 		ClientPatchDirectory = askVar(log, "[OUT] Client Patch Directory", ClientPatchDirectory).replace("\\", "/")
 		ClientInstallDirectory = askVar(log, "[OUT] Client Install Directory", ClientInstallDirectory).replace("\\", "/")
 		ShardInstallDirectory = askVar(log, "[OUT] Shard Data Install Directory", ShardInstallDirectory).replace("\\", "/")
-		ShardDevDirectory = askVar(log, "[OUT] Shard Dev Directory", ShardDevDirectory).replace("\\", "/")
 		WorldEditInstallDirectory = askVar(log, "[OUT] World Edit Data Install Directory", WorldEditInstallDirectory).replace("\\", "/")
 		LeveldesignDirectory = askVar(log, "[IN] Leveldesign Directory", LeveldesignDirectory).replace("\\", "/")
 		LeveldesignDfnDirectory = askVar(log, "[IN] Leveldesign DFN Directory", LeveldesignDfnDirectory).replace("\\", "/")
@@ -364,7 +300,6 @@ if not args.noconf:
 		WindowsExeDllCfgDirectories[6] = askVar(log, "[IN] Septenary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[6]).replace("\\", "/")
 		LinuxServiceExecutableDirectory = askVar(log, "[IN] Linux Service Executable Directory", LinuxServiceExecutableDirectory).replace("\\", "/")
 		LinuxClientExecutableDirectory = askVar(log, "[IN] Linux Client Executable Directory", LinuxClientExecutableDirectory).replace("\\", "/")
-		PatchmanDevDirectory = askVar(log, "[IN] Patchman Directory", PatchmanDevDirectory).replace("\\", "/")
 		PatchmanCfgAdminDirectory = askVar(log, "[IN] Patchman Cfg Admin Directory", PatchmanCfgAdminDirectory).replace("\\", "/")
 		PatchmanCfgDefaultDirectory = askVar(log, "[IN] Patchman Cfg Default Directory", PatchmanCfgDefaultDirectory).replace("\\", "/")
 		PatchmanBridgeServerDirectory = askVar(log, "[OUT] Patchman Bridge Server Patch Directory", PatchmanBridgeServerDirectory).replace("\\", "/")
@@ -415,9 +350,6 @@ if not args.noconf:
 	sf.write("# Quality option for this site (1 for BEST, 0 for DRAFT)\n")
 	sf.write("BuildQuality = " + str(BuildQuality) + "\n")
 	sf.write("\n")
-	sf.write("RemapLocalFrom = \"" + str(RemapLocalFrom) + "\"\n")
-	sf.write("RemapLocalTo = \"" + str(RemapLocalTo) + "\"\n")
-	sf.write("\n")
 	sf.write("ToolDirectories = " + str(ToolDirectories) + "\n")
 	sf.write("ToolSuffix = \"" + str(ToolSuffix) + "\"\n")
 	sf.write("\n")
@@ -434,11 +366,9 @@ if not args.noconf:
 	sf.write("# Install directories\n")
 	sf.write("InstallDirectory = \"" + str(InstallDirectory) + "\"\n")
 	sf.write("ClientDevDirectory = \"" + str(ClientDevDirectory) + "\"\n")
-	sf.write("ClientDevLiveDirectory = \"" + str(ClientDevLiveDirectory) + "\"\n")
 	sf.write("ClientPatchDirectory = \"" + str(ClientPatchDirectory) + "\"\n")
 	sf.write("ClientInstallDirectory = \"" + str(ClientInstallDirectory) + "\"\n")
 	sf.write("ShardInstallDirectory = \"" + str(ShardInstallDirectory) + "\"\n")
-	sf.write("ShardDevDirectory = \"" + str(ShardDevDirectory) + "\"\n")
 	sf.write("WorldEditInstallDirectory = \"" + str(WorldEditInstallDirectory) + "\"\n")
 	sf.write("\n")
 	sf.write("# Utility directories\n")
@@ -460,7 +390,6 @@ if not args.noconf:
 	sf.write("WindowsExeDllCfgDirectories = " + str(WindowsExeDllCfgDirectories) + "\n")
 	sf.write("LinuxServiceExecutableDirectory = \"" + str(LinuxServiceExecutableDirectory) + "\"\n")
 	sf.write("LinuxClientExecutableDirectory = \"" + str(LinuxClientExecutableDirectory) + "\"\n")
-	sf.write("PatchmanDevDirectory = \"" + str(PatchmanDevDirectory) + "\"\n")
 	sf.write("PatchmanCfgAdminDirectory = \"" + str(PatchmanCfgAdminDirectory) + "\"\n")
 	sf.write("PatchmanCfgDefaultDirectory = \"" + str(PatchmanCfgDefaultDirectory) + "\"\n")
 	sf.write("PatchmanBridgeServerDirectory = \"" + str(PatchmanBridgeServerDirectory) + "\"\n")
@@ -478,18 +407,8 @@ if not args.noconf:
 	sf.write("\n")
 	sf.write("\n")
 	sf.write("# end of file\n")
-	sf.flush()
-	sf.close()
-	sf = open("configuration/buildsite_local.py", "w")
-	sfr = open("configuration/buildsite.py", "r")
-	for l in sfr:
-		sf.write(l.replace(RemapLocalFrom + '/', RemapLocalTo + '/'))
-	sf.flush()
-	sfr.close()
 	sf.close()
 
-from buildsite_local import *
-
 sys.path.append(WorkspaceDirectory)
 from projects import *
 
@@ -529,7 +448,6 @@ printLog(log, "")
 # Additional directories
 printLog(log, ">>> Setup additional directories <<<")
 mkPath(log, ClientDevDirectory)
-mkPath(log, ClientDevLiveDirectory)
 mkPath(log, ClientPatchDirectory)
 mkPath(log, ClientInstallDirectory)
 
@@ -585,7 +503,6 @@ if not args.noverify:
 	findTool(log, ToolDirectories, TranslationToolsTool, ToolSuffix)
 	findTool(log, ToolDirectories, BuildWorldPackedColTool, ToolSuffix)
 	findTool(log, ToolDirectories, R2IslandsTexturesTool, ToolSuffix)
-	findTool(log, ToolDirectories, PatchmanServiceTool, ToolSuffix)
 
 log.close()
 if os.path.isfile("0_setup.log"):

nel/tools/build_gamedata/all_dev.bat

@@ -1,17 +1,15 @@
 title Ryzom Core: 0_setup.py --noconf
-python 0_setup.py --noconf
+0_setup.py --noconf
 title Ryzom Core: 1_export.py
-python 1_export.py
+1_export.py
 title Ryzom Core: 2_build.py
-python 2_build.py
+2_build.py
 title Ryzom Core: 3_install.py
-python 3_install.py
+3_install.py
 title Ryzom Core: a1_worldedit_data.py
-python a1_worldedit_data.py
+a1_worldedit_data.py
 title Ryzom Core: b1_client_dev.py
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: b2_shard_data.py
-python b2_shard_data.py
-title Ryzom Core: b3_shard_dev.py
-python b3_shard_dev.py
+b2_shard_data.py
 title Ryzom Core: Ready

nel/tools/build_gamedata/all_install_dev.bat

@@ -1,11 +1,9 @@
 title Ryzom Core: 3_install.py
-python 3_install.py
+3_install.py
 title Ryzom Core: a1_worldedit_data.py
-python a1_worldedit_data.py
+a1_worldedit_data.py
 title Ryzom Core: b1_client_dev.py
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: b2_shard_data.py
-python b2_shard_data.py
-title Ryzom Core: b3_shard_dev.py
-python b3_shard_dev.py
+b2_shard_data.py
 title Ryzom Core: Ready

nel/tools/build_gamedata/b1_client_dev.py

@@ -24,14 +24,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # 
 
-import time, sys, os, shutil, subprocess, distutils.dir_util, socket
+import time, sys, os, shutil, subprocess, distutils.dir_util
 sys.path.append("configuration")
 
 if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite_local import *
+from buildsite import *
 from tools import *
 
 sys.path.append(WorkspaceDirectory)
@@ -45,10 +45,9 @@ printLog(log, "-------")
 printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
 printLog(log, "")
 
-mkPath(log, ClientDevLiveDirectory)
-if not os.path.isfile(ClientDevLiveDirectory + "/client.cfg"):
-	printLog(log, ">>> Generate live dev client.cfg <<<")
-	cfg = open(ClientDevLiveDirectory + "/client.cfg", "w")
+if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
+	printLog(log, ">>> Generate client.cfg <<<")
+	cfg = open(ClientDevDirectory + "/client.cfg", "w")
 	cfg.write("RootConfigFilename   = \"client_default.cfg\";\n")
 	cfg.write("PreDataPath          = {\n")
 	cfg.write("\t\"user\", \"patch\", \"" + DataCommonDirectory + "\", \"" + GamedevDirectory + "\", \"" + LeveldesignDirectory + "/translation/translated\", \"" + InstallDirectory + "\", \"data\", \"examples\" \n")
@@ -58,24 +57,6 @@ if not os.path.isfile(ClientDevLiveDirectory + "/client.cfg"):
 	cfg.write("DisplayLuaDebugInfo  = 1;\n")
 	cfg.write("AllowDebugLua        = 1;\n")
 	cfg.write("FullScreen           = 0;\n")
-	cfg.flush()
-	cfg.close()
-	printLog(log, "")
-
-mkPath(log, ClientDevDirectory)
-if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
-	printLog(log, ">>> Generate local dev client.cfg <<<")
-	cfg = open(ClientDevDirectory + "/client.cfg", "w")
-	cfgr = open(ClientDevLiveDirectory + "/client.cfg", "r")
-	for l in cfgr:
-		cfg.write(l)
-	cfgr.close()
-	cfg.write("StartupHost          = \"http://" + socket.gethostname() + ":9042\";\n")
-	cfg.write("Application          = {\n")
-	cfg.write("	\"dev\", \"./client_ryzom_r.exe\", \"./\" \n")
-	cfg.write("};\n")
-	cfg.flush()
-	cfg.close()
 	printLog(log, "")
 
 printLog(log, ">>> Install data <<<")
@@ -83,22 +64,13 @@ for category in InstallClientData:
 	if (category["UnpackTo"] != None):
 		printLog(log, "CATEGORY " + category["Name"])
 		targetPath = ClientDevDirectory
-		targetPathLive = ClientDevLiveDirectory
 		if (category["UnpackTo"] != ""):
 			targetPath += "/" + category["UnpackTo"]
-			targetPathLive += "/" + category["UnpackTo"]
 		mkPath(log, targetPath)
-		mkPath(log, targetPathLive)
 		for package in category["Packages"]:
 			printLog(log, "PACKAGE " + package[0])
 			mkPath(log, InstallDirectory + "/" + package[0])
-			if "exedll" in package[0]:
-				if package[0] == "exedll": # or package[0] == platformExeDll # TODO: 64-bit and Linux separation of exedll, only include one
-					copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPath)
-					copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPathLive)
-			else:
-				copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath)
-				copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPathLive)
+			copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath)
 printLog(log, "")
 
 log.close()

nel/tools/build_gamedata/b3_shard_dev.py

@@ -1,152 +0,0 @@
-#!/usr/bin/python
-# 
-# \file b2_shard_data.py
-# \brief Install shard data
-# \date 2009-02-18 16:19GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Install shard data
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2009-2014  by authors
-#
-# 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/>.
-# 
-
-import time, sys, os, shutil, subprocess, distutils.dir_util
-sys.path.append("configuration")
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite_local import *
-from tools import *
-
-sys.path.append(WorkspaceDirectory)
-from projects import *
-
-# Log error
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Install to shard dev")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-PatchmanService = findTool(log, ToolDirectories, PatchmanServiceTool, ToolSuffix)
-printLog(log, "")
-
-mkPath(log, ShardDevDirectory)
-mkPath(log, ShardDevDirectory + "/local")
-printLog(log, ">>> Generate shard dev local.cfg <<<")
-cfg = open(ShardDevDirectory + "/local.cfg", "w")
-cfg.write("WindowStyle = \"WIN\";\n")
-cfg.write("Paths += {\n")
-cfg.write("	\"" + ShardDevDirectory + "/local\",\n")
-cfg.write("	\"" + DataCommonDirectory + "\",\n")
-cfg.write("	\"" + DataShardDirectory + "\",\n")
-cfg.write("	\"" + LeveldesignDirectory + "\",\n")
-cfg.write("	\"" + WorldEditorFilesDirectory + "\",\n")
-for dir in InstallShardDataDirectories:
-	mkPath(log, ShardInstallDirectory + "/" + dir)
-	cfg.write("	\"" + ShardInstallDirectory + "/" + dir + "\",\n")
-for multiDir in InstallShardDataMultiDirectories:
-	dstDir = multiDir[0]
-	mkPath(log, ShardInstallDirectory + "/" + dstDir)
-	cfg.write("	\"" + ShardInstallDirectory + "/" + dstDir + "\",\n")
-cfg.write("};\n")
-cfg.write("RRDToolPath = \"..\\..\\..\\external\\rrdtool\\rrdtool.exe\";\n")
-cfg.write("StartCommands += {\n")
-cfg.write("	// \"gw_aes.transportRemove aes_l3c\",\n")
-cfg.write("};\n")
-cfg.write("NegFiltersWarning += {\n")
-cfg.write("	\"already inserted from\",\n")
-cfg.write("};\n")
-cfg.write("// Allow player to stay connected to FS when services go down\n")
-cfg.write("DontNeedBackend = 1;\n")
-cfg.flush()
-cfg.close()
-printLog(log, "")
-
-if not os.path.exists(ShardDevDirectory  + "/aes_state.txt"):
-	printLog(log, ">>> Generate shard dev aes_state.txt <<<")
-	f = open(ShardDevDirectory + "/aes_state.txt", "w")
-	f.write("ShardOrders unifier so_autostart_off\n")
-	f.write("ShardOrders mainland so_autostart_off\n")
-	f.write("ShardOrders ring so_autostart_off\n")
-	f.flush()
-	f.close()
-	printLog(log, "")
-
-mkPath(log, ShardDevDirectory + "/ras")
-if not os.path.exists(ShardDevDirectory  + "/ras/as_state.txt"):
-	printLog(log, ">>> Generate shard dev as_state.txt <<<")
-	f = open(ShardDevDirectory + "/ras/as_state.txt", "w")
-	f.write("ShardOrders unifier so_autostart_off\n")
-	f.write("ShardOrders mainland so_autostart_off\n")
-	f.write("ShardOrders ring so_autostart_off\n")
-	f.flush()
-	f.close()
-	printLog(log, "")
-
-for execDir in InstallShardDataExecutables:
-	dstDir = execDir[0]
-	mkPath(log, PatchmanCfgDefaultDirectory)
-	mkPath(log, InstallDirectory)
-	mkPath(log, ShardDevDirectory + "/live/" + dstDir)
-	printLog(log, "SHARD PACKAGE " + dstDir)
-	copyFileListNoTreeIfNeeded(log, PatchmanCfgDefaultDirectory, ShardDevDirectory + "/live/" + dstDir, execDir[2])
-	copyFileListNoTreeIfNeeded(log, InstallDirectory, ShardDevDirectory + "/live/" + dstDir, execDir[3])
-	for cfgName in execDir[2]:
-		cfgPath = ShardDevDirectory + "/live/" + dstDir + "/" + cfgName
-		found = False
-		with open(cfgPath, "r") as f:
-			for l in f:
-				if "Paths += {" in l:
-					found = True
-		if not found:
-			with open(cfgPath, "a") as cfg:
-				cfg.write("\n")
-				cfg.write("Paths += {\n")
-				cfg.write("	\"" + ShardDevDirectory + "/live/" + dstDir + "\",\n")
-				cfg.write("};\n")
-				cfg.write("\n")
-				cfg.flush()
-printLog(log, "")
-
-
-if PatchmanService == "":
-	toolLogFail(log, PatchmanServiceTool, ToolSuffix)
-else:
-	mkPath(log, PatchmanDevDirectory)
-	cwDir = os.getcwd().replace("\\", "/")
-	os.chdir(PatchmanDevDirectory)
-	if os.path.isfile("log.log"):
-		os.remove("log.log")
-	subprocess.call([ PatchmanService, "-C.", "-L." ])
-	if os.path.isfile("log.log"):
-		f = open("log.log", "r")
-		for l in f:
-			printLog(log, l.rstrip())
-		f.close()
-	os.chdir(cwDir)
-	printLog(log, "")
-
-log.close()
-if os.path.isfile("b3_shard_dev.log"):
-	os.remove("b3_shard_dev.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_shard_dev.log")
-shutil.move("log.log", "b3_shard_dev.log")

nel/tools/build_gamedata/c1_shard_patch.py

@@ -35,7 +35,7 @@ if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite_local import *
+from buildsite import *
 from tools import *
 
 sys.path.append(WorkspaceDirectory)

nel/tools/build_gamedata/characters_dev.bat

@@ -1,11 +1,11 @@
 title Ryzom Core: 1_export.py (CHARACTERS)
-python 1_export.py -ipj common/characters common/characters_maps_hr
+1_export.py -ipj common/characters common/characters_maps_hr
 title Ryzom Core: 2_build.py (CHARACTERS)
-python 2_build.py -ipj common/characters common/characters_maps_hr
+2_build.py -ipj common/characters common/characters_maps_hr
 title Ryzom Core: 3_install.py (CHARACTERS)
-python 3_install.py -ipj common/characters common/characters_maps_hr
+3_install.py -ipj common/characters common/characters_maps_hr
 title Ryzom Core: b1_client_dev.py (CHARACTERS)
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: b2_shard_data.py (CHARACTERS)
-python b2_shard_data.py
+b2_shard_data.py
 title Ryzom Core: Ready (CHARACTERS)

nel/tools/build_gamedata/configuration/scripts.py

@@ -96,20 +96,6 @@ def needUpdateLogRemoveDest(log, source, dest):
 	printLog(log, "SKIP " + dest)
 	return 0
 
-def needUpdateLogRemoveDestSilentSkip(log, source, dest):
-	if (os.path.isfile(source)):
-		if (os.path.isfile(dest)):
-			if (os.stat(source).st_mtime > os.stat(dest).st_mtime):
-				os.remove(dest)
-				printLog(log, source + " -> " + dest)
-				return 1
-			else:
-				return 0
-		printLog(log, source + " -> " + dest)
-		return 1
-	printLog(log, "MISSING " + source)
-	return 0
-
 def copyFileList(log, dir_source, dir_target, files):
 	for fileName in files:
 		if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":

nel/tools/build_gamedata/configuration/tools.py

@@ -98,5 +98,4 @@ PatchGenTool = "patch_gen"
 TranslationToolsTool = "translation_tools"
 BuildWorldPackedColTool = "build_world_packed_col"
 R2IslandsTexturesTool = "r2_islands_textures"
-PatchmanServiceTool = "ryzom_patchman_service"
 SevenZipTool = "7za"

nel/tools/build_gamedata/d1_client_patch.py

@@ -35,7 +35,7 @@ if os.path.isfile("log.log"):
 	os.remove("log.log")
 log = open("log.log", "w")
 from scripts import *
-from buildsite_local import *
+from buildsite import *
 from tools import *
 
 sys.path.append(WorkspaceDirectory)

nel/tools/build_gamedata/executables_dev.bat

@@ -1,15 +1,13 @@
 title Ryzom Core: 0_setup.py (EXECUTABLES)
-python 0_setup.py --noconf -ipj common/gamedev common/exedll common/cfg common/data_common
+0_setup.py --noconf -ipj common/gamedev common/exedll common/cfg common/data_common
 title Ryzom Core: 1_export.py (EXECUTABLES)
-python 1_export.py -ipj common/gamedev common/exedll common/cfg common/data_common
+1_export.py -ipj common/gamedev common/exedll common/cfg common/data_common
 title Ryzom Core: 2_build.py (EXECUTABLES)
-python 2_build.py -ipj common/gamedev common/exedll common/cfg common/data_common
+2_build.py -ipj common/gamedev common/exedll common/cfg common/data_common
 title Ryzom Core: 3_install.py (EXECUTABLES)
-python 3_install.py -ipj common/gamedev common/exedll common/cfg common/data_common
+3_install.py -ipj common/gamedev common/exedll common/cfg common/data_common
 title Ryzom Core: b1_client_dev.py
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: b2_shard_data.py
-python b2_shard_data.py
-title Ryzom Core: b3_shard_dev.py
-python b3_shard_dev.py
+b2_shard_data.py
 title Ryzom Core: Ready

nel/tools/build_gamedata/fauna_dev.bat

@@ -1,11 +0,0 @@
-title Ryzom Core: 1_export.py (FAUNA)
-python 1_export.py -ipj common/fauna
-title Ryzom Core: 2_build.py (FAUNA)
-python 2_build.py -ipj common/fauna
-title Ryzom Core: 3_install.py (FAUNA)
-python 3_install.py -ipj common/fauna
-title Ryzom Core: b1_client_dev.py (FAUNA)
-python b1_client_dev.py
-title Ryzom Core: b2_shard_data.py (FAUNA)
-python b2_shard_data.py
-title Ryzom Core: Ready (FAUNA)

nel/tools/build_gamedata/interface_dev.bat

@@ -1,9 +1,9 @@
 title Ryzom Core: 1_export.py (INTERFACE)
-python 1_export.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
+1_export.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
 title Ryzom Core: 2_build.py (INTERFACE)
-python 2_build.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
+2_build.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
 title Ryzom Core: 3_install.py (INTERFACE)
-python 3_install.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
+3_install.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
 title Ryzom Core: b1_client_dev.py
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: Ready

nel/tools/build_gamedata/leveldesign_dev.bat

@@ -1,13 +1,11 @@
 title Ryzom Core: 1_export.py (LEVELDESIGN)
-python 1_export.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
+1_export.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
 title Ryzom Core: 2_build.py (LEVELDESIGN)
-python 2_build.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
+2_build.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
 title Ryzom Core: 3_install.py (LEVELDESIGN)
-python 3_install.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
+3_install.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
 title Ryzom Core: b1_client_dev.py (LEVELDESIGN)
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: b2_shard_data.py (LEVELDESIGN)
-python b2_shard_data.py
-title Ryzom Core: b3_shard_dev.py
-python b3_shard_dev.py
+b2_shard_data.py
 title Ryzom Core: Ready

nel/tools/build_gamedata/objects_dev.bat

@@ -1,11 +0,0 @@
-title Ryzom Core: 1_export.py (OBJECTS)
-python 1_export.py -ipj common/objects
-title Ryzom Core: 2_build.py (OBJECTS)
-python 2_build.py -ipj common/objects
-title Ryzom Core: 3_install.py (OBJECTS)
-python 3_install.py -ipj common/objects
-title Ryzom Core: b1_client_dev.py (OBJECTS)
-python b1_client_dev.py
-title Ryzom Core: b2_shard_data.py (OBJECTS)
-python b2_shard_data.py
-title Ryzom Core: Ready (OBJECTS)

nel/tools/build_gamedata/panoply_dev.bat

@@ -1,11 +1,11 @@
 title Ryzom Core: 1_export.py (PANOPLY)
-python 1_export.py -ipj common/characters_maps_hr
+1_export.py -ipj common/characters_maps_hr
 title Ryzom Core: 2_build.py (PANOPLY)
-python 2_build.py -ipj common/characters_maps_hr
+2_build.py -ipj common/characters_maps_hr
 title Ryzom Core: 3_install.py (PANOPLY)
-python 3_install.py -ipj common/characters_maps_hr
+3_install.py -ipj common/characters_maps_hr
 title Ryzom Core: b1_client_dev.py (PANOPLY)
-python b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: b2_shard_data.py (PANOPLY)
-python b2_shard_data.py
+b2_shard_data.py
 title Ryzom Core: Ready (PANOPLY)

nel/tools/build_gamedata/processes/cartographer/0_setup.py

@@ -46,7 +46,6 @@ printLog(log, "")
 # Setup build directories
 printLog(log, ">>> Setup build directories <<<")
 mkPath(log, ExportBuildDirectory + "/" + CartographerBuildDirectory)
-mkPath(log, ExportBuildDirectory + "/" + CartographerMapBuildDirectory)
 
 # Setup lookup directories
 printLog(log, ">>> Setup lookup directories <<<")
@@ -66,7 +65,6 @@ for dir in PropertiesExportBuildSearchPaths:
 # Setup client directories
 printLog(log, ">>> Setup install directories <<<")
 mkPath(log, InstallDirectory + "/" + CartographerInstallDirectory)
-mkPath(log, InstallDirectory + "/" + IslandsInstallDirectory)
 
 # Setup client directories
 printLog(log, ">>> Setup configuration <<<")
@@ -109,7 +107,7 @@ cfg.write("InverseZTest = true;\n")
 cfg.write("Vegetation = true;\n")
 cfg.write("MeterPixelSize = 2;\n")
 cfg.write("\n")
-cfg.write("CompleteIslandsFile = \"" + ExportBuildDirectory + "/" + CartographerBuildDirectory + "/" + IslandsXmlFile + "\";\n")
+cfg.write("CompleteIslandsFile = \"r2_islands.xml\";\n")
 cfg.write("EntryPointsFile = \"r2_entry_points.txt\";\n")
 cfg.write("\n")
 cfg.close()