Merge branch '58-add-rotz-roty-and-dist-reflect-lua-to-3dcamera-of-a-scene' into 'main/gingo-test'

Resolve "Add rotz roty and dist reflect lua to 3DCamera of a scene"

See merge request ryzom/ryzom-core!48

.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

@@ -34,11 +34,37 @@ IF(COMMAND cmake_policy)
   ENDIF()
 ENDIF()
 
+
+#-----------------------------------------------------------------------------
+# Downloads and install Hunger into HUNTER_ROOT directory.
+OPTION(HUNTER_ENABLED "Enable Hunter package manager" OFF)
+IF(HUNTER_ENABLED)
+  INCLUDE("CMakeModules/HunterGate.cmake")
+  HunterGate(
+    URL "https://github.com/cpp-pm/hunter/archive/v0.23.321.tar.gz"
+    SHA1 "5e53cbb0429037ea8e2592bfd92704b8ff3ab492"
+    FILEPATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules/HunterConfig.cmake"
+  )
+
+  # default options for hunterized build
+  SET(WITH_STATIC         ON CACHE BOOL "static" FORCE)
+  SET(WITH_STATIC_DRIVERS ON CACHE BOOL "static drivers" FORCE)
+  SET(WITH_STATIC_CURL    ON CACHE BOOL "static curl" FORCE)
+  SET(WITH_STATIC_LIBXML2 ON CACHE BOOL "static libxml2" FORCE)
+  SET(WITH_STATIC_EXTERNAL ON CACHE BOOL "static external" FORCE)
+  SET(WITH_EXTERNAL       OFF CACHE BOOL "external libs" FORCE)
+ENDIF()
+
+
+#-----------------------------------------------------------------------------
+
 INCLUDE(nel)
 INCLUDE(ConfigureChecks)
 INCLUDE(CheckDepends)
 INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
 
+MESSAGE("EXTERNAL ${WITH_EXTERNAL}")
+
 # Force out of source builds.
 CHECK_OUT_OF_SOURCE()
 
@@ -53,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")
@@ -98,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
@@ -119,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()
 
 #-----------------------------------------------------------------------------
@@ -137,6 +160,28 @@ IF(WIN32)
   ENDIF()
 ENDIF()
 
+IF(HUNTER_ENABLED)
+  ## TODO: hack for freetype hunter package
+  SET(ON 1)
+  ##
+  HUNTER_ADD_PACKAGE(ZLIB)
+
+  FIND_PACKAGE(ZLIB CONFIG REQUIRED)
+  SET(ZLIB_LIBRARY ZLIB::zlib)
+
+  HUNTER_ADD_PACKAGE(libxml2)
+  FIND_PACKAGE(libxml2 CONFIG REQUIRED)
+  SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} libxml2::libxml2)
+
+  HUNTER_ADD_PACKAGE(OpenSSL)
+  FIND_PACKAGE(OpenSSL REQUIRED)
+  # TODO: is OpenSSL::Crypto only needed for WIN32?
+  SET(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
+
+  # for precompiled headers, not needed if using TARGET_PRECOMPILE_HEADERS() from cmake 3.16+
+  SET(ZLIB_INCLUDE_DIR ZLIB_ROOT/include)
+  SET(LIBXML2_INCLUDE_DIR ${LIBXML2_ROOT}/include/libxml2)
+ELSE()
 FIND_PACKAGE(ZLIB REQUIRED)
 FIND_PACKAGE(LibXml2 REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
@@ -147,6 +192,7 @@ FIND_PACKAGE(Jpeg)
 IF(WIN32)
   SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
 ENDIF()
+ENDIF() #hunter
 
 IF(WITH_LIBOVR)
   FIND_PACKAGE(LibOVR)
@@ -240,6 +286,7 @@ ENDIF()
 
 INCLUDE(FindHelpers)
 
+#TODO: hunter qt package
 IF(WITH_QT5)
   FIND_QT5()
 ENDIF()
@@ -251,6 +298,7 @@ IF(WITH_QT)
   FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtXml QtOpenGL REQUIRED)
 ENDIF()
 
+#TODO: hunter assimp package
 IF(WITH_ASSIMP)
   FIND_PACKAGE(assimp REQUIRED)
 ENDIF()
@@ -260,9 +308,20 @@ IF(WITH_NEL)
     FIND_PACKAGE(CppTest)
   ENDIF()
 
-  IF(WITH_GUI)
-    FIND_PACKAGE(Luabind REQUIRED)
-  ENDIF()
+  IF(HUNTER_ENABLED)
+    IF(WITH_GUI)
+      HUNTER_ADD_PACKAGE(luabind)
+      FIND_PACKAGE(Luabind REQUIRED)
+    ENDIF()
+
+    HUNTER_ADD_PACKAGE(CURL)
+    FIND_PACKAGE(CURL CONFIG REQUIRED)
+    # TODO: for nelgui
+    SET(CURL_LIBRARIES CURL::libcurl libxml2::libxml2)
+  ELSE()
+    IF(WITH_GUI)
+      FIND_PACKAGE(Luabind REQUIRED)
+    ENDIF()
 
     FIND_PACKAGE(CURL REQUIRED)
 
@@ -313,6 +372,7 @@ IF(WITH_NEL)
         ENDIF()
       ENDIF()
     ENDIF()
+  ENDIF() #hunter
 
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include)
   ADD_SUBDIRECTORY(nel)

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)
@@ -83,7 +69,11 @@ MACRO(FIND_CORRECT_LUA_VERSION)
     ENDIF()
   ELSE()
     # TODO: find a way to detect Lua version
-    IF(WITH_LUA54)
+    IF(HUNTER_ENABLED)
+      HUNTER_ADD_PACKAGE(Lua)
+      FIND_PACKAGE(Lua CONFIG REQUIRED)
+      SET(LUA_LIBRARIES Lua::lua_lib)
+    ELSEIF(WITH_LUA54)
       FIND_PACKAGE(Lua54 REQUIRED)
     ELSEIF(WITH_LUA53)
       FIND_PACKAGE(Lua53 REQUIRED)
@@ -115,6 +105,11 @@ IF(WITH_LUA54)
   LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua54d)
 ENDIF()
 
+IF(HUNTER_ENABLED)
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind luabind09)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabindd luabind09-d)
+ENDIF()
+
 IF(WITH_LUA53)
   IF(WITH_STLPORT)
     LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua53)

CMakeModules/FindWindowsSDK.cmake

@@ -501,6 +501,17 @@ IF(WINSDK_INCLUDE_DIR)
   IF(WINSDK_VERSION STREQUAL "7.1" AND (MSVC11 OR MSVC12 OR MSVC14))
     ADD_DEFINITIONS(-D_USING_V110_SDK71_)
   ENDIF()
+
+  IF(NOT DXSDK_DIR)
+    MESSAGE("Using DirectX from Windows SDK (${WINSDK_LIBRARY_DIRS})")
+    SET(DXSDK_DIR ${WINSDK_DIR})
+    FIND_LIBRARY(DXSDK_GUID_LIBRARY dxguid ${WINSDK_LIBRARY_DIRS})
+    FIND_LIBRARY(DXSDK_DINPUT_LIBRARY dinput8 ${WINSDK_LIBRARY_DIRS})
+    FIND_LIBRARY(DXSDK_DSOUND_LIBRARY dsound ${WINSDK_LIBRARY_DIRS})
+    FIND_LIBRARY(DXSDK_XAUDIO_LIBRARY xaudio2 ${WINSDK_LIBRARY_DIRS})
+    # TODO: FIND_LIBRARY(DXSDK_D3DX9_LIBRARY d3dx9)
+    FIND_LIBRARY(DXSDK_D3D9_LIBRARY d3d9 ${WINSDK_LIBRARY_DIRS})
+  ENDIF()
 ELSE()
   IF(NOT WindowsSDK_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find Windows SDK!")

CMakeModules/HunterConfig.cmake

@@ -0,0 +1,8 @@
+# This file is parsed by HunterGate command
+
+hunter_config(luabind
+  VERSION 0.9.1
+  URL  "https://github.com/nimetu/luabind/tarball/2fa4606"
+  SHA1 "3b4646bab9f0b2362d7b8d71d78e40deaf3cc747"
+  )
+

CMakeModules/HunterGate.cmake

@@ -0,0 +1,537 @@
+# Copyright (c) 2013-2019, Ruslan Baratov
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This is a gate file to Hunter package manager.
+# Include this file using `include` command and add package you need, example:
+#
+#     cmake_minimum_required(VERSION 3.2)
+#
+#     include("cmake/HunterGate.cmake")
+#     HunterGate(
+#         URL "https://github.com/path/to/hunter/archive.tar.gz"
+#         SHA1 "798501e983f14b28b10cda16afa4de69eee1da1d"
+#     )
+#
+#     project(MyProject)
+#
+#     hunter_add_package(Foo)
+#     hunter_add_package(Boo COMPONENTS Bar Baz)
+#
+# Projects:
+#     * https://github.com/hunter-packages/gate/
+#     * https://github.com/ruslo/hunter
+
+option(HUNTER_ENABLED "Enable Hunter package manager support" ON)
+
+if(HUNTER_ENABLED)
+  if(CMAKE_VERSION VERSION_LESS "3.2")
+    message(
+        FATAL_ERROR
+        "At least CMake version 3.2 required for Hunter dependency management."
+        " Update CMake or set HUNTER_ENABLED to OFF."
+    )
+  endif()
+endif()
+
+include(CMakeParseArguments) # cmake_parse_arguments
+
+option(HUNTER_STATUS_PRINT "Print working status" ON)
+option(HUNTER_STATUS_DEBUG "Print a lot info" OFF)
+option(HUNTER_TLS_VERIFY "Enable/disable TLS certificate checking on downloads" ON)
+set(HUNTER_ROOT "" CACHE FILEPATH "Override the HUNTER_ROOT.")
+
+set(HUNTER_ERROR_PAGE "https://hunter.readthedocs.io/en/latest/reference/errors")
+
+function(hunter_gate_status_print)
+  if(HUNTER_STATUS_PRINT OR HUNTER_STATUS_DEBUG)
+    foreach(print_message ${ARGV})
+      message(STATUS "[hunter] ${print_message}")
+    endforeach()
+  endif()
+endfunction()
+
+function(hunter_gate_status_debug)
+  if(HUNTER_STATUS_DEBUG)
+    foreach(print_message ${ARGV})
+      string(TIMESTAMP timestamp)
+      message(STATUS "[hunter *** DEBUG *** ${timestamp}] ${print_message}")
+    endforeach()
+  endif()
+endfunction()
+
+function(hunter_gate_error_page error_page)
+  message("------------------------------ ERROR ------------------------------")
+  message("    ${HUNTER_ERROR_PAGE}/${error_page}.html")
+  message("-------------------------------------------------------------------")
+  message("")
+  message(FATAL_ERROR "")
+endfunction()
+
+function(hunter_gate_internal_error)
+  message("")
+  foreach(print_message ${ARGV})
+    message("[hunter ** INTERNAL **] ${print_message}")
+  endforeach()
+  message("[hunter ** INTERNAL **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
+  message("")
+  hunter_gate_error_page("error.internal")
+endfunction()
+
+function(hunter_gate_fatal_error)
+  cmake_parse_arguments(hunter "" "ERROR_PAGE" "" "${ARGV}")
+  if("${hunter_ERROR_PAGE}" STREQUAL "")
+    hunter_gate_internal_error("Expected ERROR_PAGE")
+  endif()
+  message("")
+  foreach(x ${hunter_UNPARSED_ARGUMENTS})
+    message("[hunter ** FATAL ERROR **] ${x}")
+  endforeach()
+  message("[hunter ** FATAL ERROR **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
+  message("")
+  hunter_gate_error_page("${hunter_ERROR_PAGE}")
+endfunction()
+
+function(hunter_gate_user_error)
+  hunter_gate_fatal_error(${ARGV} ERROR_PAGE "error.incorrect.input.data")
+endfunction()
+
+function(hunter_gate_self root version sha1 result)
+  string(COMPARE EQUAL "${root}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("root is empty")
+  endif()
+
+  string(COMPARE EQUAL "${version}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("version is empty")
+  endif()
+
+  string(COMPARE EQUAL "${sha1}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("sha1 is empty")
+  endif()
+
+  string(SUBSTRING "${sha1}" 0 7 archive_id)
+
+  if(EXISTS "${root}/cmake/Hunter")
+    set(hunter_self "${root}")
+  else()
+    set(
+        hunter_self
+        "${root}/_Base/Download/Hunter/${version}/${archive_id}/Unpacked"
+    )
+  endif()
+
+  set("${result}" "${hunter_self}" PARENT_SCOPE)
+endfunction()
+
+# Set HUNTER_GATE_ROOT cmake variable to suitable value.
+function(hunter_gate_detect_root)
+  # Check CMake variable
+  if(HUNTER_ROOT)
+    set(HUNTER_GATE_ROOT "${HUNTER_ROOT}" PARENT_SCOPE)
+    hunter_gate_status_debug("HUNTER_ROOT detected by cmake variable")
+    return()
+  endif()
+
+  # Check environment variable
+  if(DEFINED ENV{HUNTER_ROOT})
+    set(HUNTER_GATE_ROOT "$ENV{HUNTER_ROOT}" PARENT_SCOPE)
+    hunter_gate_status_debug("HUNTER_ROOT detected by environment variable")
+    return()
+  endif()
+
+  # Check HOME environment variable
+  if(DEFINED ENV{HOME})
+    set(HUNTER_GATE_ROOT "$ENV{HOME}/.hunter" PARENT_SCOPE)
+    hunter_gate_status_debug("HUNTER_ROOT set using HOME environment variable")
+    return()
+  endif()
+
+  # Check SYSTEMDRIVE and USERPROFILE environment variable (windows only)
+  if(WIN32)
+    if(DEFINED ENV{SYSTEMDRIVE})
+      set(HUNTER_GATE_ROOT "$ENV{SYSTEMDRIVE}/.hunter" PARENT_SCOPE)
+      hunter_gate_status_debug(
+          "HUNTER_ROOT set using SYSTEMDRIVE environment variable"
+      )
+      return()
+    endif()
+
+    if(DEFINED ENV{USERPROFILE})
+      set(HUNTER_GATE_ROOT "$ENV{USERPROFILE}/.hunter" PARENT_SCOPE)
+      hunter_gate_status_debug(
+          "HUNTER_ROOT set using USERPROFILE environment variable"
+      )
+      return()
+    endif()
+  endif()
+
+  hunter_gate_fatal_error(
+      "Can't detect HUNTER_ROOT"
+      ERROR_PAGE "error.detect.hunter.root"
+  )
+endfunction()
+
+function(hunter_gate_download dir)
+  string(
+      COMPARE
+      NOTEQUAL
+      "$ENV{HUNTER_DISABLE_AUTOINSTALL}"
+      ""
+      disable_autoinstall
+  )
+  if(disable_autoinstall AND NOT HUNTER_RUN_INSTALL)
+    hunter_gate_fatal_error(
+        "Hunter not found in '${dir}'"
+        "Set HUNTER_RUN_INSTALL=ON to auto-install it from '${HUNTER_GATE_URL}'"
+        "Settings:"
+        "  HUNTER_ROOT: ${HUNTER_GATE_ROOT}"
+        "  HUNTER_SHA1: ${HUNTER_GATE_SHA1}"
+        ERROR_PAGE "error.run.install"
+    )
+  endif()
+  string(COMPARE EQUAL "${dir}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("Empty 'dir' argument")
+  endif()
+
+  string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("HUNTER_GATE_SHA1 empty")
+  endif()
+
+  string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" is_bad)
+  if(is_bad)
+    hunter_gate_internal_error("HUNTER_GATE_URL empty")
+  endif()
+
+  set(done_location "${dir}/DONE")
+  set(sha1_location "${dir}/SHA1")
+
+  set(build_dir "${dir}/Build")
+  set(cmakelists "${dir}/CMakeLists.txt")
+
+  hunter_gate_status_debug("Locking directory: ${dir}")
+  file(LOCK "${dir}" DIRECTORY GUARD FUNCTION)
+  hunter_gate_status_debug("Lock done")
+
+  if(EXISTS "${done_location}")
+    # while waiting for lock other instance can do all the job
+    hunter_gate_status_debug("File '${done_location}' found, skip install")
+    return()
+  endif()
+
+  file(REMOVE_RECURSE "${build_dir}")
+  file(REMOVE_RECURSE "${cmakelists}")
+
+  file(MAKE_DIRECTORY "${build_dir}") # check directory permissions
+
+  # Disabling languages speeds up a little bit, reduces noise in the output
+  # and avoids path too long windows error
+  file(
+      WRITE
+      "${cmakelists}"
+      "cmake_minimum_required(VERSION 3.2)\n"
+      "project(HunterDownload LANGUAGES NONE)\n"
+      "include(ExternalProject)\n"
+      "ExternalProject_Add(\n"
+      "    Hunter\n"
+      "    URL\n"
+      "    \"${HUNTER_GATE_URL}\"\n"
+      "    URL_HASH\n"
+      "    SHA1=${HUNTER_GATE_SHA1}\n"
+      "    DOWNLOAD_DIR\n"
+      "    \"${dir}\"\n"
+      "    TLS_VERIFY\n"
+      "    ${HUNTER_TLS_VERIFY}\n"
+      "    SOURCE_DIR\n"
+      "    \"${dir}/Unpacked\"\n"
+      "    CONFIGURE_COMMAND\n"
+      "    \"\"\n"
+      "    BUILD_COMMAND\n"
+      "    \"\"\n"
+      "    INSTALL_COMMAND\n"
+      "    \"\"\n"
+      ")\n"
+  )
+
+  if(HUNTER_STATUS_DEBUG)
+    set(logging_params "")
+  else()
+    set(logging_params OUTPUT_QUIET)
+  endif()
+
+  hunter_gate_status_debug("Run generate")
+
+  # Need to add toolchain file too.
+  # Otherwise on Visual Studio + MDD this will fail with error:
+  # "Could not find an appropriate version of the Windows 10 SDK installed on this machine"
+  if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
+    get_filename_component(absolute_CMAKE_TOOLCHAIN_FILE "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE)
+    set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=${absolute_CMAKE_TOOLCHAIN_FILE}")
+  else()
+    # 'toolchain_arg' can't be empty
+    set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=")
+  endif()
+
+  string(COMPARE EQUAL "${CMAKE_MAKE_PROGRAM}" "" no_make)
+  if(no_make)
+    set(make_arg "")
+  else()
+    # Test case: remove Ninja from PATH but set it via CMAKE_MAKE_PROGRAM
+    set(make_arg "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}")
+  endif()
+
+  execute_process(
+      COMMAND
+      "${CMAKE_COMMAND}"
+      "-H${dir}"
+      "-B${build_dir}"
+      "-G${CMAKE_GENERATOR}"
+      "${toolchain_arg}"
+      ${make_arg}
+      WORKING_DIRECTORY "${dir}"
+      RESULT_VARIABLE download_result
+      ${logging_params}
+  )
+
+  if(NOT download_result EQUAL 0)
+    hunter_gate_internal_error(
+        "Configure project failed."
+        "To reproduce the error run: ${CMAKE_COMMAND} -H${dir} -B${build_dir} -G${CMAKE_GENERATOR} ${toolchain_arg} ${make_arg}"
+        "In directory ${dir}"
+    )
+  endif()
+
+  hunter_gate_status_print(
+      "Initializing Hunter workspace (${HUNTER_GATE_SHA1})"
+      "  ${HUNTER_GATE_URL}"
+      "  -> ${dir}"
+  )
+  execute_process(
+      COMMAND "${CMAKE_COMMAND}" --build "${build_dir}"
+      WORKING_DIRECTORY "${dir}"
+      RESULT_VARIABLE download_result
+      ${logging_params}
+  )
+
+  if(NOT download_result EQUAL 0)
+    hunter_gate_internal_error("Build project failed")
+  endif()
+
+  file(REMOVE_RECURSE "${build_dir}")
+  file(REMOVE_RECURSE "${cmakelists}")
+
+  file(WRITE "${sha1_location}" "${HUNTER_GATE_SHA1}")
+  file(WRITE "${done_location}" "DONE")
+
+  hunter_gate_status_debug("Finished")
+endfunction()
+
+# Must be a macro so master file 'cmake/Hunter' can
+# apply all variables easily just by 'include' command
+# (otherwise PARENT_SCOPE magic needed)
+macro(HunterGate)
+  if(HUNTER_GATE_DONE)
+    # variable HUNTER_GATE_DONE set explicitly for external project
+    # (see `hunter_download`)
+    set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES)
+  endif()
+
+  # First HunterGate command will init Hunter, others will be ignored
+  get_property(_hunter_gate_done GLOBAL PROPERTY HUNTER_GATE_DONE SET)
+
+  if(NOT HUNTER_ENABLED)
+    # Empty function to avoid error "unknown function"
+    function(hunter_add_package)
+    endfunction()
+
+    set(
+        _hunter_gate_disabled_mode_dir
+        "${CMAKE_CURRENT_LIST_DIR}/cmake/Hunter/disabled-mode"
+    )
+    if(EXISTS "${_hunter_gate_disabled_mode_dir}")
+      hunter_gate_status_debug(
+          "Adding \"disabled-mode\" modules: ${_hunter_gate_disabled_mode_dir}"
+      )
+      list(APPEND CMAKE_PREFIX_PATH "${_hunter_gate_disabled_mode_dir}")
+    endif()
+  elseif(_hunter_gate_done)
+    hunter_gate_status_debug("Secondary HunterGate (use old settings)")
+    hunter_gate_self(
+        "${HUNTER_CACHED_ROOT}"
+        "${HUNTER_VERSION}"
+        "${HUNTER_SHA1}"
+        _hunter_self
+    )
+    include("${_hunter_self}/cmake/Hunter")
+  else()
+    set(HUNTER_GATE_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}")
+
+    string(COMPARE NOTEQUAL "${PROJECT_NAME}" "" _have_project_name)
+    if(_have_project_name)
+      hunter_gate_fatal_error(
+          "Please set HunterGate *before* 'project' command. "
+          "Detected project: ${PROJECT_NAME}"
+          ERROR_PAGE "error.huntergate.before.project"
+      )
+    endif()
+
+    cmake_parse_arguments(
+        HUNTER_GATE "LOCAL" "URL;SHA1;GLOBAL;FILEPATH" "" ${ARGV}
+    )
+
+    string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" _empty_sha1)
+    string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" _empty_url)
+    string(
+        COMPARE
+        NOTEQUAL
+        "${HUNTER_GATE_UNPARSED_ARGUMENTS}"
+        ""
+        _have_unparsed
+    )
+    string(COMPARE NOTEQUAL "${HUNTER_GATE_GLOBAL}" "" _have_global)
+    string(COMPARE NOTEQUAL "${HUNTER_GATE_FILEPATH}" "" _have_filepath)
+
+    if(_have_unparsed)
+      hunter_gate_user_error(
+          "HunterGate unparsed arguments: ${HUNTER_GATE_UNPARSED_ARGUMENTS}"
+      )
+    endif()
+    if(_empty_sha1)
+      hunter_gate_user_error("SHA1 suboption of HunterGate is mandatory")
+    endif()
+    if(_empty_url)
+      hunter_gate_user_error("URL suboption of HunterGate is mandatory")
+    endif()
+    if(_have_global)
+      if(HUNTER_GATE_LOCAL)
+        hunter_gate_user_error("Unexpected LOCAL (already has GLOBAL)")
+      endif()
+      if(_have_filepath)
+        hunter_gate_user_error("Unexpected FILEPATH (already has GLOBAL)")
+      endif()
+    endif()
+    if(HUNTER_GATE_LOCAL)
+      if(_have_global)
+        hunter_gate_user_error("Unexpected GLOBAL (already has LOCAL)")
+      endif()
+      if(_have_filepath)
+        hunter_gate_user_error("Unexpected FILEPATH (already has LOCAL)")
+      endif()
+    endif()
+    if(_have_filepath)
+      if(_have_global)
+        hunter_gate_user_error("Unexpected GLOBAL (already has FILEPATH)")
+      endif()
+      if(HUNTER_GATE_LOCAL)
+        hunter_gate_user_error("Unexpected LOCAL (already has FILEPATH)")
+      endif()
+    endif()
+
+    hunter_gate_detect_root() # set HUNTER_GATE_ROOT
+
+    # Beautify path, fix probable problems with windows path slashes
+    get_filename_component(
+        HUNTER_GATE_ROOT "${HUNTER_GATE_ROOT}" ABSOLUTE
+    )
+    hunter_gate_status_debug("HUNTER_ROOT: ${HUNTER_GATE_ROOT}")
+    if(NOT HUNTER_ALLOW_SPACES_IN_PATH)
+      string(FIND "${HUNTER_GATE_ROOT}" " " _contain_spaces)
+      if(NOT _contain_spaces EQUAL -1)
+        hunter_gate_fatal_error(
+            "HUNTER_ROOT (${HUNTER_GATE_ROOT}) contains spaces."
+            "Set HUNTER_ALLOW_SPACES_IN_PATH=ON to skip this error"
+            "(Use at your own risk!)"
+            ERROR_PAGE "error.spaces.in.hunter.root"
+        )
+      endif()
+    endif()
+
+    string(
+        REGEX
+        MATCH
+        "[0-9]+\\.[0-9]+\\.[0-9]+[-_a-z0-9]*"
+        HUNTER_GATE_VERSION
+        "${HUNTER_GATE_URL}"
+    )
+    string(COMPARE EQUAL "${HUNTER_GATE_VERSION}" "" _is_empty)
+    if(_is_empty)
+      set(HUNTER_GATE_VERSION "unknown")
+    endif()
+
+    hunter_gate_self(
+        "${HUNTER_GATE_ROOT}"
+        "${HUNTER_GATE_VERSION}"
+        "${HUNTER_GATE_SHA1}"
+        _hunter_self
+    )
+
+    set(_master_location "${_hunter_self}/cmake/Hunter")
+    if(EXISTS "${HUNTER_GATE_ROOT}/cmake/Hunter")
+      # Hunter downloaded manually (e.g. by 'git clone')
+      set(_unused "xxxxxxxxxx")
+      set(HUNTER_GATE_SHA1 "${_unused}")
+      set(HUNTER_GATE_VERSION "${_unused}")
+    else()
+      get_filename_component(_archive_id_location "${_hunter_self}/.." ABSOLUTE)
+      set(_done_location "${_archive_id_location}/DONE")
+      set(_sha1_location "${_archive_id_location}/SHA1")
+
+      # Check Hunter already downloaded by HunterGate
+      if(NOT EXISTS "${_done_location}")
+        hunter_gate_download("${_archive_id_location}")
+      endif()
+
+      if(NOT EXISTS "${_done_location}")
+        hunter_gate_internal_error("hunter_gate_download failed")
+      endif()
+
+      if(NOT EXISTS "${_sha1_location}")
+        hunter_gate_internal_error("${_sha1_location} not found")
+      endif()
+      file(READ "${_sha1_location}" _sha1_value)
+      string(TOLOWER "${_sha1_value}" _sha1_value_lower)
+      string(TOLOWER "${HUNTER_GATE_SHA1}" _HUNTER_GATE_SHA1_lower)
+      string(COMPARE EQUAL "${_sha1_value_lower}" "${_HUNTER_GATE_SHA1_lower}" _is_equal)
+      if(NOT _is_equal)
+        hunter_gate_internal_error(
+            "Short SHA1 collision:"
+            "  ${_sha1_value} (from ${_sha1_location})"
+            "  ${HUNTER_GATE_SHA1} (HunterGate)"
+        )
+      endif()
+      if(NOT EXISTS "${_master_location}")
+        hunter_gate_user_error(
+            "Master file not found:"
+            "  ${_master_location}"
+            "try to update Hunter/HunterGate"
+        )
+      endif()
+    endif()
+    include("${_master_location}")
+    set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES)
+  endif()
+endmacro()

CMakeModules/nel.cmake

@@ -121,6 +121,22 @@ MACRO(NL_ADD_RUNTIME_FLAGS name)
 ENDMACRO(NL_ADD_RUNTIME_FLAGS)
 
 MACRO(NL_ADD_STATIC_VID_DRIVERS name)
+IF(HUNTER_ENABLED)
+  IF(WIN32)
+    SET(drv_suffix "_win")
+  ELSE()
+    SET(drv_suffix "")
+  ENDIF()
+  IF(WIN32 AND WITH_DRIVER_DIRECT3D)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_direct3d${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_OPENGL)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_opengl${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_OPENGLES)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_opengles${drv_suffix})
+  ENDIF()
+ELSE()
   IF(WITH_STATIC_DRIVERS)
     IF(WIN32)
       IF(WITH_DRIVER_DIRECT3D)
@@ -144,9 +160,29 @@ MACRO(NL_ADD_STATIC_VID_DRIVERS name)
       ENDIF()
     ENDIF()
   ENDIF()
+ENDIF()#hunter
 ENDMACRO(NL_ADD_STATIC_VID_DRIVERS)
 
 MACRO(NL_ADD_STATIC_SND_DRIVERS name)
+IF(HUNTER_ENABLED)
+  IF(WIN32)
+    SET(drv_suffix "_win")
+  ELSE()
+    SET(drv_suffix "")
+  ENDIF()
+  IF(WIN32 AND WITH_DRIVER_DSOUND)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_dsound${drv_suffix})
+  ENDIF()
+  IF(WIN32 AND WITH_DRIVER_XAUDIO2)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_xaudio2${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_FMOD)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_fmod${drv_suffix})
+  ENDIF()
+  IF(WITH_DRIVER_OPENAL)
+    TARGET_LINK_LIBRARIES(${name} nel_drv_openal${drv_suffix})
+  ENDIF()
+ELSE()
   IF(WITH_STATIC_DRIVERS)
     IF(WIN32)
       IF(WITH_DRIVER_DSOUND)
@@ -175,6 +211,7 @@ MACRO(NL_ADD_STATIC_SND_DRIVERS name)
     ENDIF()
 
   ENDIF()
+ENDIF() #hunter
 ENDMACRO(NL_ADD_STATIC_SND_DRIVERS)
 
 ###
@@ -356,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)
@@ -1196,7 +1232,11 @@ MACRO(SETUP_EXTERNAL)
   ENDIF()
 
   IF(WIN32)
-    FIND_PACKAGE(External REQUIRED)
+    IF (HUNTER_ENABLED)
+      FIND_PACKAGE(External QUIET)
+    ELSE()
+      FIND_PACKAGE(External REQUIRED)
+    ENDIF()
 
     # If using custom boost, we need to define the right variables used by official boost CMake module
     IF(DEFINED BOOST_DIR)
@@ -1239,7 +1279,7 @@ MACRO(SETUP_EXTERNAL)
 
   IF(WIN32)
     # Must include DXSDK before WINSDK
-    FIND_PACKAGE(DirectXSDK REQUIRED)
+    FIND_PACKAGE(DirectXSDK)
     # IF(DXSDK_INCLUDE_DIR)
     #   INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
     # ENDIF()
@@ -1248,5 +1288,8 @@ MACRO(SETUP_EXTERNAL)
   IF(MSVC)
     FIND_PACKAGE(MSVC REQUIRED)
     FIND_PACKAGE(WindowsSDK REQUIRED)
+    IF(NOT DXSDK_DIR)
+      MESSAGE(FATAL_ERROR "DirectX SDK or DirectX files from Windows SDK not found.")
+    ENDIF()
   ENDIF()
 ENDMACRO()

azure-pipelines.yml

@@ -77,3 +77,88 @@ jobs:
         cd build
         make -j`nproc`
       displayName: 'Make'
+  - job: windows2019
+    timeoutInMinutes: 120
+    pool:
+      vmImage: 'windows-2019'
+    steps:
+    - checkout: self
+      fetchDepth: 1
+    - task: Cache@2
+      inputs:
+        key: 'hunter-win2019-x64-rel'
+        path: "c:/.hunter/_Base/Cache"
+    - task: CmdLine@2
+      inputs:
+        script: |
+          aria2c https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe
+          7z x DXSDK_Jun10.exe -oC:\ -r -y
+          del DXSDK_Jun10.exe
+    - task: CMake@1
+      inputs:
+        workingDirectory: build.release
+        cmakeArgs: '-DCMAKE_CONFIGURATION_TYPES=Release -DHUNTER_ENABLED=ON -DHUNTER_CONFIGURATION_TYPES=Release -DFINAL_VERSION=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_NEL_TOOLS=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_DRIVER_DIRECT3D=ON -DWITH_DRIVER_XAUDIO2=ON -DDXSDK_DIR=C:/DXSDK ..'
+    - task: MSBuild@1
+      inputs:
+        solution: build.release/ALL_BUILD.vcxproj
+        maximumCpuCount: true
+        configuration: release
+        platform: 'x64'
+  - job: ubuntu18hunter
+    timeoutInMinutes: 120
+    pool:
+      vmImage: ubuntu-18.04
+    steps:
+    - checkout: self
+      fetchDepth: 0
+    - script: |
+        sudo apt-get update
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libasound2-dev libgl1-mesa-dev libjack-dev libpulse-dev libxrandr-dev libxrender-dev libxxf86vm-dev
+      displayName: 'Dependencies'
+    - task: Cache@2
+      inputs:
+        key: 'hunter317-ubuntu18-rel"'
+        path: "$(Pipeline.Workspace)/.hunter/_Base/Cache"
+    - script: |
+        mkdir build.release
+        cmake --version
+        cd build.release
+        unset SYSTEM
+        export MAKEFLAGS=-j`nproc`
+        cmake -DCMAKE_BUILD_TYPE=Release -DHUNTER_ENABLED=ON -DHUNTER_CONFIGURATION_TYPES=Release -DHUNTER_ROOT="$(Pipeline.Workspace)/.hunter" -DFINAL_VERSION=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_NEL_TOOLS=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON ..
+      displayName: 'CMake, release'
+    - script: |
+        cd build.release
+        make -j`nproc`
+      displayName: 'Make, release'
+    #- task: PublishPipelineArtifact@1
+    #  inputs:
+    #    targetPath: build.release/bin
+    #    artifactName: RyzomUbuntu18Release
+  - job: macOS11
+    timeoutInMinutes: 120
+    pool:
+      vmImage: 'macOS-11'
+    steps:
+    - checkout: self
+      fetchDepth: 0
+    - task: Cache@2
+      inputs:
+        key: 'hunter317-macOS11-rel"'
+        path: "$(Pipeline.Workspace)/.hunter/_Base/Cache"
+    - task: CMake@1
+      inputs:
+        workingDirectory: build.release
+        cmakeArgs: '-GXcode -DCMAKE_CONFIGURATION_TYPES=Release -DHUNTER_ENABLED=ON -DHUNTER_STATUS_DEBUG=ON -DHUNTER_CONFIGURATION_TYPES=Release -DHUNTER_ROOT="$(Pipeline.Workspace)/.hunter" -DWITH_LIBXML2_ICONV=OFF -DFINAL_VERSION=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_NEL_TOOLS=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_DRIVER_DIRECT3D=OFF -DWITH_DRIVER_XAUDIO2=OFF ..'
+    - task: Xcode@5
+      inputs:
+        actions: 'build'
+        configuration: Release
+        sdk: macosx12.0
+        xcWorkspacePath: 'build.release/RyzomCore.xcodeproj'
+        scheme: 'ALL_BUILD'
+        packageApp: false
+    #- task: PublishPipelineArtifact@1
+    #  inputs:
+    #    targetPath: build.release/bin/
+    #    artifactName: RyzomClientMacOS11Release

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/CMakeLists.txt

@@ -10,14 +10,20 @@ IF(WIN32)
 ENDIF()
 
 IF(WITH_3D)
-  FIND_PACKAGE(FreeType)
+  IF(HUNTER_ENABLED)
+    HUNTER_ADD_PACKAGE(freetype)
+    FIND_PACKAGE(freetype CONFIG REQUIRED)
+    SET(FREETYPE_LIBRARIES freetype::freetype)
+  ELSE()
+    FIND_PACKAGE(FreeType)
+  ENDIF() #hunter
 
   IF(WITH_NEL_CEGUI)
     FIND_PACKAGE(CEGUI)
   ENDIF()
 ENDIF()
 
-IF(WITH_SOUND)
+IF(WITH_SOUND AND NOT HUNTER_ENABLED)
   FIND_PACKAGE(Ogg)
   FIND_PACKAGE(Vorbis)
   IF(WITH_FFMPEG)

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;
 
@@ -972,6 +969,7 @@ namespace NLGUI
 
 		// stop all curl downalods (html and data)
 		void releaseDownloads();
+		void releaseDataDownloads();
 		void checkDownloads();
 
 		// _CurlWWW download finished

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);
@@ -524,8 +524,6 @@ namespace NLGUI
 		void parseSizeParent( const std::string &id );
 		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/view_text.h

@@ -119,8 +119,8 @@ namespace NLGUI
 		void enableStringSelection(uint start, uint end);
 		void disableStringSelection();
 
-		/// Get
-		std::string		getText() const { return _HardText.empty() ? _Text : _HardText; }
+		/// Get displayed text
+		std::string		getText() const { return _Text; }
 #ifdef RYZOM_LUA_UCSTRING
 		ucstring		getTextAsUtf16() const; // Compatibility
 		ucstring		getHardTextAsUtf16() const; // Compatibility
@@ -188,6 +188,7 @@ namespace NLGUI
 		/// From a line number, get the character at which it ends (not including any '\n' ), or -1 if invalid
 		void getLineEndIndex(uint line, sint &index, bool &endOfPreviousLine) const;
 
+		/// If localized, return localization key (ie "uiLanguage"), else return displayed text.
 		std::string getHardText() const { return _HardText.empty() ? _Text : _HardText; }
 		void        setHardText (const std::string &ht); //< Localizes strings starting with "ui"
 #ifdef RYZOM_LUA_UCSTRING
@@ -282,8 +283,10 @@ namespace NLGUI
 		bool	_FontSizeCoef;
 		bool	_Embolden;
 		bool	_Oblique;
-		// width of the font in pixel. Just a Hint for tabing format (computed with '_')
+		// width of the font in pixel. 
 		float	_FontWidth;
+		// width of tabs
+		float	_TabWidth;
 		// strings to use when computing font size
 		std::string _FontSizingChars;
 		std::string _FontSizingFallback;

nel/include/nel/gui/widget_manager.h

@@ -654,8 +654,6 @@ namespace NLGUI
 		bool _GroupSelection;
 		bool multiSelection;
 		uint32 _WidgetCount;
-
-		std::set<std::string> m_LoggedMissingElement;
 	};
 
 }

nel/include/nel/misc/cdb_leaf.h

@@ -96,6 +96,7 @@ public:
 		_Property = 0;
 		_oldProperty = 0;
 		_Type = UNKNOWN;
+		m_Nullable = false;
 		_Changed = false;
 		_LastChangeGC = 0;
 	}
@@ -235,6 +236,9 @@ private:
 	/// property type
 	EPropType			_Type;
 
+	/// nullable
+	bool				m_Nullable;
+
 	/// true if this value has changed
 	bool				_Changed;
 

nel/include/nel/misc/debug.h

@@ -380,7 +380,7 @@ extern bool _assertex_stop_1(bool &ignoreNextTime);
 #define nlassume(exp) do { } while (0)
 #endif
 
-#ifdef NL_NO_DEBUG
+#ifdef NL_NO_ASSERT
 #	define nlassert(exp) nlassume(exp)
 #	define nlassertonce(exp) nlassume(exp)
 #	define nlassertex(exp, str) nlassume(exp)

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/factory.h

@@ -71,8 +71,11 @@ public:
 	 */
 	void registerClass(const KeyType &key, IFactoryRegister<BaseClass> *factoryRegister)
 	{
-		nlassert(_FactoryRegisters.find(key) == _FactoryRegisters.end());
-		_FactoryRegisters.insert(std::make_pair(key, factoryRegister));
+		// TODO: Removed assert because of crash of fes in 2019. We need found why... (ulukyn)
+		//nlassert(_FactoryRegisters.find(key) == _FactoryRegisters.end());
+		//_FactoryRegisters.insert(std::make_pair(key, factoryRegister));
+		if (_FactoryRegisters.find(key) == _FactoryRegisters.end())
+			_FactoryRegisters.insert(std::make_pair(key, factoryRegister));
 	}
 
 	/** Create a new instance of a factorable object.

nel/include/nel/misc/types_nl.h

@@ -274,7 +274,7 @@
 
 //#define NL_NO_DEBUG
 #undef NL_NO_DEBUG
-
+#define NL_NO_ASSERT
 
 // Standard types
 

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/samples/3d/font/CMakeLists.txt

@@ -4,6 +4,7 @@ ADD_EXECUTABLE(nl_sample_font WIN32 ${SRC})
 
 ADD_DEFINITIONS(-DFONT_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_font/\\"")
 
+# TODO: hunter TARGET_LINK_LIBRARIES(nl_sample_font PRIVATE nelmisc nel3d)
 TARGET_LINK_LIBRARIES(nl_sample_font nelmisc nel3d)
 NL_DEFAULT_PROPS(nl_sample_font "NeL, Samples, 3D: Font")
 NL_ADD_RUNTIME_FLAGS(nl_sample_font)

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

@@ -2064,6 +2064,8 @@ bool CDriverGL::setMode(const GfxMode& amode)
 		// if window is visible, then also restore mouse relative position.
 		if (!mode.DisplayDevice.empty() && mode.DisplayDevice != current.DisplayDevice)
 		{
+			setWindowStyle(EWSWindowed);
+
 			int screen = DefaultScreen(_dpy);
 			Window root = RootWindow(_dpy, screen);
 			uint mouseX = mode.Width / 2;
@@ -2090,6 +2092,7 @@ bool CDriverGL::setMode(const GfxMode& amode)
 			XMoveWindow(_dpy, _win, newX, newY);
 			_WindowX = newX;
 			_WindowY = newY;
+			setWindowStyle(EWSFullscreen);
 		}
 	}
 #endif
@@ -3105,13 +3108,24 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
 	SetWindowPos(_win, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, flags);
 
 	// init window width and height
-	RECT clientRect;
-	GetClientRect(_win, &clientRect);
-	_CurrentMode.Width = uint16(clientRect.right-clientRect.left);
-	_CurrentMode.Height = uint16(clientRect.bottom-clientRect.top);
-	GetWindowRect(_win, &clientRect);
-	_WindowX = clientRect.left;
-	_WindowY = clientRect.top;
+	if (_CurrentMode.Windowed)
+	{
+		// TODO: this gives wrong info for initial fullscreen window so limit for windowed only for now
+		RECT clientRect;
+		GetClientRect(_win, &clientRect);
+		_CurrentMode.Width = uint16(clientRect.right-clientRect.left);
+		_CurrentMode.Height = uint16(clientRect.bottom-clientRect.top);
+		GetWindowRect(_win, &clientRect);
+		_WindowX = clientRect.left;
+		_WindowY = clientRect.top;
+	}
+	else
+	{
+		_CurrentMode.Width = width;
+		_CurrentMode.Height = height;
+		_WindowX = 0;
+		_WindowY = 0;
+	}
 
 #elif defined(NL_OS_MAC)
 

nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp

@@ -152,7 +152,7 @@ static NLMISC::TKey virtualKeycodeToNelKey(unsigned short keycode)
 	return NLMISC::KeyNOKEY;
 }
 
-bool CCocoaEventEmitter::pasteTextFromClipboard(ucstring &text)
+bool CCocoaEventEmitter::pasteTextFromClipboard(std::string &text)
 {
 	NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
 	NSArray *classArray = [NSArray arrayWithObject:[NSString class]];
@@ -163,17 +163,17 @@ bool CCocoaEventEmitter::pasteTextFromClipboard(ucstring &text)
 	{
 		NSArray *objectsToPaste = [pasteboard readObjectsForClasses:classArray options:options];
 		NSString *nstext = [objectsToPaste objectAtIndex:0];
-		text.fromUtf8([nstext UTF8String]);
+		text = [nstext UTF8String];
 		return true;
 	}
 	return false;
 }
 
-bool CCocoaEventEmitter::copyTextToClipboard(const ucstring &text)
+bool CCocoaEventEmitter::copyTextToClipboard(const std::string &text)
 {
 	NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
 	[pasteboard clearContents];
-	NSArray *copiedObjects = [NSArray arrayWithObject:[NSString stringWithUTF8String:text.toUtf8().c_str()]];
+	NSArray *copiedObjects = [NSArray arrayWithObject:[NSString stringWithUTF8String:text.c_str()]];
 	[pasteboard writeObjects:copiedObjects];
 	return true;
 }

nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h

@@ -21,6 +21,7 @@
 #ifndef NL_COCOA_EVENT_EMITTER_H
 #define NL_COCOA_EVENT_EMITTER_H
 
+#include <string.h>
 #include "nel/misc/event_emitter.h"
 #include "nel/misc/event_server.h"
 #include "nel/misc/events.h"
@@ -53,8 +54,8 @@ public:
 	virtual void submitEvents(CEventServer& server, bool allWindows);
 	bool         handleQuitRequest();
 
-	virtual bool copyTextToClipboard(const ucstring &text);
-	virtual bool pasteTextFromClipboard(ucstring &text);
+	virtual bool copyTextToClipboard(const std::string &text);
+	virtual bool pasteTextFromClipboard(std::string &text);
 };
 
 }

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

@@ -299,6 +299,11 @@ namespace NLGUI
 
 	void CGroupHTML::ImageDownloadCB::finish()
 	{
+		// Image setTexture will remove itself from Images while iterating over it.
+		// Do the swap to keep iterator safe.
+		std::vector<SImageInfo> vec;
+		vec.swap(Images);
+
 		// tmpdest file does not exist if download skipped (ie cache was used)
 		if (CFile::fileExists(tmpdest) || CFile::getFileSize(tmpdest) == 0)
 		{
@@ -322,7 +327,7 @@ namespace NLGUI
 			// to temp file temporarily. that forces driver to reload texture from disk
 			// ITexture::touch() seem not to do this.
 			// cache was updated, first set texture as temp file
-			for(std::vector<SImageInfo>::iterator it = Images.begin(); it != Images.end(); ++it)
+			for(std::vector<SImageInfo>::iterator it = vec.begin(); it != vec.end(); ++it)
 			{
 				SImageInfo &img = *it;
 				Parent->setImage(img.Image, tmpdest, img.Type);
@@ -339,7 +344,7 @@ namespace NLGUI
 		}
 
 		// even if image was cached, incase there was 'http://' image set to CViewBitmap
-		for(std::vector<SImageInfo>::iterator it = Images.begin(); it != Images.end(); ++it)
+		for(std::vector<SImageInfo>::iterator it = vec.begin(); it != vec.end(); ++it)
 		{
 			SImageInfo &img = *it;
 			Parent->setImage(img.Image, dest, img.Type);
@@ -403,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();
 	}
 
@@ -1056,6 +1058,13 @@ namespace NLGUI
 			_CurlWWW = NULL;
 		}
 
+		releaseDataDownloads();
+	}
+
+	void CGroupHTML::releaseDataDownloads()
+	{
+		LOG_DL("Clear pointers to %d curls", Curls.size());
+
 		// remove all queued and already started downloads
 		for(std::list<CDataDownload*>::iterator it = Curls.begin(); it != Curls.end(); ++it)
 		{
@@ -3083,14 +3092,7 @@ namespace NLGUI
 
 		paragraphChange ();
 
-		// clear the pointer to the current image download since all the button are deleted
-		LOG_DL("Clear pointers to %d curls", Curls.size());
-
-		// remove image refs from downloads
-		/*for(std::list<CDataDownload>::iterator it = Curls.begin(); it != Curls.end(); ++it)
-		{
-			it->imgs.clear();
-		}*/
+		releaseDataDownloads();
 	}
 
 	// ***************************************************************************
@@ -3419,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/lua_ihm.cpp

@@ -1123,7 +1123,6 @@ namespace NLGUI
 		if(!pIE)
 		{
 			ls.pushNil();
-			nlerror("getCurrentWindowUnder(): No UICaller found. return Nil");
 		}
 		else
 		{
@@ -1672,7 +1671,7 @@ namespace NLGUI
 		ls.registerFunc("runFct",    runFct);
 		ls.registerFunc("runCommand",    runCommand);
 		ls.registerFunc("getPathContent", getPathContent);
-		
+
 		// Through LUABind API
 		lua_State	*L= ls.getStatePointer();
 

nel/src/gui/lua_manager.cpp

@@ -70,7 +70,17 @@ namespace NLGUI
 		}
 		catch( const ELuaError &e )
 		{
-			nlwarning( e.luaWhat().c_str() );
+			#if !FINAL_VERSION
+			nlwarning("--- LUA ERROR ---");
+			nlwarning(e.luaWhat().c_str());
+			std::vector<std::string> res;
+			NLMISC::explode(luaScript, std::string("\n"), res);
+			for(uint k = 0; k < res.size(); ++k)
+			{
+				nlwarning("%.05u %s", k, res[k].c_str());
+			}
+			nlwarning("--- ********* ---");
+			#endif
 			return false;
 		}
 

nel/src/gui/view_bitmap.cpp

@@ -481,7 +481,13 @@ namespace NLGUI
 		}
 		else
 		{
-			_HtmlDownload = NULL;
+			if (_HtmlDownload)
+			{
+				CGroupHTML *groupHtml = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:webig:content:html"));
+				if (groupHtml)
+					groupHtml->removeImageDownload(_HtmlDownload, dynamic_cast<CViewBase*>(this));
+				_HtmlDownload = NULL;
+			}
 			_TextureId.setTexture (TxName.c_str (), _TxtOffsetX, _TxtOffsetY, _TxtWidth, _TxtHeight, false);
 		}
 	}

nel/src/gui/view_text.cpp

@@ -95,6 +95,7 @@ namespace NLGUI
 		_FontWidth= 0;
 		_FontHeight = 0;
 		_FontLegHeight = 0;
+		_TabWidth= 0;
 
 		_TextSelection= false;
 		_TextSelectionStart= 0;
@@ -1284,7 +1285,7 @@ namespace NLGUI
 					px += firstSpace;
 					// skip tabulation before current word
 					if(currWord.Format.TabX)
-						px= max(px, (float)(_XReal * _Scale + currWord.Format.TabX*_FontWidth));
+						px= max(px, (float)(_XReal * _Scale + currWord.Format.TabX*_TabWidth));
 
 					// draw. We take floorf px to avoid filtering of letters that are not located on a pixel boundary
 					float fx = px / _Scale;
@@ -1468,7 +1469,7 @@ namespace NLGUI
 			}
 		}
 
-		nlassert(_Text.empty() || ((_Localized && (NLMISC::startsWith(getText(), "ui"))) == (_HardText.empty() == _Text.empty())));
+		nlassert(_Text.empty() || ((_Localized && (NLMISC::startsWith(getHardText(), "ui"))) == (_HardText.empty() == _Text.empty())));
 	}
 
 	// ***************************************************************************
@@ -1767,7 +1768,7 @@ namespace NLGUI
 				getFormatTagChange(i, formatTagIndex, wordFormat);
 
 				// Ensure the line witdh count the tab
-				rWidthCurrentLine= max(rWidthCurrentLine, (float)wordFormat.TabX*_FontWidth);
+				rWidthCurrentLine= max(rWidthCurrentLine, (float)wordFormat.TabX*_TabWidth);
 			}
 
 			NL3D::UTextContext *TextContext = CViewRenderer::getTextContext(_FontName);
@@ -1951,7 +1952,7 @@ namespace NLGUI
 
 				// compute size of spaces/Tab + word
 				newLineWidth = lineWidth + numSpaces * _SpaceWidth;
-				newLineWidth = max(newLineWidth, (float)wordFormat.TabX*_FontWidth);
+				newLineWidth = max(newLineWidth, (float)wordFormat.TabX*_TabWidth);
 				newLineWidth+= si.StringWidth;
 			}
 			//
@@ -3113,8 +3114,6 @@ namespace NLGUI
 		TextContext->setEmbolden (_Embolden);
 		TextContext->setOblique (_Oblique);
 
-#if 1
-
 		UTextContext::CStringInfo si = TextContext->getStringInfo("XO");
 		float xoHeight = si.StringHeight;
 
@@ -3145,34 +3144,14 @@ namespace NLGUI
 		si = TextContext->getStringInfo(" ");
 		_SpaceWidth = si.StringWidth;
 
-		// Font Width (used for <tab>)
+		// Font Width
 		si = TextContext->getStringInfo("O");
 		_FontWidth = si.StringWidth;
 
-#else
-
-		// Letter size
-		UTextContext::CStringInfo si = TextContext->getStringInfo(_FontSizingChars);
-
-		// font generator changes unknown glyphs to dot '.'. use fallback if it looks odd
-		if (_FontSize > (si.StringHeight + si.StringLine))
-		{
-			si = TextContext->getStringInfo(_FontSizingFallback);
-		}
-
-		// add a padding of 1 pixel else the top will be truncated
-		_FontHeight = si.StringHeight + 1;
-		_FontLegHeight = si.StringLine;
-
-		// Space width
-		si = TextContext->getStringInfo(" ");
-		_SpaceWidth = si.StringWidth;
-
-		// Font Width (used for <tab>)
+		//  Tab Width (used for {Txx})
+		// if not set to "_", breaks item help window
 		si = TextContext->getStringInfo("_");
-		_FontWidth = si.StringWidth;
-
-#endif
+		_TabWidth = si.StringWidth;
 	}
 
 
@@ -3641,6 +3620,7 @@ namespace NLGUI
 		f.serial(_Localized);
 		SERIAL_SINT(_FontSize);
 		SERIAL_UINT(_FontWidth);
+		SERIAL_UINT(_TabWidth);
 		SERIAL_UINT(_FontHeight);
 		SERIAL_UINT(_FontLegHeight);
 		f.serial(_SpaceWidth);

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;
 	}

nel/src/misc/CMakeLists.txt

@@ -183,6 +183,21 @@ IF(WITH_GTK)
   ENDIF()
 ENDIF()
 
+IF(HUNTER_ENABLED)
+  HUNTER_ADD_PACKAGE(Jpeg)
+  FIND_PACKAGE(JPEG CONFIG REQUIRED)
+  SET(JPEG_LIBRARY JPEG::jpeg)
+
+  HUNTER_ADD_PACKAGE(giflib)
+  FIND_PACKAGE(giflib CONFIG REQUIRED)
+  SET(GIF_LIBRARY giflib::giflib)
+
+  HUNTER_ADD_PACKAGE(PNG)
+  FIND_PACKAGE(PNG CONFIG REQUIRED)
+  SET(PNG_LIBRARY   PNG::png)
+  SET(PNG_LIBRARIES PNG::png)
+ENDIF()
+
 IF(JPEG_FOUND)
   INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
   ADD_DEFINITIONS(-DUSE_JPEG)
@@ -202,6 +217,7 @@ ELSE()
   TARGET_LINK_LIBRARIES(nelmisc ${PNG_LIBRARY})
 ENDIF()
 
+#TODO: needed for hunter aswell?
 IF(UNIX)
   TARGET_LINK_LIBRARIES(nelmisc -lc -ldl)
   IF(APPLE)

nel/src/misc/cdb_leaf.cpp

@@ -51,6 +51,18 @@ namespace NLMISC{
 //-----------------------------------------------
 void CCDBNodeLeaf::init(  xmlNodePtr node, IProgressCallback &/* progressCallBack */, bool /* mapBanks */, CCDBBankHandler * /* bankHandler */ )
 {
+	// Read nullable
+	CXMLAutoPtr nullable((const char*)xmlGetProp (node, (xmlChar*)"nullable"));
+	if ((const char *) nullable != NULL)
+	{
+		m_Nullable = (nullable.getDatas()[0] == '1');
+	}
+	else
+	{
+		m_Nullable = false;
+	}
+
+	// Read type
 	CXMLAutoPtr type((const char*)xmlGetProp (node, (xmlChar*)"type"));
 	nlassert((const char *) type != NULL);
 
@@ -141,6 +153,13 @@ void CCDBNodeLeaf::readDelta(TGameCycle gc, CBitMemStream & f )
 	{
 		// Read the Property Value according to the Property Type.
 		uint64 recvd = 0;
+
+		uint64 isNull = 0;
+		if (m_Nullable)
+		{
+			f.serial(isNull, 1);
+		}
+
 		uint bits;
 		if (_Type == TEXT)
 			bits = 32;

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/sound/CMakeLists.txt

@@ -90,6 +90,23 @@ SOURCE_GROUP("user_classes" FILES ${USER_CLASSES})
 
 NL_TARGET_LIB(nelsound ${HEADERS} ${SRC})
 
+IF(HUNTER_ENABLED)
+  HUNTER_ADD_PACKAGE(libogg)
+  FIND_PACKAGE(libogg CONFIG REQUIRED)
+  SET(OGG_LIBRARY libogg::ogg)
+  SET(OGG_LIBRARIES libogg::ogg)
+
+  HUNTER_ADD_PACKAGE(vorbis)
+  FIND_PACKAGE(vorbis CONFIG REQUIRED)
+  SET(VORBIS_LIBRARY vorbis::vorbis)
+  SET(VORBISFILE_LIBRARY vorbis::vorbisfile)
+
+  IF(WITH_FFMPEG)
+    HUNTER_ADD_PACKAGE(ffmpeg)
+    FIND_PACKAGE(ffmpeg CONFIG REQUIRED)
+    SET(FFMPEG_LIBRARIES ffmpeg::avcodec ffmpeg::avformat ffmpeg::avutil ffmpeg::swresample)
+  ENDIF()
+ENDIF()
 
 INCLUDE_DIRECTORIES(${VORBIS_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR})

nel/src/sound/driver/openal/CMakeLists.txt

@@ -26,9 +26,16 @@ SOURCE_GROUP(util FILES
 
 NL_TARGET_DRIVER(${NLDRV_AL_LIB} ${SRC})
 
-INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
+IF(HUNTER_ENABLED)
+  HUNTER_ADD_PACKAGE(OpenAL)
+  FIND_PACKAGE(OpenAL CONFIG REQUIRED)
+  SET(OPENAL_LIBRARY OpenAL::OpenAL)
+  ADD_DEFINITIONS(-DAL_LIBTYPE_STATIC)
+ELSE()
+  INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
+ENDIF()# hunter
 
-TARGET_LINK_LIBRARIES(${NLDRV_AL_LIB} ${OPENAL_LIBRARY} nelmisc nelsnd_lowlevel)
+TARGET_LINK_LIBRARIES(${NLDRV_AL_LIB} nelmisc nelsnd_lowlevel ${OPENAL_LIBRARY})
 NL_DEFAULT_PROPS(${NLDRV_AL_LIB} "NeL, Driver, Sound: OpenAL")
 NL_ADD_RUNTIME_FLAGS(${NLDRV_AL_LIB})
 NL_ADD_LIB_SUFFIX(${NLDRV_AL_LIB})

nel/src/sound/driver/openal/ext_al.cpp

@@ -66,6 +66,7 @@ void alExtInitDevice(ALCdevice *device)
 		}
 	}
 
+#if !defined(AL_LIBTYPE_STATIC)
 // Windows and Mac OS always link to shared OpenAL library
 #if defined(NL_OS_WINDOWS) || defined(NL_OS_MAC) || !defined(NL_STATIC)
 	// EFX
@@ -114,6 +115,7 @@ void alExtInitDevice(ALCdevice *device)
 		}
 	}
 #endif
+#endif
 }
 
 #if EAX_AVAILABLE
@@ -137,6 +139,7 @@ EAXGetBufferMode eaxGetBufferMode = NULL;
 // ALC_EXT_EFX
 bool AlExtEfx = false;
 // effect objects
+#if !defined(AL_LIBTYPE_STATIC)
 #if defined(NL_OS_WINDOWS) || defined(NL_OS_MAC) || !defined(NL_STATIC)
 LPALGENEFXOBJECTS alGenEffects = NULL;
 LPALDELETEEFXOBJECTS alDeleteEffects = NULL;
@@ -174,6 +177,7 @@ LPALGETEFXOBJECTIV alGetAuxiliaryEffectSlotiv = NULL;
 LPALGETEFXOBJECTF alGetAuxiliaryEffectSlotf = NULL;
 LPALGETEFXOBJECTFV alGetAuxiliaryEffectSlotfv = NULL;
 #endif
+#endif
 }
 
 /* end of file */

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/1_export.py

@@ -1,94 +1,94 @@
-#!/usr/bin/python
-# 
-# \file 1_export.py
-# \brief Run all export processes
-# \date 2009-02-18 09:22GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all export processes
-# 
-# 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, argparse
-sys.path.append("configuration")
-
-parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Export')
-# parser.add_argument('--haltonerror', '-eh', action='store_true')
-parser.add_argument('--includeproject', '-ipj', nargs='+')
-parser.add_argument('--excludeproject', '-epj', nargs='+')
-parser.add_argument('--includeprocess', '-ipc', nargs='+')
-parser.add_argument('--excludeprocess', '-epc', nargs='+')
-args = parser.parse_args()
-
-if not args.includeproject == None and not args.excludeproject == None:
-	print "ERROR --includeproject cannot be combined with --excludeproject, exit."
-	exit()
-
-if not args.includeprocess == None and not args.excludeprocess == None:
-	print "ERROR --includeprocess cannot be combined with --excludeprocess, exit."
-	exit()
-
-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, "--- Run the export processes")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-# For each project
-for projectName in ProjectsToProcess:
-	if ((args.includeproject == None or projectName in args.includeproject) and (args.excludeproject == None or not projectName in args.excludeproject)):
-		printLog(log, "PROJECT " + projectName)
-		os.putenv("NELBUILDACTIVEPROJECT", os.path.abspath(WorkspaceDirectory + "/" + projectName))
-		os.chdir("processes")
-		try:
-			if not args.includeprocess == None:
-				subprocess.call([ "python", "1_export.py", "--includeprocess" ] + args.includeprocess)
-			elif not args.excludeprocess == None:
-				subprocess.call([ "python", "1_export.py", "--excludeprocess" ] + args.excludeprocess)
-			else:
-				subprocess.call([ "python", "1_export.py" ])
-		except Exception, e:
-			printLog(log, "<" + projectName + "> " + str(e))
-		os.chdir("..")
-		try:
-			projectLog = open("processes/log.log", "r")
-			projectLogData = projectLog.read()
-			projectLog.close()
-			log.write(projectLogData)
-		except Exception, e:
-			printLog(log, "<" + projectName + "> " + str(e))
-	else:
-		printLog(log, "IGNORE PROJECT " + projectName)
-printLog(log, "")
-
-log.close()
-if os.path.isfile("1_export.log"):
-	os.remove("1_export.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_export.log")
-shutil.move("log.log", "1_export.log")
+#!/usr/bin/python
+# 
+# \file 1_export.py
+# \brief Run all export processes
+# \date 2009-02-18 09:22GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Run all export processes
+# 
+# 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, argparse
+sys.path.append("configuration")
+
+parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Export')
+# parser.add_argument('--haltonerror', '-eh', action='store_true')
+parser.add_argument('--includeproject', '-ipj', nargs='+')
+parser.add_argument('--excludeproject', '-epj', nargs='+')
+parser.add_argument('--includeprocess', '-ipc', nargs='+')
+parser.add_argument('--excludeprocess', '-epc', nargs='+')
+args = parser.parse_args()
+
+if not args.includeproject == None and not args.excludeproject == None:
+	print "ERROR --includeproject cannot be combined with --excludeproject, exit."
+	exit()
+
+if not args.includeprocess == None and not args.excludeprocess == None:
+	print "ERROR --includeprocess cannot be combined with --excludeprocess, exit."
+	exit()
+
+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, "--- Run the export processes")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+# For each project
+for projectName in ProjectsToProcess:
+	if ((args.includeproject == None or projectName in args.includeproject) and (args.excludeproject == None or not projectName in args.excludeproject)):
+		printLog(log, "PROJECT " + projectName)
+		os.putenv("NELBUILDACTIVEPROJECT", os.path.abspath(WorkspaceDirectory + "/" + projectName))
+		os.chdir("processes")
+		try:
+			if not args.includeprocess == None:
+				subprocess.call([ "python", "1_export.py", "--includeprocess" ] + args.includeprocess)
+			elif not args.excludeprocess == None:
+				subprocess.call([ "python", "1_export.py", "--excludeprocess" ] + args.excludeprocess)
+			else:
+				subprocess.call([ "python", "1_export.py" ])
+		except Exception, e:
+			printLog(log, "<" + projectName + "> " + str(e))
+		os.chdir("..")
+		try:
+			projectLog = open("processes/log.log", "r")
+			projectLogData = projectLog.read()
+			projectLog.close()
+			log.write(projectLogData)
+		except Exception, e:
+			printLog(log, "<" + projectName + "> " + str(e))
+	else:
+		printLog(log, "IGNORE PROJECT " + projectName)
+printLog(log, "")
+
+log.close()
+if os.path.isfile("1_export.log"):
+	os.remove("1_export.log")
+shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_export.log")
+shutil.move("log.log", "1_export.log")

nel/tools/build_gamedata/2_build.py

@@ -1,94 +1,94 @@
-#!/usr/bin/python
-# 
-# \file 2_build.py
-# \brief Run all build processes
-# \date 2009-02-18 09:22GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all build processes
-# 
-# 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, argparse
-sys.path.append("configuration")
-
-parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Build')
-# parser.add_argument('--haltonerror', '-eh', action='store_true')
-parser.add_argument('--includeproject', '-ipj', nargs='+')
-parser.add_argument('--excludeproject', '-epj', nargs='+')
-parser.add_argument('--includeprocess', '-ipc', nargs='+')
-parser.add_argument('--excludeprocess', '-epc', nargs='+')
-args = parser.parse_args()
-
-if not args.includeproject == None and not args.excludeproject == None:
-	print "ERROR --includeproject cannot be combined with --excludeproject, exit."
-	exit()
-
-if not args.includeprocess == None and not args.excludeprocess == None:
-	print "ERROR --includeprocess cannot be combined with --excludeprocess, exit."
-	exit()
-
-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, "--- Run the build processes")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-# For each project
-for projectName in ProjectsToProcess:
-	if ((args.includeproject == None or projectName in args.includeproject) and (args.excludeproject == None or not projectName in args.excludeproject)):
-		printLog(log, "PROJECT " + projectName)
-		os.putenv("NELBUILDACTIVEPROJECT", os.path.abspath(WorkspaceDirectory + "/" + projectName))
-		os.chdir("processes")
-		try:
-			if not args.includeprocess == None:
-				subprocess.call([ "python", "2_build.py", "--includeprocess" ] + args.includeprocess)
-			elif not args.excludeprocess == None:
-				subprocess.call([ "python", "2_build.py", "--excludeprocess" ] + args.excludeprocess)
-			else:
-				subprocess.call([ "python", "2_build.py" ])
-		except Exception, e:
-			printLog(log, "<" + projectName + "> " + str(e))
-		os.chdir("..")
-		try:
-			projectLog = open("processes/log.log", "r")
-			projectLogData = projectLog.read()
-			projectLog.close()
-			log.write(projectLogData)
-		except Exception, e:
-			printLog(log, "<" + projectName + "> " + str(e))
-	else:
-		printLog(log, "IGNORE PROJECT " + projectName)
-printLog(log, "")
-
-log.close()
-if os.path.isfile("2_build.log"):
-	os.remove("2_build.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_build.log")
-shutil.move("log.log", "2_build.log")
+#!/usr/bin/python
+# 
+# \file 2_build.py
+# \brief Run all build processes
+# \date 2009-02-18 09:22GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Run all build processes
+# 
+# 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, argparse
+sys.path.append("configuration")
+
+parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Build')
+# parser.add_argument('--haltonerror', '-eh', action='store_true')
+parser.add_argument('--includeproject', '-ipj', nargs='+')
+parser.add_argument('--excludeproject', '-epj', nargs='+')
+parser.add_argument('--includeprocess', '-ipc', nargs='+')
+parser.add_argument('--excludeprocess', '-epc', nargs='+')
+args = parser.parse_args()
+
+if not args.includeproject == None and not args.excludeproject == None:
+	print "ERROR --includeproject cannot be combined with --excludeproject, exit."
+	exit()
+
+if not args.includeprocess == None and not args.excludeprocess == None:
+	print "ERROR --includeprocess cannot be combined with --excludeprocess, exit."
+	exit()
+
+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, "--- Run the build processes")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+# For each project
+for projectName in ProjectsToProcess:
+	if ((args.includeproject == None or projectName in args.includeproject) and (args.excludeproject == None or not projectName in args.excludeproject)):
+		printLog(log, "PROJECT " + projectName)
+		os.putenv("NELBUILDACTIVEPROJECT", os.path.abspath(WorkspaceDirectory + "/" + projectName))
+		os.chdir("processes")
+		try:
+			if not args.includeprocess == None:
+				subprocess.call([ "python", "2_build.py", "--includeprocess" ] + args.includeprocess)
+			elif not args.excludeprocess == None:
+				subprocess.call([ "python", "2_build.py", "--excludeprocess" ] + args.excludeprocess)
+			else:
+				subprocess.call([ "python", "2_build.py" ])
+		except Exception, e:
+			printLog(log, "<" + projectName + "> " + str(e))
+		os.chdir("..")
+		try:
+			projectLog = open("processes/log.log", "r")
+			projectLogData = projectLog.read()
+			projectLog.close()
+			log.write(projectLogData)
+		except Exception, e:
+			printLog(log, "<" + projectName + "> " + str(e))
+	else:
+		printLog(log, "IGNORE PROJECT " + projectName)
+printLog(log, "")
+
+log.close()
+if os.path.isfile("2_build.log"):
+	os.remove("2_build.log")
+shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_build.log")
+shutil.move("log.log", "2_build.log")

nel/tools/build_gamedata/3_install.py

@@ -1,94 +1,94 @@
-#!/usr/bin/python
-# 
-# \file 3_install.py
-# \brief Run all install processes
-# \date 2009-02-18 16:19GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all install processes
-# 
-# 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, argparse
-sys.path.append("configuration")
-
-parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Install')
-# parser.add_argument('--haltonerror', '-eh', action='store_true')
-parser.add_argument('--includeproject', '-ipj', nargs='+')
-parser.add_argument('--excludeproject', '-epj', nargs='+')
-parser.add_argument('--includeprocess', '-ipc', nargs='+')
-parser.add_argument('--excludeprocess', '-epc', nargs='+')
-args = parser.parse_args()
-
-if not args.includeproject == None and not args.excludeproject == None:
-	print "ERROR --includeproject cannot be combined with --excludeproject, exit."
-	exit()
-
-if not args.includeprocess == None and not args.excludeprocess == None:
-	print "ERROR --includeprocess cannot be combined with --excludeprocess, exit."
-	exit()
-
-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, "--- Run the install processes")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-# For each project
-for projectName in ProjectsToProcess:
-	if ((args.includeproject == None or projectName in args.includeproject) and (args.excludeproject == None or not projectName in args.excludeproject)):
-		printLog(log, "PROJECT " + projectName)
-		os.putenv("NELBUILDACTIVEPROJECT", os.path.abspath(WorkspaceDirectory + "/" + projectName))
-		os.chdir("processes")
-		try:
-			if not args.includeprocess == None:
-				subprocess.call([ "python", "3_install.py", "--includeprocess" ] + args.includeprocess)
-			elif not args.excludeprocess == None:
-				subprocess.call([ "python", "3_install.py", "--excludeprocess" ] + args.excludeprocess)
-			else:
-				subprocess.call([ "python", "3_install.py" ])
-		except Exception, e:
-			printLog(log, "<" + projectName + "> " + str(e))
-		os.chdir("..")
-		try:
-			projectLog = open("processes/log.log", "r")
-			projectLogData = projectLog.read()
-			projectLog.close()
-			log.write(projectLogData)
-		except Exception, e:
-			printLog(log, "<" + projectName + "> " + str(e))
-	else:
-		printLog(log, "IGNORE PROJECT " + projectName)
-printLog(log, "")
-
-log.close()
-if os.path.isfile("3_install.log"):
-	os.remove("3_install.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_install.log")
-shutil.move("log.log", "3_install.log")
+#!/usr/bin/python
+# 
+# \file 3_install.py
+# \brief Run all install processes
+# \date 2009-02-18 16:19GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Run all install processes
+# 
+# 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, argparse
+sys.path.append("configuration")
+
+parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Install')
+# parser.add_argument('--haltonerror', '-eh', action='store_true')
+parser.add_argument('--includeproject', '-ipj', nargs='+')
+parser.add_argument('--excludeproject', '-epj', nargs='+')
+parser.add_argument('--includeprocess', '-ipc', nargs='+')
+parser.add_argument('--excludeprocess', '-epc', nargs='+')
+args = parser.parse_args()
+
+if not args.includeproject == None and not args.excludeproject == None:
+	print "ERROR --includeproject cannot be combined with --excludeproject, exit."
+	exit()
+
+if not args.includeprocess == None and not args.excludeprocess == None:
+	print "ERROR --includeprocess cannot be combined with --excludeprocess, exit."
+	exit()
+
+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, "--- Run the install processes")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+# For each project
+for projectName in ProjectsToProcess:
+	if ((args.includeproject == None or projectName in args.includeproject) and (args.excludeproject == None or not projectName in args.excludeproject)):
+		printLog(log, "PROJECT " + projectName)
+		os.putenv("NELBUILDACTIVEPROJECT", os.path.abspath(WorkspaceDirectory + "/" + projectName))
+		os.chdir("processes")
+		try:
+			if not args.includeprocess == None:
+				subprocess.call([ "python", "3_install.py", "--includeprocess" ] + args.includeprocess)
+			elif not args.excludeprocess == None:
+				subprocess.call([ "python", "3_install.py", "--excludeprocess" ] + args.excludeprocess)
+			else:
+				subprocess.call([ "python", "3_install.py" ])
+		except Exception, e:
+			printLog(log, "<" + projectName + "> " + str(e))
+		os.chdir("..")
+		try:
+			projectLog = open("processes/log.log", "r")
+			projectLogData = projectLog.read()
+			projectLog.close()
+			log.write(projectLogData)
+		except Exception, e:
+			printLog(log, "<" + projectName + "> " + str(e))
+	else:
+		printLog(log, "IGNORE PROJECT " + projectName)
+printLog(log, "")
+
+log.close()
+if os.path.isfile("3_install.log"):
+	os.remove("3_install.log")
+shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_install.log")
+shutil.move("log.log", "3_install.log")

nel/tools/build_gamedata/9_upload.py

@@ -1,181 +1,181 @@
-#!/usr/bin/python
-# 
-# \file 9_upload.py
-# \brief Upload data to servers
-# \date 2009-02-18 16:19GMT
-# \author Jan Boon (Kaetemi)
-# Game data build pipeline.
-# Upload data to servers
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 2011  Kaetemi
-#
-# 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 *
-
-try:
-	from upload import *
-except ImportError:
-	# Not documenting this. Because we can.
-	printLog(log, "ERROR Upload not configured, bye.")
-	exit()
-
-sys.path.append(WorkspaceDirectory)
-from projects import *
-
-# Log error
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Upload data to servers")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-# Not documenting this. Because we can.
-Psftp = findFileMultiDir(log, ToolDirectories + WindowsExeDllCfgDirectories, UploadPsftpTool)
-printLog(log, "PSFTP " + Psftp)
-
-def downloadVersionTag(server, user, sshkey, dir):
-	if os.path.isfile("upload.tag"):
-		os.remove("upload.tag")
-	if os.path.isfile("upload.batch"):
-		os.remove("upload.batch")
-	ub = open("upload.batch", "w")
-	ub.write("cd " + dir + "\n")
-	ub.write("get upload.tag upload.tag\n")
-	ub.write("quit\n")
-	ub.close()
-	subprocess.call([ Psftp, "-b", "upload.batch", "-i", sshkey, user + "@" + server ])
-	os.remove("upload.batch")
-	if os.path.isfile("upload.tag"):
-		ft = open("upload.tag")
-		result = float(ft.read()) # float, really
-		ft.close()
-		os.remove("upload.tag")
-		printLog(log, "INFO Upload tag is " + str(result))
-		return result
-	else:
-		printLog(log, "WARNING Upload tag not found, uploading everything")
-		return 0
-
-def isDirectoryNeeded(ft, dir):
-	files = os.listdir(dir)
-	for fileName in files:
-		if isLegalFileName(fileName):
-			fileFull = dir + "/" + fileName
-			if os.path.isfile(fileFull):
-				nftf = os.stat(fileFull).st_mtime
-				if nftf > ft:
-					return True
-			elif os.path.isdir(fileFull):
-				if isDirectoryNeeded(ft, fileFull):
-					return True
-			elif not os.path.isdir(fileFull):
-				printLog(log, "isDirectoryNeeded: file not dir or file?!" + fileFull)
-	return False
-
-def listDirectoryUpload(ft, ub, udb, dir):
-	nft = 0
-	files = os.listdir(dir)
-	for fileName in files:
-		if isLegalFileName(fileName):
-			fileFull = dir + "/" + fileName
-			if os.path.isfile(fileFull):
-				nftf = os.stat(fileFull).st_mtime
-				if nftf > ft:
-					ub.write("put " + fileFull + " " + fileName + "\n")
-				if nftf > nft:
-					nft = nftf
-			elif os.path.isdir(fileFull):
-				if isDirectoryNeeded(ft, fileFull):
-					udb.write("mkdir " + fileName + "\n")
-					ub.write("cd " + fileName + "\n")
-					udb.write("cd " + fileName + "\n")
-					nft2 = listDirectoryUpload(ft, ub, udb, fileFull)
-					if (nft2 > nft):
-						nft = nft2
-					ub.write("cd ..\n")
-					udb.write("cd ..\n")
-			elif not os.path.isdir(fileFull):
-				printLog(log, "listDirectoryUpload: file not dir or file?!" + fileFull)
-	return nft
-
-def uploadSftp(server, user, sshkey, dir_to, dir_from, addcmd):
-	ft = downloadVersionTag(server, user, sshkey, dir_to)
-	if isDirectoryNeeded(ft, dir_from):
-		if os.path.isfile("upload_dir.batch"):
-			os.remove("upload_dir.batch")
-		if os.path.isfile("upload.batch"):
-			os.remove("upload.batch")
-		udb = open("upload_dir.batch", "w")
-		udb.write("cd " + dir_to + "\n")
-		ub = open("upload.batch", "w")
-		ub.write("cd " + dir_to + "\n")
-		for ac in addcmd:
-			ub.write(ac + "\n")
-		ftn = listDirectoryUpload(ft, ub, udb, dir_from)
-		if (ft > ftn):
-			ftn = ft
-		nft = open("upload.tag", "w")
-		nft.write(str(ftn))
-		nft.close()
-		ub.write("put upload.tag upload.tag\n")
-		ub.write("quit\n")
-		ub.close()
-		udb.write("quit\n")
-		udb.close()
-		subprocess.call([ Psftp, "-be", "-b", "upload_dir.batch", "-i", sshkey, user + "@" + server ])
-		subprocess.call([ Psftp, "-b", "upload.batch", "-i", sshkey, user + "@" + server ])
-		os.remove("upload_dir.batch")
-		os.remove("upload.batch")
-		os.remove("upload.tag")
-	else:
-		printLog(log, "SKIP " + dir_to)
-
-printLog(log, ">>> Upload patch <<<")
-for target in UploadPatch:
-	uploadSftp(target[0], target[1], target[2], target[3], ClientPatchDirectory + "/patch", [ ])
-
-printLog(log, ">>> Upload data_shard <<<")
-for target in UploadShard:
-	uploadSftp(target[0], target[1], target[2], target[3], DataShardDirectory, [ "rm *.packed_sheets", "rm primitive_cache/*.binprim" ])
-
-printLog(log, ">>> Upload data_common <<<")
-for target in UploadCommon:
-	uploadSftp(target[0], target[1], target[2], target[3], DataCommonDirectory, [ ])
-
-printLog(log, ">>> Upload data_leveldesign/leveldesign <<<")
-for target in UploadLeveldesign:
-	uploadSftp(target[0], target[1], target[2], target[3], LeveldesignDirectory, [ ])
-
-printLog(log, ">>> Upload data_leveldesign/primitives <<<")
-for target in UploadPrimitives:
-	uploadSftp(target[0], target[1], target[2], target[3], PrimitivesDirectory, [ ])
-
-log.close()
-if os.path.isfile("9_upload.log"):
-	os.remove("9_upload.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_upload.log")
-shutil.move("log.log", "9_upload.log")
+#!/usr/bin/python
+# 
+# \file 9_upload.py
+# \brief Upload data to servers
+# \date 2009-02-18 16:19GMT
+# \author Jan Boon (Kaetemi)
+# Game data build pipeline.
+# Upload data to servers
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2011  Kaetemi
+#
+# 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 *
+
+try:
+	from upload import *
+except ImportError:
+	# Not documenting this. Because we can.
+	printLog(log, "ERROR Upload not configured, bye.")
+	exit()
+
+sys.path.append(WorkspaceDirectory)
+from projects import *
+
+# Log error
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Upload data to servers")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Find tools
+# Not documenting this. Because we can.
+Psftp = findFileMultiDir(log, ToolDirectories + WindowsExeDllCfgDirectories, UploadPsftpTool)
+printLog(log, "PSFTP " + Psftp)
+
+def downloadVersionTag(server, user, sshkey, dir):
+	if os.path.isfile("upload.tag"):
+		os.remove("upload.tag")
+	if os.path.isfile("upload.batch"):
+		os.remove("upload.batch")
+	ub = open("upload.batch", "w")
+	ub.write("cd " + dir + "\n")
+	ub.write("get upload.tag upload.tag\n")
+	ub.write("quit\n")
+	ub.close()
+	subprocess.call([ Psftp, "-b", "upload.batch", "-i", sshkey, user + "@" + server ])
+	os.remove("upload.batch")
+	if os.path.isfile("upload.tag"):
+		ft = open("upload.tag")
+		result = float(ft.read()) # float, really
+		ft.close()
+		os.remove("upload.tag")
+		printLog(log, "INFO Upload tag is " + str(result))
+		return result
+	else:
+		printLog(log, "WARNING Upload tag not found, uploading everything")
+		return 0
+
+def isDirectoryNeeded(ft, dir):
+	files = os.listdir(dir)
+	for fileName in files:
+		if isLegalFileName(fileName):
+			fileFull = dir + "/" + fileName
+			if os.path.isfile(fileFull):
+				nftf = os.stat(fileFull).st_mtime
+				if nftf > ft:
+					return True
+			elif os.path.isdir(fileFull):
+				if isDirectoryNeeded(ft, fileFull):
+					return True
+			elif not os.path.isdir(fileFull):
+				printLog(log, "isDirectoryNeeded: file not dir or file?!" + fileFull)
+	return False
+
+def listDirectoryUpload(ft, ub, udb, dir):
+	nft = 0
+	files = os.listdir(dir)
+	for fileName in files:
+		if isLegalFileName(fileName):
+			fileFull = dir + "/" + fileName
+			if os.path.isfile(fileFull):
+				nftf = os.stat(fileFull).st_mtime
+				if nftf > ft:
+					ub.write("put " + fileFull + " " + fileName + "\n")
+				if nftf > nft:
+					nft = nftf
+			elif os.path.isdir(fileFull):
+				if isDirectoryNeeded(ft, fileFull):
+					udb.write("mkdir " + fileName + "\n")
+					ub.write("cd " + fileName + "\n")
+					udb.write("cd " + fileName + "\n")
+					nft2 = listDirectoryUpload(ft, ub, udb, fileFull)
+					if (nft2 > nft):
+						nft = nft2
+					ub.write("cd ..\n")
+					udb.write("cd ..\n")
+			elif not os.path.isdir(fileFull):
+				printLog(log, "listDirectoryUpload: file not dir or file?!" + fileFull)
+	return nft
+
+def uploadSftp(server, user, sshkey, dir_to, dir_from, addcmd):
+	ft = downloadVersionTag(server, user, sshkey, dir_to)
+	if isDirectoryNeeded(ft, dir_from):
+		if os.path.isfile("upload_dir.batch"):
+			os.remove("upload_dir.batch")
+		if os.path.isfile("upload.batch"):
+			os.remove("upload.batch")
+		udb = open("upload_dir.batch", "w")
+		udb.write("cd " + dir_to + "\n")
+		ub = open("upload.batch", "w")
+		ub.write("cd " + dir_to + "\n")
+		for ac in addcmd:
+			ub.write(ac + "\n")
+		ftn = listDirectoryUpload(ft, ub, udb, dir_from)
+		if (ft > ftn):
+			ftn = ft
+		nft = open("upload.tag", "w")
+		nft.write(str(ftn))
+		nft.close()
+		ub.write("put upload.tag upload.tag\n")
+		ub.write("quit\n")
+		ub.close()
+		udb.write("quit\n")
+		udb.close()
+		subprocess.call([ Psftp, "-be", "-b", "upload_dir.batch", "-i", sshkey, user + "@" + server ])
+		subprocess.call([ Psftp, "-b", "upload.batch", "-i", sshkey, user + "@" + server ])
+		os.remove("upload_dir.batch")
+		os.remove("upload.batch")
+		os.remove("upload.tag")
+	else:
+		printLog(log, "SKIP " + dir_to)
+
+printLog(log, ">>> Upload patch <<<")
+for target in UploadPatch:
+	uploadSftp(target[0], target[1], target[2], target[3], ClientPatchDirectory + "/patch", [ ])
+
+printLog(log, ">>> Upload data_shard <<<")
+for target in UploadShard:
+	uploadSftp(target[0], target[1], target[2], target[3], DataShardDirectory, [ "rm *.packed_sheets", "rm primitive_cache/*.binprim" ])
+
+printLog(log, ">>> Upload data_common <<<")
+for target in UploadCommon:
+	uploadSftp(target[0], target[1], target[2], target[3], DataCommonDirectory, [ ])
+
+printLog(log, ">>> Upload data_leveldesign/leveldesign <<<")
+for target in UploadLeveldesign:
+	uploadSftp(target[0], target[1], target[2], target[3], LeveldesignDirectory, [ ])
+
+printLog(log, ">>> Upload data_leveldesign/primitives <<<")
+for target in UploadPrimitives:
+	uploadSftp(target[0], target[1], target[2], target[3], PrimitivesDirectory, [ ])
+
+log.close()
+if os.path.isfile("9_upload.log"):
+	os.remove("9_upload.log")
+shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_upload.log")
+shutil.move("log.log", "9_upload.log")

nel/tools/build_gamedata/a1_worldedit_data.py

@@ -1,74 +1,74 @@
-#!/usr/bin/python
-# 
-# \file a1_worldedit_data.py
-# \brief Install worldedit data
-# \date 2014-09-10 14:01GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Install worldedit data
-# 
-# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-# Copyright (C) 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 worldedit data")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-for ecosystem in WorldEditEcosystems:
-	ecosystemName = ecosystem[0]
-	srcZoneLigos = ExportBuildDirectory + "/ecosystems/" + ecosystemName + "/ligo_es/zoneligos/"
-	dstZoneLigos = WorldEditInstallDirectory + "/" + ecosystemName + "/zoneligos/"
-	mkPath(log, srcZoneLigos)
-	mkPath(log, dstZoneLigos)
-	copyFilesNoTreeIfNeeded(log, srcZoneLigos, dstZoneLigos)
-	srcZoneBitmaps = DatabaseDirectory + "/landscape/ligo/" + ecosystemName + "/zonebitmaps/"
-	dstZoneBitmaps = WorldEditInstallDirectory + "/" + ecosystemName + "/zonebitmaps/"
-	mkPath(log, srcZoneBitmaps)
-	mkPath(log, dstZoneBitmaps)
-	copyFilesExtNoTreeIfNeeded(log, srcZoneBitmaps, dstZoneBitmaps, ".tga")
-	copyFilesExtNoTreeIfNeeded(log, srcZoneBitmaps, dstZoneBitmaps, ".png")
-	dstCollisionMap = WorldEditInstallDirectory + "/" + ecosystemName + "/collisionmap/"
-	mkPath(log, dstCollisionMap)
-	for continentName in ecosystem[1]:
-		srcCollisionMap = ExportBuildDirectory + "/continents/" + continentName + "/ai_wmap/"
-		mkPath(log, srcCollisionMap)
-		copyFilesExtNoTreeIfNeeded(log, srcCollisionMap, dstCollisionMap, ".tga")
-		copyFilesExtNoTreeIfNeeded(log, srcCollisionMap, dstCollisionMap, ".png")
-printLog(log, "")
-
-log.close()
-if os.path.isfile("a1_worldedit_data.log"):
-	os.remove("a1_worldedit_data.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_worldedit_data.log")
-shutil.move("log.log", "a1_worldedit_data.log")
+#!/usr/bin/python
+# 
+# \file a1_worldedit_data.py
+# \brief Install worldedit data
+# \date 2014-09-10 14:01GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Install worldedit data
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 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 worldedit data")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+for ecosystem in WorldEditEcosystems:
+	ecosystemName = ecosystem[0]
+	srcZoneLigos = ExportBuildDirectory + "/ecosystems/" + ecosystemName + "/ligo_es/zoneligos/"
+	dstZoneLigos = WorldEditInstallDirectory + "/" + ecosystemName + "/zoneligos/"
+	mkPath(log, srcZoneLigos)
+	mkPath(log, dstZoneLigos)
+	copyFilesNoTreeIfNeeded(log, srcZoneLigos, dstZoneLigos)
+	srcZoneBitmaps = DatabaseDirectory + "/landscape/ligo/" + ecosystemName + "/zonebitmaps/"
+	dstZoneBitmaps = WorldEditInstallDirectory + "/" + ecosystemName + "/zonebitmaps/"
+	mkPath(log, srcZoneBitmaps)
+	mkPath(log, dstZoneBitmaps)
+	copyFilesExtNoTreeIfNeeded(log, srcZoneBitmaps, dstZoneBitmaps, ".tga")
+	copyFilesExtNoTreeIfNeeded(log, srcZoneBitmaps, dstZoneBitmaps, ".png")
+	dstCollisionMap = WorldEditInstallDirectory + "/" + ecosystemName + "/collisionmap/"
+	mkPath(log, dstCollisionMap)
+	for continentName in ecosystem[1]:
+		srcCollisionMap = ExportBuildDirectory + "/continents/" + continentName + "/ai_wmap/"
+		mkPath(log, srcCollisionMap)
+		copyFilesExtNoTreeIfNeeded(log, srcCollisionMap, dstCollisionMap, ".tga")
+		copyFilesExtNoTreeIfNeeded(log, srcCollisionMap, dstCollisionMap, ".png")
+printLog(log, "")
+
+log.close()
+if os.path.isfile("a1_worldedit_data.log"):
+	os.remove("a1_worldedit_data.log")
+shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_worldedit_data.log")
+shutil.move("log.log", "a1_worldedit_data.log")

nel/tools/build_gamedata/all_dev.bat

@@ -1,17 +1,15 @@
-title Ryzom Core: 0_setup.py --noconf
-python 0_setup.py --noconf
-title Ryzom Core: 1_export.py
-python 1_export.py
-title Ryzom Core: 2_build.py
-python 2_build.py
-title Ryzom Core: 3_install.py
-python 3_install.py
-title Ryzom Core: a1_worldedit_data.py
-python a1_worldedit_data.py
-title Ryzom Core: b1_client_dev.py
-python 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
-title Ryzom Core: Ready
+title Ryzom Core: 0_setup.py --noconf
+0_setup.py --noconf
+title Ryzom Core: 1_export.py
+1_export.py
+title Ryzom Core: 2_build.py
+2_build.py
+title Ryzom Core: 3_install.py
+3_install.py
+title Ryzom Core: a1_worldedit_data.py
+a1_worldedit_data.py
+title Ryzom Core: b1_client_dev.py
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.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
-title Ryzom Core: a1_worldedit_data.py
-python a1_worldedit_data.py
-title Ryzom Core: b1_client_dev.py
-python 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
-title Ryzom Core: Ready
+title Ryzom Core: 3_install.py
+3_install.py
+title Ryzom Core: a1_worldedit_data.py
+a1_worldedit_data.py
+title Ryzom Core: b1_client_dev.py
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.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/b2_shard_data.py

@@ -1,93 +1,93 @@
-#!/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 shard data")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-for dir in InstallShardDataDirectories:
-	printLog(log, "SHARD PACKAGE " + dir)
-	mkPath(log, ShardInstallDirectory + "/" + dir)
-	printLog(log, "FROM " + dir)
-	mkPath(log, InstallDirectory + "/" + dir)
-	copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + dir, ShardInstallDirectory + "/" + dir)
-for package in InstallShardDataFiles:
-	dstDir = package[0]
-	mkPath(log, ShardInstallDirectory + "/" + dstDir)
-	printLog(log, "SHARD PACKAGE " + dstDir)
-	copyFileListNoTreeIfNeeded(log, InstallDirectory, ShardInstallDirectory + "/" + dstDir, package[1])
-for multiDir in InstallShardDataMultiDirectories:
-	dstDir = multiDir[0]
-	mkPath(log, ShardInstallDirectory + "/" + dstDir)
-	printLog(log, "SHARD PACKAGE " + dstDir)
-	for srcDir in multiDir[1]:
-		printLog(log, "FROM " + srcDir)
-		mkPath(log, InstallDirectory + "/" + srcDir)
-		mkPath(log, ShardInstallDirectory + "/" + dstDir + "/" + srcDir)
-		copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + srcDir, ShardInstallDirectory + "/" + dstDir + "/" + srcDir)
-for multiDir in InstallShardDataPrimitivesDirectories:
-	dstDir = multiDir[0]
-	mkPath(log, ShardInstallDirectory + "/" + dstDir)
-	printLog(log, "SHARD PACKAGE " + dstDir)
-	for srcDir in multiDir[1]:
-		printLog(log, "FROM PRIMITIVES " + srcDir)
-		mkPath(log, PrimitivesDirectory + "/" + srcDir)
-		mkPath(log, ShardInstallDirectory + "/" + dstDir + "/" + srcDir)
-		copyFilesNoTreeIfNeeded(log, PrimitivesDirectory + "/" + srcDir, ShardInstallDirectory + "/" + dstDir + "/" + srcDir)
-for execDir in InstallShardDataExecutables:
-	dstDir = execDir[0]
-	mkPath(log, LinuxServiceExecutableDirectory)
-	mkPath(log, PatchmanCfgDefaultDirectory)
-	mkPath(log, InstallDirectory)
-	mkPath(log, ShardInstallDirectory + "/" + dstDir)
-	printLog(log, "SHARD PACKAGE " + dstDir)
-	copyFileIfNeeded(log, LinuxServiceExecutableDirectory + "/" + execDir[1][1], ShardInstallDirectory + "/" + dstDir + "/" + execDir[1][0])
-	copyFileListNoTreeIfNeeded(log, PatchmanCfgDefaultDirectory, ShardInstallDirectory + "/" + dstDir, execDir[2])
-	copyFileListNoTreeIfNeeded(log, InstallDirectory, ShardInstallDirectory + "/" + dstDir, execDir[3])
-printLog(log, "")
-
-log.close()
-if os.path.isfile("b2_shard_data.log"):
-	os.remove("b2_shard_data.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_shard_data.log")
-shutil.move("log.log", "b2_shard_data.log")
+#!/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 shard data")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+for dir in InstallShardDataDirectories:
+	printLog(log, "SHARD PACKAGE " + dir)
+	mkPath(log, ShardInstallDirectory + "/" + dir)
+	printLog(log, "FROM " + dir)
+	mkPath(log, InstallDirectory + "/" + dir)
+	copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + dir, ShardInstallDirectory + "/" + dir)
+for package in InstallShardDataFiles:
+	dstDir = package[0]
+	mkPath(log, ShardInstallDirectory + "/" + dstDir)
+	printLog(log, "SHARD PACKAGE " + dstDir)
+	copyFileListNoTreeIfNeeded(log, InstallDirectory, ShardInstallDirectory + "/" + dstDir, package[1])
+for multiDir in InstallShardDataMultiDirectories:
+	dstDir = multiDir[0]
+	mkPath(log, ShardInstallDirectory + "/" + dstDir)
+	printLog(log, "SHARD PACKAGE " + dstDir)
+	for srcDir in multiDir[1]:
+		printLog(log, "FROM " + srcDir)
+		mkPath(log, InstallDirectory + "/" + srcDir)
+		mkPath(log, ShardInstallDirectory + "/" + dstDir + "/" + srcDir)
+		copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + srcDir, ShardInstallDirectory + "/" + dstDir + "/" + srcDir)
+for multiDir in InstallShardDataPrimitivesDirectories:
+	dstDir = multiDir[0]
+	mkPath(log, ShardInstallDirectory + "/" + dstDir)
+	printLog(log, "SHARD PACKAGE " + dstDir)
+	for srcDir in multiDir[1]:
+		printLog(log, "FROM PRIMITIVES " + srcDir)
+		mkPath(log, PrimitivesDirectory + "/" + srcDir)
+		mkPath(log, ShardInstallDirectory + "/" + dstDir + "/" + srcDir)
+		copyFilesNoTreeIfNeeded(log, PrimitivesDirectory + "/" + srcDir, ShardInstallDirectory + "/" + dstDir + "/" + srcDir)
+for execDir in InstallShardDataExecutables:
+	dstDir = execDir[0]
+	mkPath(log, LinuxServiceExecutableDirectory)
+	mkPath(log, PatchmanCfgDefaultDirectory)
+	mkPath(log, InstallDirectory)
+	mkPath(log, ShardInstallDirectory + "/" + dstDir)
+	printLog(log, "SHARD PACKAGE " + dstDir)
+	copyFileIfNeeded(log, LinuxServiceExecutableDirectory + "/" + execDir[1][1], ShardInstallDirectory + "/" + dstDir + "/" + execDir[1][0])
+	copyFileListNoTreeIfNeeded(log, PatchmanCfgDefaultDirectory, ShardInstallDirectory + "/" + dstDir, execDir[2])
+	copyFileListNoTreeIfNeeded(log, InstallDirectory, ShardInstallDirectory + "/" + dstDir, execDir[3])
+printLog(log, "")
+
+log.close()
+if os.path.isfile("b2_shard_data.log"):
+	os.remove("b2_shard_data.log")
+shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_shard_data.log")
+shutil.move("log.log", "b2_shard_data.log")

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
-title Ryzom Core: 2_build.py (CHARACTERS)
-python 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
-title Ryzom Core: b1_client_dev.py (CHARACTERS)
-python b1_client_dev.py
-title Ryzom Core: b2_shard_data.py (CHARACTERS)
-python b2_shard_data.py
-title Ryzom Core: Ready (CHARACTERS)
+title Ryzom Core: 1_export.py (CHARACTERS)
+1_export.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: 2_build.py (CHARACTERS)
+2_build.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: 3_install.py (CHARACTERS)
+3_install.py -ipj common/characters common/characters_maps_hr
+title Ryzom Core: b1_client_dev.py (CHARACTERS)
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py (CHARACTERS)
+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/d2_client_install.py

@@ -1,86 +1,86 @@
-#!/usr/bin/python
-# 
-# \file d2_client_install.py
-# \brief Install to client install
-# \date 2009-02-18 16:19GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Install to client install
-# 
-# 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 client install")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-for category in InstallClientData:
-	printLog(log, "CATEGORY " + category["Name"])
-	packExt = ".bnp"
-	if (category["StreamedPackages"]):
-		packExt = ".snp"
-	if (category["UnpackTo"] != None):
-		targetPath = ClientInstallDirectory
-		if (category["UnpackTo"] != ""):
-			targetPath += "/" + category["UnpackTo"]
-		mkPath(log, targetPath)
-		for package in category["Packages"]:
-			printLog(log, "PACKAGE " + package[0])
-			mkPath(log, InstallDirectory + "/" + package[0])
-			copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath)
-	else:
-		sourcePath = ClientPatchDirectory + "/bnp"
-		targetPath = ClientInstallDirectory + "/data"
-		mkPath(log, targetPath)
-		for package in category["Packages"]:
-			printLog(log, "PACKAGE " + package[0])
-			sourceBnp = sourcePath + "/" + package[0] + packExt
-			targetBnp = targetPath + "/" + package[0] + packExt
-			if (len(package[1]) > 0):
-				sourceBnp = sourcePath + "/" + package[1][0]
-				targetBnp = targetPath + "/" + package[1][0]
-				printLog(log, "TARGET " + package[1][0])
-			copyFileIfNeeded(log, sourceBnp, targetBnp)
-		for ref in category["Refs"]:
-			printLog(log, "REFERENCE " + ref)
-			sourceRef = sourcePath + "/" + ref + "_.ref"
-			targetRef = targetPath + "/" + ref + "_.ref"
-			copyFileIfNeeded(log, sourceRef, targetRef)
-printLog(log, "")
-
-log.close()
-if os.path.isfile("d2_client_install.log"):
-	os.remove("d2_client_install.log")
-shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_client_install.log")
-shutil.move("log.log", "d2_client_install.log")
+#!/usr/bin/python
+# 
+# \file d2_client_install.py
+# \brief Install to client install
+# \date 2009-02-18 16:19GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Install to client install
+# 
+# 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 client install")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+for category in InstallClientData:
+	printLog(log, "CATEGORY " + category["Name"])
+	packExt = ".bnp"
+	if (category["StreamedPackages"]):
+		packExt = ".snp"
+	if (category["UnpackTo"] != None):
+		targetPath = ClientInstallDirectory
+		if (category["UnpackTo"] != ""):
+			targetPath += "/" + category["UnpackTo"]
+		mkPath(log, targetPath)
+		for package in category["Packages"]:
+			printLog(log, "PACKAGE " + package[0])
+			mkPath(log, InstallDirectory + "/" + package[0])
+			copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath)
+	else:
+		sourcePath = ClientPatchDirectory + "/bnp"
+		targetPath = ClientInstallDirectory + "/data"
+		mkPath(log, targetPath)
+		for package in category["Packages"]:
+			printLog(log, "PACKAGE " + package[0])
+			sourceBnp = sourcePath + "/" + package[0] + packExt
+			targetBnp = targetPath + "/" + package[0] + packExt
+			if (len(package[1]) > 0):
+				sourceBnp = sourcePath + "/" + package[1][0]
+				targetBnp = targetPath + "/" + package[1][0]
+				printLog(log, "TARGET " + package[1][0])
+			copyFileIfNeeded(log, sourceBnp, targetBnp)
+		for ref in category["Refs"]:
+			printLog(log, "REFERENCE " + ref)
+			sourceRef = sourcePath + "/" + ref + "_.ref"
+			targetRef = targetPath + "/" + ref + "_.ref"
+			copyFileIfNeeded(log, sourceRef, targetRef)
+printLog(log, "")
+
+log.close()
+if os.path.isfile("d2_client_install.log"):
+	os.remove("d2_client_install.log")
+shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_client_install.log")
+shutil.move("log.log", "d2_client_install.log")

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
-title Ryzom Core: 1_export.py (EXECUTABLES)
-python 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
-title Ryzom Core: 3_install.py (EXECUTABLES)
-python 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
-title Ryzom Core: b2_shard_data.py
-python b2_shard_data.py
-title Ryzom Core: b3_shard_dev.py
-python b3_shard_dev.py
-title Ryzom Core: Ready
+title Ryzom Core: 0_setup.py (EXECUTABLES)
+0_setup.py --noconf -ipj common/gamedev common/exedll common/cfg common/data_common
+title Ryzom Core: 1_export.py (EXECUTABLES)
+1_export.py -ipj common/gamedev common/exedll common/cfg common/data_common
+title Ryzom Core: 2_build.py (EXECUTABLES)
+2_build.py -ipj common/gamedev common/exedll common/cfg common/data_common
+title Ryzom Core: 3_install.py (EXECUTABLES)
+3_install.py -ipj common/gamedev common/exedll common/cfg common/data_common
+title Ryzom Core: b1_client_dev.py
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py
+b2_shard_data.py
+title Ryzom Core: Ready

nel/tools/build_gamedata/export_build_install.py

@@ -1,32 +1,32 @@
-#!/usr/bin/python
-# 
-# \file export_build_install.py
-# \brief Run all processes
-# \date 2009-02-18 15:28GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all processes
-# 
-# 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 shutil, subprocess
-
-subprocess.call([ "python", "1_export.py" ])
-subprocess.call([ "python", "2_build.py" ])
-subprocess.call([ "python", "3_install.py" ])
-
+#!/usr/bin/python
+# 
+# \file export_build_install.py
+# \brief Run all processes
+# \date 2009-02-18 15:28GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Run all processes
+# 
+# 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 shutil, subprocess
+
+subprocess.call([ "python", "1_export.py" ])
+subprocess.call([ "python", "2_build.py" ])
+subprocess.call([ "python", "3_install.py" ])
+

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/generators/ecosystem_project_template/directories.py

@@ -1,220 +1,220 @@
-#!/usr/bin/python
-# 
-# #################################################################
-# ## %PreGenWarning%
-# #################################################################
-# 
-# \file directories.py
-# \brief Directories configuration
-# \date %PreGenDateTimeStamp%
-# \author Jan Boon (Kaetemi)
-# \date 2001-2005
-# \author Nevrax
-# Python port of game data build pipeline.
-# Directories configuration for '%PreGenEcosystemName%' ecosystem.
-# 
-# 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/>.
-# 
-
-
-# *** ECOSYSTEM AND CONTINENT NAMES ***
-
-EcosystemName = "%PreGenEcosystemName%"
-EcosystemPath = "ecosystems/" + EcosystemName
-CommonName = EcosystemName
-CommonPath = EcosystemPath
-
-DatabaseRootName = "%PreGenDatabaseRootName%"
-DatabaseRootPath = "stuff/" + DatabaseRootName
-
-
-# *** SOURCE DIRECTORIES IN THE DATABASE ***
-
-# Shape directories
-ShapeSourceDirectories = [ ]
-ShapeSourceDirectories += [ DatabaseRootPath + "/decors/vegetations" ]
-ShapeSourceDirectories += [ "landscape/ligo/" + EcosystemName + "/max" ]
-
-# Maps directories
-MapSourceDirectories = [ ]
-MapSourceDirectories += [ DatabaseRootPath + "/decors/_textures" ]
-%PreGenMapSubdirectories%MapSourceDirectories += [ "landscape/microveget/" + EcosystemName + "" ]
-MapSourceDirectories += [ "landscape/water/meshes/" + EcosystemName + "" ]
-
-MapUncompressedSourceDirectories = [ ]
-
-# Tiles directories
-TilesSourceDirectories = [ ]
-%PreGenTileSourceDirectories%
-# Tiles root directory
-TileRootSourceDirectory = "landscape/_texture_tiles/" + EcosystemName
-
-# Displace directory
-DisplaceSourceDirectory = "landscape/_texture_tiles/" + EcosystemName + "/displace"
-
-# Do not use, needs to be removed and fixed in processes
-DisplaceSourceDirectories = [ ]
-DisplaceSourceDirectories += [ DisplaceSourceDirectory ]
-
-# Bank directory
-BankSourceDirectory = "landscape/_texture_tiles/" + EcosystemName
-
-# Vegetable set directories
-VegetSetSourceDirectories = [ ]
-VegetSetSourceDirectories += [ "landscape/microveget/" + EcosystemName ]
-
-# Veget directories
-VegetSourceDirectories = [ ]
-VegetSourceDirectories += [ "landscape/microveget/" + EcosystemName ]
-
-# Ligo directories
-LigoBaseSourceDirectory = "landscape/ligo/" + EcosystemName
-LigoMaxSourceDirectory = LigoBaseSourceDirectory + "/max"
-
-# Zone directories
-ZoneSourceDirectory = [ "landscape/zones/" + EcosystemName ] # For old snowballs style landscape when not using ligo
-
-# Ig landscape directories
-IgLandSourceDirectory = "_invalid"
-
-# Ig other directories
-IgOtherSourceDirectory = "_invalid"
-
-# PACS primitives directories
-PacsPrimSourceDirectories = [ ]
-PacsPrimSourceDirectories += [ DatabaseRootPath + "/decors/vegetations" ]
-
-
-# *** LOOKUP DIRECTORIES WITHIN THE BUILD PIPELINE *** (TODO: use these instead of search_pathes in properties(_base).cfg)
-
-# Ig lookup directories used by rbank
-IgLookupDirectories = [ ]
-
-# Shape lookup directories used by rbank
-ShapeLookupDirectories = [ ]
-ShapeLookupDirectories += [ EcosystemPath + "/shape_clodtex_build" ]
-ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
-
-# Map lookup directories not yet used
-MapLookupDirectories = [ ]
-MapLookupDirectories += [ EcosystemPath + "/map_export" ]
-MapLookupDirectories += [ EcosystemPath + "/map_uncompressed" ]
-
-
-# *** EXPORT DIRECTORIES FOR THE BUILD PIPELINE ***
-
-# Map directories
-MapExportDirectory = CommonPath + "/map_export"
-MapUncompressedExportDirectory = CommonPath + "/map_uncompressed"
-
-# Shape directories
-ShapeTagExportDirectory = CommonPath + "/shape_tag"
-ShapeNotOptimizedExportDirectory = CommonPath + "/shape_not_optimized"
-ShapeWithCoarseMeshExportDirectory = CommonPath + "/shape_with_coarse_mesh"
-ShapeLightmapNotOptimizedExportDirectory = CommonPath + "/shape_lightmap_not_optimized"
-ShapeAnimExportDirectory = CommonPath + "/shape_anim"
-
-# Smallbank directories
-SmallbankExportDirectory = CommonPath + "/smallbank"
-
-# Tiles directories
-TilesExportDirectory = CommonPath + "/tiles"
-
-# Tiles directories
-DisplaceExportDirectory = CommonPath + "/diplace"
-
-# Veget directories
-VegetExportDirectory = CommonPath + "/veget"
-VegetTagExportDirectory = CommonPath + "/veget_tag"
-
-# Veget Set directories
-VegetSetExportDirectory = CommonPath + "/veget_set"
-
-# Ligo directories
-LigoEcosystemExportDirectory = CommonPath + "/ligo_es"
-LigoEcosystemIgExportDirectory = LigoEcosystemExportDirectory + "/igs"
-LigoEcosystemZoneExportDirectory = LigoEcosystemExportDirectory + "/zones"
-LigoEcosystemZoneLigoExportDirectory = LigoEcosystemExportDirectory + "/zoneligos"
-LigoEcosystemCmbExportDirectory = LigoEcosystemExportDirectory + "/cmb"
-LigoEcosystemTagExportDirectory = CommonPath + "/ligo_es_tag"
-
-# Zone directories
-ZoneExportDirectory = CommonPath + "/zone"
-
-# PACS primitives directories
-PacsPrimExportDirectory = CommonPath + "/pacs_prim"
-PacsPrimTagExportDirectory = CommonPath + "/pacs_prim_tag"
-
-
-# *** BUILD DIRECTORIES FOR THE BUILD PIPELINE ***
-
-# Map directories
-MapBuildDirectory = CommonPath + "/map"
-MapPanoplyBuildDirectory = CommonPath + "/map_panoply"
-MapPanoplyHlsInfoBuildDirectory = CommonPath + "/map_panoply_hls_info"
-MapPanoplyHlsBankBuildDirectory = CommonPath + "/map_panoply_hls_bank"
-MapPanoplyCacheBuildDirectory = CommonPath + "/map_panoply_cache"
-MapTagBuildDirectory = CommonPath + "/map_tag"
-
-# Shape directories
-ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
-ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
-ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
-ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
-
-# Farbank directories
-FarbankBuildDirectory = CommonPath + "/farbank"
-
-# Ig directories ************** TODO CONFIRM IN IG BUILD PROCESS ************ FIX RBANK IF NEEDED ***********
-IgLandBuildDirectory = "_invalid"
-IgOtherBuildDirectory = "_invalid"
-
-# Rbank directories
-RbankOutputBuildDirectory = "_invalid"
-
-# Ligo directories
-
-
-# *** INSTALL DIRECTORIES IN THE CLIENT DATA ***
-
-# Map directory
-MapInstallDirectory = CommonName + "_maps"
-BitmapInstallDirectory = MapInstallDirectory
-
-# Shape directory
-ShapeInstallDirectory = CommonName + "_shapes"
-
-# Lightmap directory
-LightmapInstallDirectory = CommonName + "_lightmaps"
-
-# Tile directory
-TilesInstallDirectory = CommonName + "_tiles"
-
-# Displace directory
-DisplaceInstallDirectory = CommonName + "_displaces"
-
-# Bank directory
-BankInstallDirectory = CommonName + "_bank"
-
-# Vegetable set directory
-VegetSetInstallDirectory = CommonName + "_vegetable_sets"
-
-# Vegetable shape directory
-VegetInstallDirectory = CommonName + "_vegetables"
-
-# PACS primitives directories
-PacsPrimInstallDirectory = CommonName + "_pacs_prim"
+#!/usr/bin/python
+# 
+# #################################################################
+# ## %PreGenWarning%
+# #################################################################
+# 
+# \file directories.py
+# \brief Directories configuration
+# \date %PreGenDateTimeStamp%
+# \author Jan Boon (Kaetemi)
+# \date 2001-2005
+# \author Nevrax
+# Python port of game data build pipeline.
+# Directories configuration for '%PreGenEcosystemName%' ecosystem.
+# 
+# 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/>.
+# 
+
+
+# *** ECOSYSTEM AND CONTINENT NAMES ***
+
+EcosystemName = "%PreGenEcosystemName%"
+EcosystemPath = "ecosystems/" + EcosystemName
+CommonName = EcosystemName
+CommonPath = EcosystemPath
+
+DatabaseRootName = "%PreGenDatabaseRootName%"
+DatabaseRootPath = "stuff/" + DatabaseRootName
+
+
+# *** SOURCE DIRECTORIES IN THE DATABASE ***
+
+# Shape directories
+ShapeSourceDirectories = [ ]
+ShapeSourceDirectories += [ DatabaseRootPath + "/decors/vegetations" ]
+ShapeSourceDirectories += [ "landscape/ligo/" + EcosystemName + "/max" ]
+
+# Maps directories
+MapSourceDirectories = [ ]
+MapSourceDirectories += [ DatabaseRootPath + "/decors/_textures" ]
+%PreGenMapSubdirectories%MapSourceDirectories += [ "landscape/microveget/" + EcosystemName + "" ]
+MapSourceDirectories += [ "landscape/water/meshes/" + EcosystemName + "" ]
+
+MapUncompressedSourceDirectories = [ ]
+
+# Tiles directories
+TilesSourceDirectories = [ ]
+%PreGenTileSourceDirectories%
+# Tiles root directory
+TileRootSourceDirectory = "landscape/_texture_tiles/" + EcosystemName
+
+# Displace directory
+DisplaceSourceDirectory = "landscape/_texture_tiles/" + EcosystemName + "/displace"
+
+# Do not use, needs to be removed and fixed in processes
+DisplaceSourceDirectories = [ ]
+DisplaceSourceDirectories += [ DisplaceSourceDirectory ]
+
+# Bank directory
+BankSourceDirectory = "landscape/_texture_tiles/" + EcosystemName
+
+# Vegetable set directories
+VegetSetSourceDirectories = [ ]
+VegetSetSourceDirectories += [ "landscape/microveget/" + EcosystemName ]
+
+# Veget directories
+VegetSourceDirectories = [ ]
+VegetSourceDirectories += [ "landscape/microveget/" + EcosystemName ]
+
+# Ligo directories
+LigoBaseSourceDirectory = "landscape/ligo/" + EcosystemName
+LigoMaxSourceDirectory = LigoBaseSourceDirectory + "/max"
+
+# Zone directories
+ZoneSourceDirectory = [ "landscape/zones/" + EcosystemName ] # For old snowballs style landscape when not using ligo
+
+# Ig landscape directories
+IgLandSourceDirectory = "_invalid"
+
+# Ig other directories
+IgOtherSourceDirectory = "_invalid"
+
+# PACS primitives directories
+PacsPrimSourceDirectories = [ ]
+PacsPrimSourceDirectories += [ DatabaseRootPath + "/decors/vegetations" ]
+
+
+# *** LOOKUP DIRECTORIES WITHIN THE BUILD PIPELINE *** (TODO: use these instead of search_pathes in properties(_base).cfg)
+
+# Ig lookup directories used by rbank
+IgLookupDirectories = [ ]
+
+# Shape lookup directories used by rbank
+ShapeLookupDirectories = [ ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_clodtex_build" ]
+ShapeLookupDirectories += [ EcosystemPath + "/shape_with_coarse_mesh" ]
+
+# Map lookup directories not yet used
+MapLookupDirectories = [ ]
+MapLookupDirectories += [ EcosystemPath + "/map_export" ]
+MapLookupDirectories += [ EcosystemPath + "/map_uncompressed" ]
+
+
+# *** EXPORT DIRECTORIES FOR THE BUILD PIPELINE ***
+
+# Map directories
+MapExportDirectory = CommonPath + "/map_export"
+MapUncompressedExportDirectory = CommonPath + "/map_uncompressed"
+
+# Shape directories
+ShapeTagExportDirectory = CommonPath + "/shape_tag"
+ShapeNotOptimizedExportDirectory = CommonPath + "/shape_not_optimized"
+ShapeWithCoarseMeshExportDirectory = CommonPath + "/shape_with_coarse_mesh"
+ShapeLightmapNotOptimizedExportDirectory = CommonPath + "/shape_lightmap_not_optimized"
+ShapeAnimExportDirectory = CommonPath + "/shape_anim"
+
+# Smallbank directories
+SmallbankExportDirectory = CommonPath + "/smallbank"
+
+# Tiles directories
+TilesExportDirectory = CommonPath + "/tiles"
+
+# Tiles directories
+DisplaceExportDirectory = CommonPath + "/diplace"
+
+# Veget directories
+VegetExportDirectory = CommonPath + "/veget"
+VegetTagExportDirectory = CommonPath + "/veget_tag"
+
+# Veget Set directories
+VegetSetExportDirectory = CommonPath + "/veget_set"
+
+# Ligo directories
+LigoEcosystemExportDirectory = CommonPath + "/ligo_es"
+LigoEcosystemIgExportDirectory = LigoEcosystemExportDirectory + "/igs"
+LigoEcosystemZoneExportDirectory = LigoEcosystemExportDirectory + "/zones"
+LigoEcosystemZoneLigoExportDirectory = LigoEcosystemExportDirectory + "/zoneligos"
+LigoEcosystemCmbExportDirectory = LigoEcosystemExportDirectory + "/cmb"
+LigoEcosystemTagExportDirectory = CommonPath + "/ligo_es_tag"
+
+# Zone directories
+ZoneExportDirectory = CommonPath + "/zone"
+
+# PACS primitives directories
+PacsPrimExportDirectory = CommonPath + "/pacs_prim"
+PacsPrimTagExportDirectory = CommonPath + "/pacs_prim_tag"
+
+
+# *** BUILD DIRECTORIES FOR THE BUILD PIPELINE ***
+
+# Map directories
+MapBuildDirectory = CommonPath + "/map"
+MapPanoplyBuildDirectory = CommonPath + "/map_panoply"
+MapPanoplyHlsInfoBuildDirectory = CommonPath + "/map_panoply_hls_info"
+MapPanoplyHlsBankBuildDirectory = CommonPath + "/map_panoply_hls_bank"
+MapPanoplyCacheBuildDirectory = CommonPath + "/map_panoply_cache"
+MapTagBuildDirectory = CommonPath + "/map_tag"
+
+# Shape directories
+ShapeClodtexBuildDirectory = CommonPath + "/shape_clodtex_build"
+ShapeWithCoarseMeshBuildDirectory = CommonPath + "/shape_with_coarse_mesh_builded"
+ShapeLightmapBuildDirectory = CommonPath + "/shape_lightmap"
+ShapeLightmap16BitsBuildDirectory = CommonPath + "/shape_lightmap_16_bits"
+
+# Farbank directories
+FarbankBuildDirectory = CommonPath + "/farbank"
+
+# Ig directories ************** TODO CONFIRM IN IG BUILD PROCESS ************ FIX RBANK IF NEEDED ***********
+IgLandBuildDirectory = "_invalid"
+IgOtherBuildDirectory = "_invalid"
+
+# Rbank directories
+RbankOutputBuildDirectory = "_invalid"
+
+# Ligo directories
+
+
+# *** INSTALL DIRECTORIES IN THE CLIENT DATA ***
+
+# Map directory
+MapInstallDirectory = CommonName + "_maps"
+BitmapInstallDirectory = MapInstallDirectory
+
+# Shape directory
+ShapeInstallDirectory = CommonName + "_shapes"
+
+# Lightmap directory
+LightmapInstallDirectory = CommonName + "_lightmaps"
+
+# Tile directory
+TilesInstallDirectory = CommonName + "_tiles"
+
+# Displace directory
+DisplaceInstallDirectory = CommonName + "_displaces"
+
+# Bank directory
+BankInstallDirectory = CommonName + "_bank"
+
+# Vegetable set directory
+VegetSetInstallDirectory = CommonName + "_vegetable_sets"
+
+# Vegetable shape directory
+VegetInstallDirectory = CommonName + "_vegetables"
+
+# PACS primitives directories
+PacsPrimInstallDirectory = CommonName + "_pacs_prim"

nel/tools/build_gamedata/generators/ecosystem_project_template/process.py

@@ -1,122 +1,122 @@
-#!/usr/bin/python
-# 
-# #################################################################
-# ## %PreGenWarning%
-# #################################################################
-# 
-# \file config.py
-# \brief Process configuration
-# \date %PreGenDateTimeStamp%
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Process configuration for '%PreGenEcosystemName%' ecosystem.
-# 
-# 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/>.
-# 
-
-# *** PROCESS CONFIGURATION ***
-
-# *** PROCESS CONFIG ***
-ProcessToComplete = [ ]
-ProcessToComplete += [ "shape" ]
-ProcessToComplete += [ "map" ]
-ProcessToComplete += [ "smallbank" ]
-ProcessToComplete += [ "farbank" ]
-ProcessToComplete += [ "tiles" ]
-ProcessToComplete += [ "displace" ]
-ProcessToComplete += [ "veget" ]
-ProcessToComplete += [ "vegetset" ]
-ProcessToComplete += [ "ligo" ]
-ProcessToComplete += [ "pacs_prim" ]
-
-
-# *** ECOSYSTEM AND CONTINENT NAMES ***
-
-EcosystemName = "%PreGenEcosystemName%"
-EcosystemPath = "ecosystems/" + EcosystemName
-CommonName = EcosystemName
-CommonPath = EcosystemPath
-
-
-# *** MAP EXPORT OPTIONS ***
-PanoplyFileList = [ ]
-HlsBankFileName = ""
-
-# *** SHAPE EXPORT OPTIONS ***
-
-# Compute lightmaps ?
-ShapeExportOptExportLighting = "%PreGenShapeExportOptExportLighting%"
-
-# Cast shadow in lightmap ?
-ShapeExportOptShadow = "%PreGenShapeExportOptShadow%"
-
-# Lighting limits. 0 : normal, 1 : soft shadows
-ShapeExportOptLightingLimit = %PreGenShapeExportOptLightingLimit%
-
-# Lightmap lumel size
-ShapeExportOptLumelSize = "%PreGenShapeExportOptLumelSize%"
-
-# Oversampling value. Can be 1, 2, 4 or 8
-ShapeExportOptOversampling = %PreGenShapeExportOptOversampling%
-
-# Does the lightmap must be generated in 8 bits format ?
-ShapeExportOpt8BitsLightmap = "%PreGenShapeExportOpt8BitsLightmap%"
-
-# Does the lightmaps export must generate logs ?
-ShapeExportOptLightmapLog = "%PreGenShapeExportOptLightmapLog%"
-
-# Coarse mesh texture mul size
-TextureMulSizeValue = "%PreGenTextureMulSizeValue%"
-
-ClodConfigFile = ""
-
-# *** COARSE MESH TEXTURE NAME ***
-CoarseMeshTextureNames = [ ]
-%PreGenCoarseMeshTextureNames%
-# *** POSTFIX USED BY THE MULTIPLE TILES SYSTEM ***
-MultipleTilesPostfix = [ ]
-%PreGenMultipleTilesPostfix%
-# *** BANK EXPORT OPTIONS ***
-
-# Name of the tilebank to use
-BankTileBankName = EcosystemName
-
-# *** RBANK EXPORT OPTIONS ***
-
-# Output names
-RbankRbankName = "_invalid"
-
-# *** LIGO OPTIONS ***
-
-LigoExportLand = ""
-LigoExportOnePass = 0
-
-# *** MAPS OPTIONS ***
-
-ReduceBitmapFactor = 0
-# list all panoply files
-MapPanoplyFileList = None
-# name of the .hlsbank to build.
-MapHlsBankFileName = None
-
-# *** SHAPE BUILD OPTIONS *
-
-BuildShadowSkinEnabled = False
-ClodConfigFile = ""
-
-# *** PACS_PRIM OPTIONS ***
-WantLandscapeColPrimPacsList = True
+#!/usr/bin/python
+# 
+# #################################################################
+# ## %PreGenWarning%
+# #################################################################
+# 
+# \file config.py
+# \brief Process configuration
+# \date %PreGenDateTimeStamp%
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Process configuration for '%PreGenEcosystemName%' ecosystem.
+# 
+# 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/>.
+# 
+
+# *** PROCESS CONFIGURATION ***
+
+# *** PROCESS CONFIG ***
+ProcessToComplete = [ ]
+ProcessToComplete += [ "shape" ]
+ProcessToComplete += [ "map" ]
+ProcessToComplete += [ "smallbank" ]
+ProcessToComplete += [ "farbank" ]
+ProcessToComplete += [ "tiles" ]
+ProcessToComplete += [ "displace" ]
+ProcessToComplete += [ "veget" ]
+ProcessToComplete += [ "vegetset" ]
+ProcessToComplete += [ "ligo" ]
+ProcessToComplete += [ "pacs_prim" ]
+
+
+# *** ECOSYSTEM AND CONTINENT NAMES ***
+
+EcosystemName = "%PreGenEcosystemName%"
+EcosystemPath = "ecosystems/" + EcosystemName
+CommonName = EcosystemName
+CommonPath = EcosystemPath
+
+
+# *** MAP EXPORT OPTIONS ***
+PanoplyFileList = [ ]
+HlsBankFileName = ""
+
+# *** SHAPE EXPORT OPTIONS ***
+
+# Compute lightmaps ?
+ShapeExportOptExportLighting = "%PreGenShapeExportOptExportLighting%"
+
+# Cast shadow in lightmap ?
+ShapeExportOptShadow = "%PreGenShapeExportOptShadow%"
+
+# Lighting limits. 0 : normal, 1 : soft shadows
+ShapeExportOptLightingLimit = %PreGenShapeExportOptLightingLimit%
+
+# Lightmap lumel size
+ShapeExportOptLumelSize = "%PreGenShapeExportOptLumelSize%"
+
+# Oversampling value. Can be 1, 2, 4 or 8
+ShapeExportOptOversampling = %PreGenShapeExportOptOversampling%
+
+# Does the lightmap must be generated in 8 bits format ?
+ShapeExportOpt8BitsLightmap = "%PreGenShapeExportOpt8BitsLightmap%"
+
+# Does the lightmaps export must generate logs ?
+ShapeExportOptLightmapLog = "%PreGenShapeExportOptLightmapLog%"
+
+# Coarse mesh texture mul size
+TextureMulSizeValue = "%PreGenTextureMulSizeValue%"
+
+ClodConfigFile = ""
+
+# *** COARSE MESH TEXTURE NAME ***
+CoarseMeshTextureNames = [ ]
+%PreGenCoarseMeshTextureNames%
+# *** POSTFIX USED BY THE MULTIPLE TILES SYSTEM ***
+MultipleTilesPostfix = [ ]
+%PreGenMultipleTilesPostfix%
+# *** BANK EXPORT OPTIONS ***
+
+# Name of the tilebank to use
+BankTileBankName = EcosystemName
+
+# *** RBANK EXPORT OPTIONS ***
+
+# Output names
+RbankRbankName = "_invalid"
+
+# *** LIGO OPTIONS ***
+
+LigoExportLand = ""
+LigoExportOnePass = 0
+
+# *** MAPS OPTIONS ***
+
+ReduceBitmapFactor = 0
+# list all panoply files
+MapPanoplyFileList = None
+# name of the .hlsbank to build.
+MapHlsBankFileName = None
+
+# *** SHAPE BUILD OPTIONS *
+
+BuildShadowSkinEnabled = False
+ClodConfigFile = ""
+
+# *** PACS_PRIM OPTIONS ***
+WantLandscapeColPrimPacsList = True

nel/tools/build_gamedata/generators/generate_all.py

@@ -1,65 +1,65 @@
-#!/usr/bin/python
-# 
-# \file 0_setup.py
-# \brief Run all setup processes
-# \date 2009-02-18 15:28GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all setup processes
-# 
-# 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("generate_all.log"):
-	os.remove("generate_all.log")
-log = open("generate_all.log", "w")
-from scripts import *
-from buildsite import *
-from tools import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Generate all")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-
-try:
-	subprocess.call([ "python", "generate_simple_max_exporters.py" ])
-except Exception, e:
-	printLog(log, "<" + processName + "> " + str(e))
-printLog(log, "")
-
-
-try:
-	subprocess.call([ "python", "generate_tagged_max_exporters.py" ])
-except Exception, e:
-	printLog(log, "<" + processName + "> " + str(e))
-printLog(log, "")
-
-
-try:
-	subprocess.call([ "python", "generate_ecosystem_projects.py" ])
-except Exception, e:
-	printLog(log, "<" + processName + "> " + str(e))
-printLog(log, "")
-
-
-log.close()
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief Run all setup processes
+# \date 2009-02-18 15:28GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Run all setup processes
+# 
+# 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("generate_all.log"):
+	os.remove("generate_all.log")
+log = open("generate_all.log", "w")
+from scripts import *
+from buildsite import *
+from tools import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Generate all")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+
+try:
+	subprocess.call([ "python", "generate_simple_max_exporters.py" ])
+except Exception, e:
+	printLog(log, "<" + processName + "> " + str(e))
+printLog(log, "")
+
+
+try:
+	subprocess.call([ "python", "generate_tagged_max_exporters.py" ])
+except Exception, e:
+	printLog(log, "<" + processName + "> " + str(e))
+printLog(log, "")
+
+
+try:
+	subprocess.call([ "python", "generate_ecosystem_projects.py" ])
+except Exception, e:
+	printLog(log, "<" + processName + "> " + str(e))
+printLog(log, "")
+
+
+log.close()

nel/tools/build_gamedata/generators/generate_ecosystem_projects.py

@@ -1,278 +1,278 @@
-#!/usr/bin/python
-# 
-# \file generate_ecosystem_projects.py
-# \brief Run all setup processes
-# \date 2010-09-02 10:36GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Generate ecosystem projects
-# 
-# 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("generate_ecosystem_projects.log"):
-	os.remove("generate_ecosystem_projects.log")
-log = open("generate_ecosystem_projects.log", "w")
-from scripts import *
-from buildsite import *
-from tools import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Generate ecosystem projects")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-templateDir = os.getcwd().replace("\\", "/") + "/ecosystem_project_template"
-mkPath(log, templateDir)
-
-os.chdir("..")
-
-
-# Scroll down to add an ecosystem.
-
-
-
-DefaultShapeExportOptExportLighting = "true"
-DefaultShapeExportOptShadow = "true"
-DefaultShapeExportOptLightingLimit = "1"
-DefaultShapeExportOptLumelSize = "0.25"
-DefaultShapeExportOptOversampling = "1"
-DefaultShapeExportOpt8BitsLightmap = "true"
-DefaultShapeExportOptLightmapLog = "true"
-DefaultTextureMulSizeValue = "1.5"
-DefaultSeasonSuffixes = [ "sp" ] + [ "su" ] + [ "au" ] + [ "wi" ]
-DefaultMapSubdirectories = [ ]
-DefaultTileDirectories = [ ]
-
-
-ShapeExportOptExportLighting = DefaultShapeExportOptExportLighting
-ShapeExportOptShadow = DefaultShapeExportOptShadow
-ShapeExportOptLightingLimit = DefaultShapeExportOptLightingLimit
-ShapeExportOptLumelSize = DefaultShapeExportOptLumelSize
-ShapeExportOptOversampling = DefaultShapeExportOptOversampling
-ShapeExportOpt8BitsLightmap = DefaultShapeExportOpt8BitsLightmap
-ShapeExportOptLightmapLog = DefaultShapeExportOptLightmapLog
-TextureMulSizeValue = DefaultTextureMulSizeValue
-SeasonSuffixes = DefaultSeasonSuffixes
-MapSubdirectories = DefaultMapSubdirectories
-TileDirectories = DefaultTileDirectories
-
-
-PreGenDateTimeStamp = None
-PreGenEcosystemName = None
-PreGenDatabaseRootName = None
-PreGenCoarseMeshTextureNames = None
-PreGenMultipleTilesPostfix = None
-PreGenMapSubdirectories = None
-PreGenTileSourceDirectories = None
-
-
-def transformLine(line):
-	newline = line.replace("%PreGenWarning%", "WARNING : this is a generated file, don't change it !")
-	newline = newline.replace("%PreGenDateTimeStamp%", PreGenDateTimeStamp)
-	
-	newline = newline.replace("%PreGenEcosystemName%", PreGenEcosystemName)
-	newline = newline.replace("%PreGenDatabaseRootName%", PreGenDatabaseRootName)
-	
-	newline = newline.replace("%PreGenCoarseMeshTextureNames%", PreGenCoarseMeshTextureNames)
-	newline = newline.replace("%PreGenMultipleTilesPostfix%", PreGenMultipleTilesPostfix)
-	newline = newline.replace("%PreGenMapSubdirectories%", PreGenMapSubdirectories)
-	newline = newline.replace("%PreGenTileSourceDirectories%", PreGenTileSourceDirectories)
-	
-	newline = newline.replace("%PreGenShapeExportOptExportLighting%", ShapeExportOptExportLighting)
-	newline = newline.replace("%PreGenShapeExportOptShadow%", ShapeExportOptShadow)
-	newline = newline.replace("%PreGenShapeExportOptLightingLimit%", ShapeExportOptLightingLimit)
-	newline = newline.replace("%PreGenShapeExportOptLumelSize%", ShapeExportOptLumelSize)
-	newline = newline.replace("%PreGenShapeExportOptOversampling%", ShapeExportOptOversampling)
-	newline = newline.replace("%PreGenShapeExportOpt8BitsLightmap%", ShapeExportOpt8BitsLightmap)
-	newline = newline.replace("%PreGenShapeExportOptLightmapLog%", ShapeExportOptLightmapLog)
-	newline = newline.replace("%PreGenTextureMulSizeValue%", TextureMulSizeValue)
-	newline = newline.replace("%PreGenTileSourceDirectories%", PreGenTileSourceDirectories)
-	
-	return newline
-
-def generateFile(sourceFile, destFile):
-	srcf = open(sourceFile, "r")
-	dstf = open(destFile, "w")
-	printLog(log, "WRITE " + destFile)
-	for line in srcf:
-		dstf.write(transformLine(line))
-	dstf.close()
-	srcf.close()
-
-def generateEcosystem(ecosystemName, databaseRootName):
-	global PreGenEcosystemName
-	PreGenEcosystemName = ecosystemName
-	global PreGenDatabaseRootName
-	PreGenDatabaseRootName = databaseRootName
-	global PreGenDateTimeStamp
-	PreGenDateTimeStamp = time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time()))
-	
-	global PreGenMultipleTilesPostfix
-	PreGenMultipleTilesPostfix = ""
-	global PreGenCoarseMeshTextureNames
-	PreGenCoarseMeshTextureNames = ""
-	global PreGenTileSourceDirectories
-	PreGenTileSourceDirectories = ""
-	for suffix in SeasonSuffixes:
-		PreGenMultipleTilesPostfix += "MultipleTilesPostfix += [ \"_" + suffix + "\" ]\n"
-		PreGenCoarseMeshTextureNames += "CoarseMeshTextureNames += [ \"nel_coarse_mesh_\" + EcosystemName + \"_" + suffix + "\" ]\n"
-		for tiledir in TileDirectories:
-			PreGenTileSourceDirectories += "TilesSourceDirectories += [ \"landscape/_texture_tiles/\" + EcosystemName + \"_" + suffix + "/" + tiledir + "\" ]\n"
-	global PreGenMapSubdirectories
-	PreGenMapSubdirectories = ""
-	for subdir in MapSubdirectories:
-		PreGenMapSubdirectories += "MapSourceDirectories += [ DatabaseRootPath + \"/decors/_textures/" + subdir + "\" ]\n"
-	
-	destDir = WorkspaceDirectory + "/ecosystems/" + ecosystemName
-	mkPath(log, destDir)
-	
-	generateFile(templateDir + "/process.py", destDir + "/process.py")
-	generateFile(templateDir + "/directories.py", destDir + "/directories.py")
-	
-	return
-
-
-
-# Add new ecosystems below this line.
-
-
-
-# DESERT
-ShapeExportOptExportLighting = DefaultShapeExportOptExportLighting
-ShapeExportOptShadow = DefaultShapeExportOptShadow
-ShapeExportOptLightingLimit = DefaultShapeExportOptLightingLimit
-ShapeExportOptLumelSize = DefaultShapeExportOptLumelSize
-ShapeExportOptOversampling = DefaultShapeExportOptOversampling
-ShapeExportOpt8BitsLightmap = DefaultShapeExportOpt8BitsLightmap
-ShapeExportOptLightmapLog = DefaultShapeExportOptLightmapLog
-TextureMulSizeValue = DefaultTextureMulSizeValue
-SeasonSuffixes = DefaultSeasonSuffixes
-MapSubdirectories = [ ]
-MapSubdirectories += [ "vegetations" ]
-TileDirectories = [ ]
-TileDirectories += [ "1.5-marecage_profond" ]
-TileDirectories += [ "1-marecages" ]
-TileDirectories += [ "2-citees" ]
-TileDirectories += [ "3-fond_canyon" ]
-TileDirectories += [ "4.2-boisbandeclair" ]
-TileDirectories += [ "4.5-desert2boisbande" ]
-TileDirectories += [ "4-falaise_bois_bande" ]
-TileDirectories += [ "5-falaise_normales" ]
-TileDirectories += [ "6.5-desertalternatif" ]
-TileDirectories += [ "6-desert" ]
-TileDirectories += [ "7-routes" ]
-TileDirectories += [ "8-foretbrule" ]
-generateEcosystem("desert", "fyros")
-
-
-# JUNGLE
-ShapeExportOptExportLighting = DefaultShapeExportOptExportLighting
-ShapeExportOptShadow = DefaultShapeExportOptShadow
-ShapeExportOptLightingLimit = DefaultShapeExportOptLightingLimit
-ShapeExportOptLumelSize = DefaultShapeExportOptLumelSize
-ShapeExportOptOversampling = DefaultShapeExportOptOversampling
-ShapeExportOpt8BitsLightmap = "false"
-ShapeExportOptLightmapLog = DefaultShapeExportOptLightmapLog
-TextureMulSizeValue = DefaultTextureMulSizeValue
-SeasonSuffixes = DefaultSeasonSuffixes
-MapSubdirectories = [ ]
-MapSubdirectories += [ "vegetations" ]
-TileDirectories = [ ]
-TileDirectories += [ "10-crevassejungle" ]
-TileDirectories += [ "11-paroisjungle" ]
-TileDirectories += [ "12-vasejungle" ]
-TileDirectories += [ "1-junglemousse" ]
-TileDirectories += [ "2-junglefeuilles" ]
-TileDirectories += [ "3-jungleherbesseche" ]
-TileDirectories += [ "4-jungleherbevieille" ]
-TileDirectories += [ "5-jungleterreaux" ]
-TileDirectories += [ "6-junglegoo" ]
-TileDirectories += [ "7-sciurejungle" ]
-TileDirectories += [ "8-terrejungle" ]
-TileDirectories += [ "9-falaisejungle" ]
-TileDirectories += [ "Transitions" ]
-generateEcosystem("jungle", "jungle")
-
-
-# PRIMES RACINES
-ShapeExportOptExportLighting = DefaultShapeExportOptExportLighting
-ShapeExportOptShadow = DefaultShapeExportOptShadow
-ShapeExportOptLightingLimit = DefaultShapeExportOptLightingLimit
-ShapeExportOptLumelSize = DefaultShapeExportOptLumelSize
-ShapeExportOptOversampling = DefaultShapeExportOptOversampling
-ShapeExportOpt8BitsLightmap = "false"
-ShapeExportOptLightmapLog = DefaultShapeExportOptLightmapLog
-TextureMulSizeValue = DefaultTextureMulSizeValue
-SeasonSuffixes = DefaultSeasonSuffixes
-MapSubdirectories = [ ]
-MapSubdirectories += [ "vegetations" ]
-MapSubdirectories += [ "batiments" ]
-TileDirectories = [ ]
-TileDirectories += [ "PR-creux" ]
-TileDirectories += [ "PR-dome-moussu" ]
-TileDirectories += [ "PR-kitiniere" ]
-TileDirectories += [ "PR-mousse-licken" ]
-TileDirectories += [ "PR-mousse-spongieus" ]
-TileDirectories += [ "PR-parois" ]
-TileDirectories += [ "PR-sol-mousse" ]
-TileDirectories += [ "PR-souche" ]
-TileDirectories += [ "PR-stalagmite" ]
-TileDirectories += [ "PR-terre" ]
-TileDirectories += [ "aditif" ]
-generateEcosystem("primes_racines", "primes_racines")
-
-
-# LACUSTRE
-ShapeExportOptExportLighting = DefaultShapeExportOptExportLighting
-ShapeExportOptShadow = DefaultShapeExportOptShadow
-ShapeExportOptLightingLimit = "0"
-ShapeExportOptLumelSize = DefaultShapeExportOptLumelSize
-ShapeExportOptOversampling = "8"
-ShapeExportOpt8BitsLightmap = "false"
-ShapeExportOptLightmapLog = DefaultShapeExportOptLightmapLog
-TextureMulSizeValue = DefaultTextureMulSizeValue
-SeasonSuffixes = DefaultSeasonSuffixes
-MapSubdirectories = [ ]
-MapSubdirectories += [ "vegetations" ]
-TileDirectories = [ ]
-TileDirectories += [ "1a-sable-marin" ]
-TileDirectories += [ "1-plages" ]
-TileDirectories += [ "2-iles" ]
-TileDirectories += [ "2-ilesa" ]
-TileDirectories += [ "2-iles-marines" ]
-TileDirectories += [ "3-fondmarin2plage" ]
-TileDirectories += [ "4-marecages" ]
-TileDirectories += [ "5-marecages" ]
-TileDirectories += [ "5-parois-marine" ]
-TileDirectories += [ "6-fond_marin" ]
-TileDirectories += [ "7-bassesiles" ]
-TileDirectories += [ "7-mousseter" ]
-TileDirectories += [ "7-racines" ]
-TileDirectories += [ "8-mousse_marine" ]
-TileDirectories += [ "constructible" ]
-generateEcosystem("lacustre", "tryker")
-
-
-
-
-printLog(log, "")
-log.close()
+#!/usr/bin/python
+# 
+# \file generate_ecosystem_projects.py
+# \brief Run all setup processes
+# \date 2010-09-02 10:36GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Generate ecosystem projects
+# 
+# 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("generate_ecosystem_projects.log"):
+	os.remove("generate_ecosystem_projects.log")
+log = open("generate_ecosystem_projects.log", "w")
+from scripts import *
+from buildsite import *
+from tools import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Generate ecosystem projects")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+templateDir = os.getcwd().replace("\\", "/") + "/ecosystem_project_template"
+mkPath(log, templateDir)
+
+os.chdir("..")
+
+
+# Scroll down to add an ecosystem.
+
+
+
+DefaultShapeExportOptExportLighting = "true"
+DefaultShapeExportOptShadow = "true"
+DefaultShapeExportOptLightingLimit = "1"
+DefaultShapeExportOptLumelSize = "0.25"
+DefaultShapeExportOptOversampling = "1"
+DefaultShapeExportOpt8BitsLightmap = "true"
+DefaultShapeExportOptLightmapLog = "true"
+DefaultTextureMulSizeValue = "1.5"
+DefaultSeasonSuffixes = [ "sp" ] + [ "su" ] + [ "au" ] + [ "wi" ]
+DefaultMapSubdirectories = [ ]
+DefaultTileDirectories = [ ]
+
+
+ShapeExportOptExportLighting = DefaultShapeExportOptExportLighting
+ShapeExportOptShadow = DefaultShapeExportOptShadow
+ShapeExportOptLightingLimit = DefaultShapeExportOptLightingLimit
+ShapeExportOptLumelSize = DefaultShapeExportOptLumelSize
+ShapeExportOptOversampling = DefaultShapeExportOptOversampling
+ShapeExportOpt8BitsLightmap = DefaultShapeExportOpt8BitsLightmap
+ShapeExportOptLightmapLog = DefaultShapeExportOptLightmapLog
+TextureMulSizeValue = DefaultTextureMulSizeValue
+SeasonSuffixes = DefaultSeasonSuffixes
+MapSubdirectories = DefaultMapSubdirectories
+TileDirectories = DefaultTileDirectories
+
+
+PreGenDateTimeStamp = None
+PreGenEcosystemName = None
+PreGenDatabaseRootName = None
+PreGenCoarseMeshTextureNames = None
+PreGenMultipleTilesPostfix = None
+PreGenMapSubdirectories = None
+PreGenTileSourceDirectories = None
+
+
+def transformLine(line):
+	newline = line.replace("%PreGenWarning%", "WARNING : this is a generated file, don't change it !")
+	newline = newline.replace("%PreGenDateTimeStamp%", PreGenDateTimeStamp)
+	
+	newline = newline.replace("%PreGenEcosystemName%", PreGenEcosystemName)
+	newline = newline.replace("%PreGenDatabaseRootName%", PreGenDatabaseRootName)
+	
+	newline = newline.replace("%PreGenCoarseMeshTextureNames%", PreGenCoarseMeshTextureNames)
+	newline = newline.replace("%PreGenMultipleTilesPostfix%", PreGenMultipleTilesPostfix)
+	newline = newline.replace("%PreGenMapSubdirectories%", PreGenMapSubdirectories)
+	newline = newline.replace("%PreGenTileSourceDirectories%", PreGenTileSourceDirectories)
+	
+	newline = newline.replace("%PreGenShapeExportOptExportLighting%", ShapeExportOptExportLighting)
+	newline = newline.replace("%PreGenShapeExportOptShadow%", ShapeExportOptShadow)
+	newline = newline.replace("%PreGenShapeExportOptLightingLimit%", ShapeExportOptLightingLimit)
+	newline = newline.replace("%PreGenShapeExportOptLumelSize%", ShapeExportOptLumelSize)
+	newline = newline.replace("%PreGenShapeExportOptOversampling%", ShapeExportOptOversampling)
+	newline = newline.replace("%PreGenShapeExportOpt8BitsLightmap%", ShapeExportOpt8BitsLightmap)
+	newline = newline.replace("%PreGenShapeExportOptLightmapLog%", ShapeExportOptLightmapLog)
+	newline = newline.replace("%PreGenTextureMulSizeValue%", TextureMulSizeValue)
+	newline = newline.replace("%PreGenTileSourceDirectories%", PreGenTileSourceDirectories)
+	
+	return newline
+
+def generateFile(sourceFile, destFile):
+	srcf = open(sourceFile, "r")
+	dstf = open(destFile, "w")
+	printLog(log, "WRITE " + destFile)
+	for line in srcf:
+		dstf.write(transformLine(line))
+	dstf.close()
+	srcf.close()
+
+def generateEcosystem(ecosystemName, databaseRootName):
+	global PreGenEcosystemName
+	PreGenEcosystemName = ecosystemName
+	global PreGenDatabaseRootName
+	PreGenDatabaseRootName = databaseRootName
+	global PreGenDateTimeStamp
+	PreGenDateTimeStamp = time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time()))
+	
+	global PreGenMultipleTilesPostfix
+	PreGenMultipleTilesPostfix = ""
+	global PreGenCoarseMeshTextureNames
+	PreGenCoarseMeshTextureNames = ""
+	global PreGenTileSourceDirectories
+	PreGenTileSourceDirectories = ""
+	for suffix in SeasonSuffixes:
+		PreGenMultipleTilesPostfix += "MultipleTilesPostfix += [ \"_" + suffix + "\" ]\n"
+		PreGenCoarseMeshTextureNames += "CoarseMeshTextureNames += [ \"nel_coarse_mesh_\" + EcosystemName + \"_" + suffix + "\" ]\n"
+		for tiledir in TileDirectories:
+			PreGenTileSourceDirectories += "TilesSourceDirectories += [ \"landscape/_texture_tiles/\" + EcosystemName + \"_" + suffix + "/" + tiledir + "\" ]\n"
+	global PreGenMapSubdirectories
+	PreGenMapSubdirectories = ""
+	for subdir in MapSubdirectories:
+		PreGenMapSubdirectories += "MapSourceDirectories += [ DatabaseRootPath + \"/decors/_textures/" + subdir + "\" ]\n"
+	
+	destDir = WorkspaceDirectory + "/ecosystems/" + ecosystemName
+	mkPath(log, destDir)
+	
+	generateFile(templateDir + "/process.py", destDir + "/process.py")
+	generateFile(templateDir + "/directories.py", destDir + "/directories.py")
+	
+	return
+
+
+
+# Add new ecosystems below this line.
+
+
+
+# DESERT
+ShapeExportOptExportLighting = DefaultShapeExportOptExportLighting
+ShapeExportOptShadow = DefaultShapeExportOptShadow
+ShapeExportOptLightingLimit = DefaultShapeExportOptLightingLimit
+ShapeExportOptLumelSize = DefaultShapeExportOptLumelSize
+ShapeExportOptOversampling = DefaultShapeExportOptOversampling
+ShapeExportOpt8BitsLightmap = DefaultShapeExportOpt8BitsLightmap
+ShapeExportOptLightmapLog = DefaultShapeExportOptLightmapLog
+TextureMulSizeValue = DefaultTextureMulSizeValue
+SeasonSuffixes = DefaultSeasonSuffixes
+MapSubdirectories = [ ]
+MapSubdirectories += [ "vegetations" ]
+TileDirectories = [ ]
+TileDirectories += [ "1.5-marecage_profond" ]
+TileDirectories += [ "1-marecages" ]
+TileDirectories += [ "2-citees" ]
+TileDirectories += [ "3-fond_canyon" ]
+TileDirectories += [ "4.2-boisbandeclair" ]
+TileDirectories += [ "4.5-desert2boisbande" ]
+TileDirectories += [ "4-falaise_bois_bande" ]
+TileDirectories += [ "5-falaise_normales" ]
+TileDirectories += [ "6.5-desertalternatif" ]
+TileDirectories += [ "6-desert" ]
+TileDirectories += [ "7-routes" ]
+TileDirectories += [ "8-foretbrule" ]
+generateEcosystem("desert", "fyros")
+
+
+# JUNGLE
+ShapeExportOptExportLighting = DefaultShapeExportOptExportLighting
+ShapeExportOptShadow = DefaultShapeExportOptShadow
+ShapeExportOptLightingLimit = DefaultShapeExportOptLightingLimit
+ShapeExportOptLumelSize = DefaultShapeExportOptLumelSize
+ShapeExportOptOversampling = DefaultShapeExportOptOversampling
+ShapeExportOpt8BitsLightmap = "false"
+ShapeExportOptLightmapLog = DefaultShapeExportOptLightmapLog
+TextureMulSizeValue = DefaultTextureMulSizeValue
+SeasonSuffixes = DefaultSeasonSuffixes
+MapSubdirectories = [ ]
+MapSubdirectories += [ "vegetations" ]
+TileDirectories = [ ]
+TileDirectories += [ "10-crevassejungle" ]
+TileDirectories += [ "11-paroisjungle" ]
+TileDirectories += [ "12-vasejungle" ]
+TileDirectories += [ "1-junglemousse" ]
+TileDirectories += [ "2-junglefeuilles" ]
+TileDirectories += [ "3-jungleherbesseche" ]
+TileDirectories += [ "4-jungleherbevieille" ]
+TileDirectories += [ "5-jungleterreaux" ]
+TileDirectories += [ "6-junglegoo" ]
+TileDirectories += [ "7-sciurejungle" ]
+TileDirectories += [ "8-terrejungle" ]
+TileDirectories += [ "9-falaisejungle" ]
+TileDirectories += [ "Transitions" ]
+generateEcosystem("jungle", "jungle")
+
+
+# PRIMES RACINES
+ShapeExportOptExportLighting = DefaultShapeExportOptExportLighting
+ShapeExportOptShadow = DefaultShapeExportOptShadow
+ShapeExportOptLightingLimit = DefaultShapeExportOptLightingLimit
+ShapeExportOptLumelSize = DefaultShapeExportOptLumelSize
+ShapeExportOptOversampling = DefaultShapeExportOptOversampling
+ShapeExportOpt8BitsLightmap = "false"
+ShapeExportOptLightmapLog = DefaultShapeExportOptLightmapLog
+TextureMulSizeValue = DefaultTextureMulSizeValue
+SeasonSuffixes = DefaultSeasonSuffixes
+MapSubdirectories = [ ]
+MapSubdirectories += [ "vegetations" ]
+MapSubdirectories += [ "batiments" ]
+TileDirectories = [ ]
+TileDirectories += [ "PR-creux" ]
+TileDirectories += [ "PR-dome-moussu" ]
+TileDirectories += [ "PR-kitiniere" ]
+TileDirectories += [ "PR-mousse-licken" ]
+TileDirectories += [ "PR-mousse-spongieus" ]
+TileDirectories += [ "PR-parois" ]
+TileDirectories += [ "PR-sol-mousse" ]
+TileDirectories += [ "PR-souche" ]
+TileDirectories += [ "PR-stalagmite" ]
+TileDirectories += [ "PR-terre" ]
+TileDirectories += [ "aditif" ]
+generateEcosystem("primes_racines", "primes_racines")
+
+
+# LACUSTRE
+ShapeExportOptExportLighting = DefaultShapeExportOptExportLighting
+ShapeExportOptShadow = DefaultShapeExportOptShadow
+ShapeExportOptLightingLimit = "0"
+ShapeExportOptLumelSize = DefaultShapeExportOptLumelSize
+ShapeExportOptOversampling = "8"
+ShapeExportOpt8BitsLightmap = "false"
+ShapeExportOptLightmapLog = DefaultShapeExportOptLightmapLog
+TextureMulSizeValue = DefaultTextureMulSizeValue
+SeasonSuffixes = DefaultSeasonSuffixes
+MapSubdirectories = [ ]
+MapSubdirectories += [ "vegetations" ]
+TileDirectories = [ ]
+TileDirectories += [ "1a-sable-marin" ]
+TileDirectories += [ "1-plages" ]
+TileDirectories += [ "2-iles" ]
+TileDirectories += [ "2-ilesa" ]
+TileDirectories += [ "2-iles-marines" ]
+TileDirectories += [ "3-fondmarin2plage" ]
+TileDirectories += [ "4-marecages" ]
+TileDirectories += [ "5-marecages" ]
+TileDirectories += [ "5-parois-marine" ]
+TileDirectories += [ "6-fond_marin" ]
+TileDirectories += [ "7-bassesiles" ]
+TileDirectories += [ "7-mousseter" ]
+TileDirectories += [ "7-racines" ]
+TileDirectories += [ "8-mousse_marine" ]
+TileDirectories += [ "constructible" ]
+generateEcosystem("lacustre", "tryker")
+
+
+
+
+printLog(log, "")
+log.close()

nel/tools/build_gamedata/generators/generate_simple_max_exporters.py

@@ -1,100 +1,100 @@
-#!/usr/bin/python
-# 
-# \file 0_setup.py
-# \brief Run all setup processes
-# \date 2009-02-18 15:28GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all setup processes
-# 
-# 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("generate_simple_max_exporters.log"):
-	os.remove("generate_simple_max_exporters.log")
-log = open("generate_simple_max_exporters.log", "w")
-from scripts import *
-from buildsite import *
-from tools import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Generate simple max exporters")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-def processLine(line, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp):
-	newline = line.replace("%PreGenWarning%", "WARNING : this is a generated file, don't change it !")
-	newline = newline.replace("%PreGenDateTimeStamp%", dateTimeStamp)
-	newline = newline.replace("%PreGenProcessName%", processName)
-	newline = newline.replace("%PreGenFileExtension%", fileExtension)
-	newline = newline.replace("%PreGenSourceDirectoriesVariable%", sourceDirectoriesVariable)
-	newline = newline.replace("%PreGenExportDirectoryVariable%", exportDirectoryVariable)
-	newline = newline.replace("%PreGenInstallDirectoryVariable%", clientDirectoryVariable)
-	return newline
-
-def generateSimpleMaxExporterFile(sourceFile, destFile, writeMode, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp):
-	srcf = open(sourceFile, "r")
-	dstf = open(destFile, writeMode)
-	printLog(log, "WRITE " + destFile + " " + writeMode)
-	for line in srcf:
-		dstf.write(processLine(line, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp))
-	dstf.close()
-	srcf.close()
-
-def generateSimpleMaxExporter(processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable):
-	dateTimeStamp = time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time()))
-	processDir = ScriptDirectory + "/processes/" + processName
-	mkPath(log, processDir)
-	maxscriptDir = processDir + "/maxscript"
-	mkPath(log, maxscriptDir)
-	templateDir = os.getcwd().replace("\\", "/") + "/simple_max_exporter_template"
-	mkPath(log, templateDir)
-	scriptDir = os.getcwd().replace("\\", "/") + "/max_exporter_scripts"
-	mkPath(log, scriptDir)
-	
-	if not os.path.isfile(processDir + "/0_setup.py"):
-		generateSimpleMaxExporterFile(templateDir + "/0_setup.py", processDir + "/0_setup.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	
-	generateSimpleMaxExporterFile(templateDir + "/1_export_header.py", processDir + "/1_export.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	generateSimpleMaxExporterFile(scriptDir + "/" + fileExtension + ".py", processDir + "/1_export.py", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	generateSimpleMaxExporterFile(templateDir + "/1_export_footer.py", processDir + "/1_export.py", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	
-	if not os.path.isfile(processDir + "/2_build.py"):
-		generateSimpleMaxExporterFile(templateDir + "/2_build.py", processDir + "/2_build.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	if not os.path.isfile(processDir + "/3_install.py"):
-		generateSimpleMaxExporterFile(templateDir + "/3_install.py", processDir + "/3_install.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	
-	generateSimpleMaxExporterFile(templateDir + "/export_header.ms", maxscriptDir + "/" + fileExtension + "_export.ms", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	generateSimpleMaxExporterFile(scriptDir + "/" + fileExtension + ".ms", maxscriptDir + "/" + fileExtension + "_export.ms", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	generateSimpleMaxExporterFile(templateDir + "/export_footer.ms", maxscriptDir + "/" + fileExtension + "_export.ms", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-
-
-
-generateSimpleMaxExporter("skel", "skel", "SkelSourceDirectories", "SkelExportDirectory", "SkelInstallDirectory")
-
-generateSimpleMaxExporter("swt", "swt", "SwtSourceDirectories", "SwtExportDirectory", "SwtInstallDirectory")
-
-generateSimpleMaxExporter("zone", "zone", "ZoneSourceDirectory", "ZoneExportDirectory", "ZoneInstallDirectory")
-
-
-
-printLog(log, "")
-log.close()
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief Run all setup processes
+# \date 2009-02-18 15:28GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Run all setup processes
+# 
+# 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("generate_simple_max_exporters.log"):
+	os.remove("generate_simple_max_exporters.log")
+log = open("generate_simple_max_exporters.log", "w")
+from scripts import *
+from buildsite import *
+from tools import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Generate simple max exporters")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+def processLine(line, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp):
+	newline = line.replace("%PreGenWarning%", "WARNING : this is a generated file, don't change it !")
+	newline = newline.replace("%PreGenDateTimeStamp%", dateTimeStamp)
+	newline = newline.replace("%PreGenProcessName%", processName)
+	newline = newline.replace("%PreGenFileExtension%", fileExtension)
+	newline = newline.replace("%PreGenSourceDirectoriesVariable%", sourceDirectoriesVariable)
+	newline = newline.replace("%PreGenExportDirectoryVariable%", exportDirectoryVariable)
+	newline = newline.replace("%PreGenInstallDirectoryVariable%", clientDirectoryVariable)
+	return newline
+
+def generateSimpleMaxExporterFile(sourceFile, destFile, writeMode, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp):
+	srcf = open(sourceFile, "r")
+	dstf = open(destFile, writeMode)
+	printLog(log, "WRITE " + destFile + " " + writeMode)
+	for line in srcf:
+		dstf.write(processLine(line, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp))
+	dstf.close()
+	srcf.close()
+
+def generateSimpleMaxExporter(processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable):
+	dateTimeStamp = time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time()))
+	processDir = ScriptDirectory + "/processes/" + processName
+	mkPath(log, processDir)
+	maxscriptDir = processDir + "/maxscript"
+	mkPath(log, maxscriptDir)
+	templateDir = os.getcwd().replace("\\", "/") + "/simple_max_exporter_template"
+	mkPath(log, templateDir)
+	scriptDir = os.getcwd().replace("\\", "/") + "/max_exporter_scripts"
+	mkPath(log, scriptDir)
+	
+	if not os.path.isfile(processDir + "/0_setup.py"):
+		generateSimpleMaxExporterFile(templateDir + "/0_setup.py", processDir + "/0_setup.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	
+	generateSimpleMaxExporterFile(templateDir + "/1_export_header.py", processDir + "/1_export.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	generateSimpleMaxExporterFile(scriptDir + "/" + fileExtension + ".py", processDir + "/1_export.py", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	generateSimpleMaxExporterFile(templateDir + "/1_export_footer.py", processDir + "/1_export.py", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	
+	if not os.path.isfile(processDir + "/2_build.py"):
+		generateSimpleMaxExporterFile(templateDir + "/2_build.py", processDir + "/2_build.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	if not os.path.isfile(processDir + "/3_install.py"):
+		generateSimpleMaxExporterFile(templateDir + "/3_install.py", processDir + "/3_install.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	
+	generateSimpleMaxExporterFile(templateDir + "/export_header.ms", maxscriptDir + "/" + fileExtension + "_export.ms", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	generateSimpleMaxExporterFile(scriptDir + "/" + fileExtension + ".ms", maxscriptDir + "/" + fileExtension + "_export.ms", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	generateSimpleMaxExporterFile(templateDir + "/export_footer.ms", maxscriptDir + "/" + fileExtension + "_export.ms", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+
+
+
+generateSimpleMaxExporter("skel", "skel", "SkelSourceDirectories", "SkelExportDirectory", "SkelInstallDirectory")
+
+generateSimpleMaxExporter("swt", "swt", "SwtSourceDirectories", "SwtExportDirectory", "SwtInstallDirectory")
+
+generateSimpleMaxExporter("zone", "zone", "ZoneSourceDirectory", "ZoneExportDirectory", "ZoneInstallDirectory")
+
+
+
+printLog(log, "")
+log.close()

nel/tools/build_gamedata/generators/generate_tagged_max_exporters.py

@@ -1,120 +1,120 @@
-#!/usr/bin/python
-# 
-# \file 0_setup.py
-# \brief Run all setup processes
-# \date 2009-02-18 15:28GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all setup processes
-# 
-# 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("generate_tagged_max_exporters.log"):
-	os.remove("generate_tagged_max_exporters.log")
-log = open("generate_tagged_max_exporters.log", "w")
-from scripts import *
-from buildsite import *
-from tools import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Generate tagged max exporters")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-templateDir = os.getcwd().replace("\\", "/") + "/tagged_max_exporter_template"
-mkPath(log, templateDir)
-scriptDir = os.getcwd().replace("\\", "/") + "/max_exporter_scripts"
-mkPath(log, scriptDir)
-
-def processLine(line, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp):
-	newline = line.replace("%PreGenWarning%", "WARNING : this is a generated file, don't change it !")
-	newline = newline.replace("%PreGenDateTimeStamp%", dateTimeStamp)
-	newline = newline.replace("%PreGenProcessName%", processName)
-	newline = newline.replace("%PreGenFileExtension%", fileExtension)
-	newline = newline.replace("%PreGenSourceDirectoriesVariable%", sourceDirectoriesVariable)
-	newline = newline.replace("%PreGenExportDirectoryVariable%", exportDirectoryVariable)
-	newline = newline.replace("%PreGenTagExportDirectoryVariable%", tagExportDirectoryVariable)
-	newline = newline.replace("%PreGenInstallDirectoryVariable%", clientDirectoryVariable)
-	return newline
-
-def generateTaggedMaxExporterFile(sourceFile, destFile, writeMode, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp):
-	srcf = open(sourceFile, "r")
-	dstf = open(destFile, writeMode)
-	printLog(log, "WRITE " + destFile + " " + writeMode)
-	for line in srcf:
-		dstf.write(processLine(line, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp))
-	dstf.close()
-	srcf.close()
-
-def generateTaggedMaxScriptFile(processDir, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp):
-	maxscriptDir = processDir + "/maxscript"
-	mkPath(log, maxscriptDir)
-	generateTaggedMaxExporterFile(templateDir + "/export_header.ms", maxscriptDir + "/" + fileExtension + "_export.ms", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	generateTaggedMaxExporterFile(scriptDir + "/" + fileExtension + ".ms", maxscriptDir + "/" + fileExtension + "_export.ms", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	generateTaggedMaxExporterFile(templateDir + "/export_footer.ms", maxscriptDir + "/" + fileExtension + "_export.ms", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-
-def generateTaggedMaxScript(processName, fileExtension):
-	dateTimeStamp = time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time()))
-	processDir = ScriptDirectory + "/processes/" + processName
-	mkPath(log, processDir)
-	
-	generateTaggedMaxScriptFile(processDir, processName, fileExtension, "_invalid", "_invalid", "_invalid", "_invalid", dateTimeStamp)
-
-def generateTaggedMaxExporter(processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable):
-	dateTimeStamp = time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time()))
-	processDir = ScriptDirectory + "/processes/" + processName
-	mkPath(log, processDir)
-	
-	if not os.path.isfile(processDir + "/0_setup.py"):
-		generateTaggedMaxExporterFile(templateDir + "/0_setup.py", processDir + "/0_setup.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	
-	generateTaggedMaxExporterFile(templateDir + "/1_export_header.py", processDir + "/1_export.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	generateTaggedMaxExporterFile(scriptDir + "/" + fileExtension + ".py", processDir + "/1_export.py", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	generateTaggedMaxExporterFile(templateDir + "/1_export_footer.py", processDir + "/1_export.py", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	
-	if not os.path.isfile(processDir + "/2_build.py"):
-		generateTaggedMaxExporterFile(templateDir + "/2_build.py", processDir + "/2_build.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	if not os.path.isfile(processDir + "/3_install.py"):
-		generateTaggedMaxExporterFile(templateDir + "/3_install.py", processDir + "/3_install.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-	
-	generateTaggedMaxScriptFile(processDir, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
-
-
-
-generateTaggedMaxExporter("pacs_prim", "pacs_prim", "PacsPrimSourceDirectories", "PacsPrimExportDirectory", "PacsPrimTagExportDirectory", "PacsPrimInstallDirectory")
-
-generateTaggedMaxExporter("clodbank", "clod", "ClodSourceDirectories", "ClodExportDirectory", "ClodTagExportDirectory", "ClodInstallDirectory")
-
-generateTaggedMaxScript("ig", "ig")
-
-generateTaggedMaxExporter("rbank", "cmb", "RBankCmbSourceDirectories", "RBankCmbExportDirectory", "RBankCmbTagExportDirectory", "PacsInstallDirectory")
-
-generateTaggedMaxExporter("veget", "veget", "VegetSourceDirectories", "VegetExportDirectory", "VegetTagExportDirectory", "VegetInstallDirectory")
-
-generateTaggedMaxScript("shape", "shape")
-
-generateTaggedMaxExporter("anim", "anim", "AnimSourceDirectories", "AnimExportDirectory", "AnimTagExportDirectory", "AnimInstallDirectory")
-
-
-
-printLog(log, "")
-log.close()
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief Run all setup processes
+# \date 2009-02-18 15:28GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Run all setup processes
+# 
+# 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("generate_tagged_max_exporters.log"):
+	os.remove("generate_tagged_max_exporters.log")
+log = open("generate_tagged_max_exporters.log", "w")
+from scripts import *
+from buildsite import *
+from tools import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Generate tagged max exporters")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+templateDir = os.getcwd().replace("\\", "/") + "/tagged_max_exporter_template"
+mkPath(log, templateDir)
+scriptDir = os.getcwd().replace("\\", "/") + "/max_exporter_scripts"
+mkPath(log, scriptDir)
+
+def processLine(line, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp):
+	newline = line.replace("%PreGenWarning%", "WARNING : this is a generated file, don't change it !")
+	newline = newline.replace("%PreGenDateTimeStamp%", dateTimeStamp)
+	newline = newline.replace("%PreGenProcessName%", processName)
+	newline = newline.replace("%PreGenFileExtension%", fileExtension)
+	newline = newline.replace("%PreGenSourceDirectoriesVariable%", sourceDirectoriesVariable)
+	newline = newline.replace("%PreGenExportDirectoryVariable%", exportDirectoryVariable)
+	newline = newline.replace("%PreGenTagExportDirectoryVariable%", tagExportDirectoryVariable)
+	newline = newline.replace("%PreGenInstallDirectoryVariable%", clientDirectoryVariable)
+	return newline
+
+def generateTaggedMaxExporterFile(sourceFile, destFile, writeMode, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp):
+	srcf = open(sourceFile, "r")
+	dstf = open(destFile, writeMode)
+	printLog(log, "WRITE " + destFile + " " + writeMode)
+	for line in srcf:
+		dstf.write(processLine(line, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp))
+	dstf.close()
+	srcf.close()
+
+def generateTaggedMaxScriptFile(processDir, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp):
+	maxscriptDir = processDir + "/maxscript"
+	mkPath(log, maxscriptDir)
+	generateTaggedMaxExporterFile(templateDir + "/export_header.ms", maxscriptDir + "/" + fileExtension + "_export.ms", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	generateTaggedMaxExporterFile(scriptDir + "/" + fileExtension + ".ms", maxscriptDir + "/" + fileExtension + "_export.ms", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	generateTaggedMaxExporterFile(templateDir + "/export_footer.ms", maxscriptDir + "/" + fileExtension + "_export.ms", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+
+def generateTaggedMaxScript(processName, fileExtension):
+	dateTimeStamp = time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time()))
+	processDir = ScriptDirectory + "/processes/" + processName
+	mkPath(log, processDir)
+	
+	generateTaggedMaxScriptFile(processDir, processName, fileExtension, "_invalid", "_invalid", "_invalid", "_invalid", dateTimeStamp)
+
+def generateTaggedMaxExporter(processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable):
+	dateTimeStamp = time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time()))
+	processDir = ScriptDirectory + "/processes/" + processName
+	mkPath(log, processDir)
+	
+	if not os.path.isfile(processDir + "/0_setup.py"):
+		generateTaggedMaxExporterFile(templateDir + "/0_setup.py", processDir + "/0_setup.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	
+	generateTaggedMaxExporterFile(templateDir + "/1_export_header.py", processDir + "/1_export.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	generateTaggedMaxExporterFile(scriptDir + "/" + fileExtension + ".py", processDir + "/1_export.py", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	generateTaggedMaxExporterFile(templateDir + "/1_export_footer.py", processDir + "/1_export.py", "a", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	
+	if not os.path.isfile(processDir + "/2_build.py"):
+		generateTaggedMaxExporterFile(templateDir + "/2_build.py", processDir + "/2_build.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	if not os.path.isfile(processDir + "/3_install.py"):
+		generateTaggedMaxExporterFile(templateDir + "/3_install.py", processDir + "/3_install.py", "w", processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+	
+	generateTaggedMaxScriptFile(processDir, processName, fileExtension, sourceDirectoriesVariable, exportDirectoryVariable, tagExportDirectoryVariable, clientDirectoryVariable, dateTimeStamp)
+
+
+
+generateTaggedMaxExporter("pacs_prim", "pacs_prim", "PacsPrimSourceDirectories", "PacsPrimExportDirectory", "PacsPrimTagExportDirectory", "PacsPrimInstallDirectory")
+
+generateTaggedMaxExporter("clodbank", "clod", "ClodSourceDirectories", "ClodExportDirectory", "ClodTagExportDirectory", "ClodInstallDirectory")
+
+generateTaggedMaxScript("ig", "ig")
+
+generateTaggedMaxExporter("rbank", "cmb", "RBankCmbSourceDirectories", "RBankCmbExportDirectory", "RBankCmbTagExportDirectory", "PacsInstallDirectory")
+
+generateTaggedMaxExporter("veget", "veget", "VegetSourceDirectories", "VegetExportDirectory", "VegetTagExportDirectory", "VegetInstallDirectory")
+
+generateTaggedMaxScript("shape", "shape")
+
+generateTaggedMaxExporter("anim", "anim", "AnimSourceDirectories", "AnimExportDirectory", "AnimTagExportDirectory", "AnimInstallDirectory")
+
+
+
+printLog(log, "")
+log.close()

nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py

@@ -1,7 +1,7 @@
-
-
-# Remove bad file from previous script version
-listPath = ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable% + "/landscape_col_prim_pacs_list.txt"
-if os.path.isfile(listPath):
-	os.remove(listPath)
-
+
+
+# Remove bad file from previous script version
+listPath = ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable% + "/landscape_col_prim_pacs_list.txt"
+if os.path.isfile(listPath):
+	os.remove(listPath)
+

nel/tools/build_gamedata/generators/max_exporter_scripts/skel.py

@@ -1,8 +1,8 @@
-
-
-printLog(log, ">>> Export skel directly <<<")
-mkPath(log, ExportBuildDirectory + "/" + SkelExportDirectory)
-for dir in SkelSourceDirectories:
-	mkPath(log, DatabaseDirectory + "/" + dir)
-	copyFilesExtNoSubdirIfNeeded(log, DatabaseDirectory + "/" + dir, ExportBuildDirectory + "/" + SkelExportDirectory, ".skel")
-
+
+
+printLog(log, ">>> Export skel directly <<<")
+mkPath(log, ExportBuildDirectory + "/" + SkelExportDirectory)
+for dir in SkelSourceDirectories:
+	mkPath(log, DatabaseDirectory + "/" + dir)
+	copyFilesExtNoSubdirIfNeeded(log, DatabaseDirectory + "/" + dir, ExportBuildDirectory + "/" + SkelExportDirectory, ".skel")
+

nel/tools/build_gamedata/generators/max_exporter_scripts/zone.py

@@ -1,8 +1,8 @@
-
-
-printLog(log, ">>> Try to copy ligo zone if any <<<")
-printLog(log, "********************************")
-printLog(log, "********      TODO      ********")
-printLog(log, "********************************")
-printLog(log, "")
-
+
+
+printLog(log, ">>> Try to copy ligo zone if any <<<")
+printLog(log, "********************************")
+printLog(log, "********      TODO      ********")
+printLog(log, "********************************")
+printLog(log, "")
+

nel/tools/build_gamedata/generators/simple_max_exporter_template/0_setup.py

@@ -1,65 +1,65 @@
-#!/usr/bin/python
-# 
-# \file 0_setup.py
-# \brief setup %PreGenProcessName%
-# \date %PreGenDateTimeStamp%
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Setup %PreGenProcessName%
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Setup %PreGenProcessName%")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Setup source directories
-printLog(log, ">>> Setup source directories <<<")
-for dir in %PreGenSourceDirectoriesVariable%:
-	mkPath(log, DatabaseDirectory + "/" + dir)
-
-# Setup export directories
-printLog(log, ">>> Setup export directories <<<")
-mkPath(log, ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%)
-
-# Setup build directories
-printLog(log, ">>> Setup build directories <<<")
-
-# Setup client directories
-printLog(log, ">>> Setup client directories <<<")
-mkPath(log, InstallDirectory + "/" + %PreGenInstallDirectoryVariable%)
-
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief setup %PreGenProcessName%
+# \date %PreGenDateTimeStamp%
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Setup %PreGenProcessName%
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Setup %PreGenProcessName%")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Setup source directories
+printLog(log, ">>> Setup source directories <<<")
+for dir in %PreGenSourceDirectoriesVariable%:
+	mkPath(log, DatabaseDirectory + "/" + dir)
+
+# Setup export directories
+printLog(log, ">>> Setup export directories <<<")
+mkPath(log, ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%)
+
+# Setup build directories
+printLog(log, ">>> Setup build directories <<<")
+
+# Setup client directories
+printLog(log, ">>> Setup client directories <<<")
+mkPath(log, InstallDirectory + "/" + %PreGenInstallDirectoryVariable%)
+
+log.close()
+
+
+# end of file

nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_footer.py

@@ -1,7 +1,7 @@
-
-
-printLog(log, "")
-log.close()
-
-
-# end of file
+
+
+printLog(log, "")
+log.close()
+
+
+# end of file

nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_header.py

@@ -1,92 +1,92 @@
-#!/usr/bin/python
-# 
-# #################################################################
-# ## %PreGenWarning%
-# #################################################################
-# 
-# \file 1_export.py
-# \brief Export %PreGenProcessName%
-# \date %PreGenDateTimeStamp%
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Export %PreGenProcessName%
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Export %PreGenProcessName%")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-# ...
-
-# Export %PreGenProcessName% 3dsmax
-if MaxAvailable:
-	# Find tools
-	Max = findMax(log, MaxDirectory, MaxExecutable)
-	printLog(log, "")
-	
-	printLog(log, ">>> Export %PreGenProcessName% 3dsmax <<<")
-	mkPath(log, ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%)
-	for dir in %PreGenSourceDirectoriesVariable%:
-		mkPath(log, DatabaseDirectory + "/" + dir)
-		if (needUpdateDirByTagLog(log, DatabaseDirectory + "/" + dir, ".max", ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%, ".%PreGenFileExtension%")):
-			scriptSrc = "maxscript/%PreGenFileExtension%_export.ms"
-			scriptDst = MaxUserDirectory + "/scripts/%PreGenFileExtension%_export.ms"
-			outputLogfile = ScriptDirectory + "/processes/%PreGenProcessName%/log.log"
-			outputDirectory =  ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%
-			maxSourceDir = DatabaseDirectory + "/" + dir
-			tagList = findFiles(log, outputDirectory, "", ".%PreGenFileExtension%")
-			tagLen = len(tagList)
-			if os.path.isfile(scriptDst):
-				os.remove(scriptDst)
-			tagDiff = 1
-			sSrc = open(scriptSrc, "r")
-			sDst = open(scriptDst, "w")
-			for line in sSrc:
-				newline = line.replace("%OutputLogfile%", outputLogfile)
-				newline = newline.replace("%MaxSourceDirectory%", maxSourceDir)
-				newline = newline.replace("%OutputDirectory%", outputDirectory)
-				sDst.write(newline)
-			sSrc.close()
-			sDst.close()
-			while tagDiff > 0:
-				printLog(log, "MAXSCRIPT " + scriptDst)
-				subprocess.call([ Max, "-U", "MAXScript", "%PreGenFileExtension%_export.ms", "-q", "-mi", "-mip" ])
-				tagList = findFiles(log, outputDirectory, "", ".%PreGenFileExtension%")
-				newTagLen = len(tagList)
-				tagDiff = newTagLen - tagLen
-				tagLen = newTagLen
-				printLog(log, "Exported " + str(tagDiff) + " .%PreGenFileExtension% files!")
-			os.remove(scriptDst)
-
+#!/usr/bin/python
+# 
+# #################################################################
+# ## %PreGenWarning%
+# #################################################################
+# 
+# \file 1_export.py
+# \brief Export %PreGenProcessName%
+# \date %PreGenDateTimeStamp%
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Export %PreGenProcessName%
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Export %PreGenProcessName%")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Find tools
+# ...
+
+# Export %PreGenProcessName% 3dsmax
+if MaxAvailable:
+	# Find tools
+	Max = findMax(log, MaxDirectory, MaxExecutable)
+	printLog(log, "")
+	
+	printLog(log, ">>> Export %PreGenProcessName% 3dsmax <<<")
+	mkPath(log, ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%)
+	for dir in %PreGenSourceDirectoriesVariable%:
+		mkPath(log, DatabaseDirectory + "/" + dir)
+		if (needUpdateDirByTagLog(log, DatabaseDirectory + "/" + dir, ".max", ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%, ".%PreGenFileExtension%")):
+			scriptSrc = "maxscript/%PreGenFileExtension%_export.ms"
+			scriptDst = MaxUserDirectory + "/scripts/%PreGenFileExtension%_export.ms"
+			outputLogfile = ScriptDirectory + "/processes/%PreGenProcessName%/log.log"
+			outputDirectory =  ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%
+			maxSourceDir = DatabaseDirectory + "/" + dir
+			tagList = findFiles(log, outputDirectory, "", ".%PreGenFileExtension%")
+			tagLen = len(tagList)
+			if os.path.isfile(scriptDst):
+				os.remove(scriptDst)
+			tagDiff = 1
+			sSrc = open(scriptSrc, "r")
+			sDst = open(scriptDst, "w")
+			for line in sSrc:
+				newline = line.replace("%OutputLogfile%", outputLogfile)
+				newline = newline.replace("%MaxSourceDirectory%", maxSourceDir)
+				newline = newline.replace("%OutputDirectory%", outputDirectory)
+				sDst.write(newline)
+			sSrc.close()
+			sDst.close()
+			while tagDiff > 0:
+				printLog(log, "MAXSCRIPT " + scriptDst)
+				subprocess.call([ Max, "-U", "MAXScript", "%PreGenFileExtension%_export.ms", "-q", "-mi", "-mip" ])
+				tagList = findFiles(log, outputDirectory, "", ".%PreGenFileExtension%")
+				newTagLen = len(tagList)
+				tagDiff = newTagLen - tagLen
+				tagLen = newTagLen
+				printLog(log, "Exported " + str(tagDiff) + " .%PreGenFileExtension% files!")
+			os.remove(scriptDst)
+

nel/tools/build_gamedata/generators/simple_max_exporter_template/2_build.py

@@ -1,49 +1,49 @@
-#!/usr/bin/python
-# 
-# \file 2_build.py
-# \brief Build %PreGenProcessName%
-# \date %PreGenDateTimeStamp%
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Build %PreGenProcessName%
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Build %PreGenProcessName%")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 2_build.py
+# \brief Build %PreGenProcessName%
+# \date %PreGenDateTimeStamp%
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Build %PreGenProcessName%
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Build %PreGenProcessName%")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+log.close()
+
+
+# end of file

nel/tools/build_gamedata/generators/simple_max_exporter_template/3_install.py

@@ -1,57 +1,57 @@
-#!/usr/bin/python
-# 
-# \file 3_install.py
-# \brief Install %PreGenProcessName%
-# \date %PreGenDateTimeStamp%
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Install %PreGenProcessName%
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Install %PreGenProcessName%")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-printLog(log, ">>> Install %PreGenProcessName% <<<")
-exportPath = ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%
-mkPath(log, exportPath)
-installPath = InstallDirectory + "/" + %PreGenInstallDirectoryVariable%
-mkPath(log, installPath)
-copyFilesExtNoSubdirIfNeeded(log, exportPath, installPath, ".%PreGenFileExtension%")
-
-printLog(log, "")
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 3_install.py
+# \brief Install %PreGenProcessName%
+# \date %PreGenDateTimeStamp%
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Install %PreGenProcessName%
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Install %PreGenProcessName%")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+printLog(log, ">>> Install %PreGenProcessName% <<<")
+exportPath = ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%
+mkPath(log, exportPath)
+installPath = InstallDirectory + "/" + %PreGenInstallDirectoryVariable%
+mkPath(log, installPath)
+copyFilesExtNoSubdirIfNeeded(log, exportPath, installPath, ".%PreGenFileExtension%")
+
+printLog(log, "")
+log.close()
+
+
+# end of file

nel/tools/build_gamedata/generators/tagged_max_exporter_template/0_setup.py

@@ -1,66 +1,66 @@
-#!/usr/bin/python
-# 
-# \file 0_setup.py
-# \brief setup %PreGenProcessName%
-# \date %PreGenDateTimeStamp%
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Setup %PreGenProcessName%
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Setup %PreGenProcessName%")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Setup source directories
-printLog(log, ">>> Setup source directories <<<")
-for dir in %PreGenSourceDirectoriesVariable%:
-	mkPath(log, DatabaseDirectory + "/" + dir)
-
-# Setup export directories
-printLog(log, ">>> Setup export directories <<<")
-mkPath(log, ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%)
-mkPath(log, ExportBuildDirectory + "/" + %PreGenTagExportDirectoryVariable%)
-
-# Setup build directories
-printLog(log, ">>> Setup build directories <<<")
-
-# Setup client directories
-printLog(log, ">>> Setup client directories <<<")
-mkPath(log, InstallDirectory + "/" + %PreGenInstallDirectoryVariable%)
-
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief setup %PreGenProcessName%
+# \date %PreGenDateTimeStamp%
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Setup %PreGenProcessName%
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Setup %PreGenProcessName%")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Setup source directories
+printLog(log, ">>> Setup source directories <<<")
+for dir in %PreGenSourceDirectoriesVariable%:
+	mkPath(log, DatabaseDirectory + "/" + dir)
+
+# Setup export directories
+printLog(log, ">>> Setup export directories <<<")
+mkPath(log, ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%)
+mkPath(log, ExportBuildDirectory + "/" + %PreGenTagExportDirectoryVariable%)
+
+# Setup build directories
+printLog(log, ">>> Setup build directories <<<")
+
+# Setup client directories
+printLog(log, ">>> Setup client directories <<<")
+mkPath(log, InstallDirectory + "/" + %PreGenInstallDirectoryVariable%)
+
+log.close()
+
+
+# end of file

nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_footer.py

@@ -1,9 +1,9 @@
-
-
-log.close()
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-shutil.move("temp_log.log", "log.log")
-
-
-# end of file
+
+
+log.close()
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+shutil.move("temp_log.log", "log.log")
+
+
+# end of file

nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_header.py

@@ -1,130 +1,130 @@
-#!/usr/bin/python
-# 
-# #################################################################
-# ## %PreGenWarning%
-# #################################################################
-# 
-# \file 1_export.py
-# \brief Export %PreGenProcessName%
-# \date %PreGenDateTimeStamp%
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Export %PreGenProcessName%
-# 
-# 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")
-if os.path.isfile("temp_log.log"):
-	os.remove("temp_log.log")
-log = open("temp_log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Export %PreGenProcessName%")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-
-# Find tools
-# ...
-
-# Export %PreGenProcessName% 3dsmax
-if MaxAvailable:
-	# Find tools
-	Max = findMax(log, MaxDirectory, MaxExecutable)
-	printLog(log, "")
-	
-	printLog(log, ">>> Export %PreGenProcessName% 3dsmax <<<")
-	mkPath(log, ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%)
-	mkPath(log, ExportBuildDirectory + "/" + %PreGenTagExportDirectoryVariable%)
-	for dir in %PreGenSourceDirectoriesVariable%:
-		mkPath(log, DatabaseDirectory + "/" + dir)
-		if (needUpdateDirByTagLog(log, DatabaseDirectory + "/" + dir, ".max", ExportBuildDirectory + "/" + %PreGenTagExportDirectoryVariable%, ".max.tag")):
-			scriptSrc = "maxscript/%PreGenFileExtension%_export.ms"
-			scriptDst = MaxUserDirectory + "/scripts/%PreGenFileExtension%_export.ms"
-			outputLogfile = ScriptDirectory + "/processes/%PreGenProcessName%/log.log"
-			outputDirectory =  ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%
-			tagDirectory =  ExportBuildDirectory + "/" + %PreGenTagExportDirectoryVariable%
-			maxSourceDir = DatabaseDirectory + "/" + dir
-			maxRunningTagFile = tagDirectory + "/max_running.tag"
-			tagList = findFiles(log, tagDirectory, "", ".max.tag")
-			tagLen = len(tagList)
-			if os.path.isfile(scriptDst):
-				os.remove(scriptDst)
-			tagDiff = 1
-			sSrc = open(scriptSrc, "r")
-			sDst = open(scriptDst, "w")
-			for line in sSrc:
-				newline = line.replace("%OutputLogfile%", outputLogfile)
-				newline = newline.replace("%MaxSourceDirectory%", maxSourceDir)
-				newline = newline.replace("%OutputDirectory%", outputDirectory)
-				newline = newline.replace("%TagDirectory%", tagDirectory)
-				sDst.write(newline)
-			sSrc.close()
-			sDst.close()
-			zeroRetryLimit = 3
-			while tagDiff > 0:
-				mrt = open(maxRunningTagFile, "w")
-				mrt.write("moe-moe-kyun")
-				mrt.close()
-				printLog(log, "MAXSCRIPT " + scriptDst)
-				subprocess.call([ Max, "-U", "MAXScript", "%PreGenFileExtension%_export.ms", "-q", "-mi", "-mip" ])
-				if os.path.exists(outputLogfile):
-					try:
-						lSrc = open(outputLogfile, "r")
-						for line in lSrc:
-							lineStrip = line.strip()
-							if (len(lineStrip) > 0):
-								printLog(log, lineStrip)
-						lSrc.close()
-						os.remove(outputLogfile)
-					except Exception:
-						printLog(log, "ERROR Failed to read 3dsmax log")
-				else:
-					printLog(log, "WARNING No 3dsmax log")
-				tagList = findFiles(log, tagDirectory, "", ".max.tag")
-				newTagLen = len(tagList)
-				tagDiff = newTagLen - tagLen
-				tagLen = newTagLen
-				addTagDiff = 0
-				if os.path.exists(maxRunningTagFile):
-					printLog(log, "FAIL 3ds Max crashed and/or file export failed!")
-					if tagDiff == 0:
-						if zeroRetryLimit > 0:
-							zeroRetryLimit = zeroRetryLimit - 1
-							addTagDiff = 1
-						else:
-							printLog(log, "FAIL Retry limit reached!")
-					else:
-						addTagDiff = 1
-					os.remove(maxRunningTagFile)
-				printLog(log, "Exported " + str(tagDiff) + " .max files!")
-				tagDiff += addTagDiff
-			os.remove(scriptDst)
-	printLog(log, "")
-
+#!/usr/bin/python
+# 
+# #################################################################
+# ## %PreGenWarning%
+# #################################################################
+# 
+# \file 1_export.py
+# \brief Export %PreGenProcessName%
+# \date %PreGenDateTimeStamp%
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Export %PreGenProcessName%
+# 
+# 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")
+if os.path.isfile("temp_log.log"):
+	os.remove("temp_log.log")
+log = open("temp_log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Export %PreGenProcessName%")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+
+# Find tools
+# ...
+
+# Export %PreGenProcessName% 3dsmax
+if MaxAvailable:
+	# Find tools
+	Max = findMax(log, MaxDirectory, MaxExecutable)
+	printLog(log, "")
+	
+	printLog(log, ">>> Export %PreGenProcessName% 3dsmax <<<")
+	mkPath(log, ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%)
+	mkPath(log, ExportBuildDirectory + "/" + %PreGenTagExportDirectoryVariable%)
+	for dir in %PreGenSourceDirectoriesVariable%:
+		mkPath(log, DatabaseDirectory + "/" + dir)
+		if (needUpdateDirByTagLog(log, DatabaseDirectory + "/" + dir, ".max", ExportBuildDirectory + "/" + %PreGenTagExportDirectoryVariable%, ".max.tag")):
+			scriptSrc = "maxscript/%PreGenFileExtension%_export.ms"
+			scriptDst = MaxUserDirectory + "/scripts/%PreGenFileExtension%_export.ms"
+			outputLogfile = ScriptDirectory + "/processes/%PreGenProcessName%/log.log"
+			outputDirectory =  ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%
+			tagDirectory =  ExportBuildDirectory + "/" + %PreGenTagExportDirectoryVariable%
+			maxSourceDir = DatabaseDirectory + "/" + dir
+			maxRunningTagFile = tagDirectory + "/max_running.tag"
+			tagList = findFiles(log, tagDirectory, "", ".max.tag")
+			tagLen = len(tagList)
+			if os.path.isfile(scriptDst):
+				os.remove(scriptDst)
+			tagDiff = 1
+			sSrc = open(scriptSrc, "r")
+			sDst = open(scriptDst, "w")
+			for line in sSrc:
+				newline = line.replace("%OutputLogfile%", outputLogfile)
+				newline = newline.replace("%MaxSourceDirectory%", maxSourceDir)
+				newline = newline.replace("%OutputDirectory%", outputDirectory)
+				newline = newline.replace("%TagDirectory%", tagDirectory)
+				sDst.write(newline)
+			sSrc.close()
+			sDst.close()
+			zeroRetryLimit = 3
+			while tagDiff > 0:
+				mrt = open(maxRunningTagFile, "w")
+				mrt.write("moe-moe-kyun")
+				mrt.close()
+				printLog(log, "MAXSCRIPT " + scriptDst)
+				subprocess.call([ Max, "-U", "MAXScript", "%PreGenFileExtension%_export.ms", "-q", "-mi", "-mip" ])
+				if os.path.exists(outputLogfile):
+					try:
+						lSrc = open(outputLogfile, "r")
+						for line in lSrc:
+							lineStrip = line.strip()
+							if (len(lineStrip) > 0):
+								printLog(log, lineStrip)
+						lSrc.close()
+						os.remove(outputLogfile)
+					except Exception:
+						printLog(log, "ERROR Failed to read 3dsmax log")
+				else:
+					printLog(log, "WARNING No 3dsmax log")
+				tagList = findFiles(log, tagDirectory, "", ".max.tag")
+				newTagLen = len(tagList)
+				tagDiff = newTagLen - tagLen
+				tagLen = newTagLen
+				addTagDiff = 0
+				if os.path.exists(maxRunningTagFile):
+					printLog(log, "FAIL 3ds Max crashed and/or file export failed!")
+					if tagDiff == 0:
+						if zeroRetryLimit > 0:
+							zeroRetryLimit = zeroRetryLimit - 1
+							addTagDiff = 1
+						else:
+							printLog(log, "FAIL Retry limit reached!")
+					else:
+						addTagDiff = 1
+					os.remove(maxRunningTagFile)
+				printLog(log, "Exported " + str(tagDiff) + " .max files!")
+				tagDiff += addTagDiff
+			os.remove(scriptDst)
+	printLog(log, "")
+

nel/tools/build_gamedata/generators/tagged_max_exporter_template/2_build.py

@@ -1,49 +1,49 @@
-#!/usr/bin/python
-# 
-# \file 2_build.py
-# \brief Build %PreGenProcessName%
-# \date %PreGenDateTimeStamp%
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Build %PreGenProcessName%
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Build %PreGenProcessName%")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 2_build.py
+# \brief Build %PreGenProcessName%
+# \date %PreGenDateTimeStamp%
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Build %PreGenProcessName%
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Build %PreGenProcessName%")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+log.close()
+
+
+# end of file

nel/tools/build_gamedata/generators/tagged_max_exporter_template/3_install.py

@@ -1,57 +1,57 @@
-#!/usr/bin/python
-# 
-# \file 3_install.py
-# \brief Install %PreGenProcessName%
-# \date %PreGenDateTimeStamp%
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Install %PreGenProcessName%
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Install %PreGenProcessName%")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-printLog(log, ">>> Install %PreGenProcessName% <<<")
-exportPath = ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%
-mkPath(log, exportPath)
-installPath = InstallDirectory + "/" + %PreGenInstallDirectoryVariable%
-mkPath(log, installPath)
-copyFilesNoTreeIfNeeded(log, exportPath, installPath)
-
-printLog(log, "")
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 3_install.py
+# \brief Install %PreGenProcessName%
+# \date %PreGenDateTimeStamp%
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Install %PreGenProcessName%
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Install %PreGenProcessName%")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+printLog(log, ">>> Install %PreGenProcessName% <<<")
+exportPath = ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%
+mkPath(log, exportPath)
+installPath = InstallDirectory + "/" + %PreGenInstallDirectoryVariable%
+mkPath(log, installPath)
+copyFilesNoTreeIfNeeded(log, exportPath, installPath)
+
+printLog(log, "")
+log.close()
+
+
+# end of file

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
-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
-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
-title Ryzom Core: b1_client_dev.py
-python b1_client_dev.py
-title Ryzom Core: Ready
+title Ryzom Core: 1_export.py (INTERFACE)
+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)
+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)
+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
+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
-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
-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
-title Ryzom Core: b1_client_dev.py (LEVELDESIGN)
-python 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
-title Ryzom Core: Ready
+title Ryzom Core: 1_export.py (LEVELDESIGN)
+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)
+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)
+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)
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py (LEVELDESIGN)
+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
-title Ryzom Core: 2_build.py (PANOPLY)
-python 2_build.py -ipj common/characters_maps_hr
-title Ryzom Core: 3_install.py (PANOPLY)
-python 3_install.py -ipj common/characters_maps_hr
-title Ryzom Core: b1_client_dev.py (PANOPLY)
-python b1_client_dev.py
-title Ryzom Core: b2_shard_data.py (PANOPLY)
-python b2_shard_data.py
-title Ryzom Core: Ready (PANOPLY)
+title Ryzom Core: 1_export.py (PANOPLY)
+1_export.py -ipj common/characters_maps_hr
+title Ryzom Core: 2_build.py (PANOPLY)
+2_build.py -ipj common/characters_maps_hr
+title Ryzom Core: 3_install.py (PANOPLY)
+3_install.py -ipj common/characters_maps_hr
+title Ryzom Core: b1_client_dev.py (PANOPLY)
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py (PANOPLY)
+b2_shard_data.py
+title Ryzom Core: Ready (PANOPLY)

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

@@ -1,89 +1,89 @@
-#!/usr/bin/python
-# 
-# \file 0_setup.py
-# \brief Run all setup processes
-# \date 2009-02-18 15:28GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all setup processes
-# 
-# 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, argparse
-sys.path.append("../configuration")
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--includeprocess', '-ipc', nargs='+')
-parser.add_argument('--excludeprocess', '-epc', nargs='+')
-args = parser.parse_args()
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-#printLog(log, "")
-#printLog(log, "-------")
-#printLog(log, "--- Setup project")
-#printLog(log, "-------")
-#printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-#printLog(log, "")
-
-#printLog(log, "")
-#printLog(log, "-------")
-#printLog(log, "--- Setup client directories")
-#printLog(log, "-------")
-#printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-#printLog(log, "")
-#for dir in ClientSetupDirectories:
-#	mkPath(log, InstallDirectory + "/" + dir)
-#printLog(log, "")
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Run the setup processes")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-# For each process
-for processName in ProcessToComplete:
-	if ((args.includeprocess == None or processName in args.includeprocess) and (args.excludeprocess == None or not processName in args.excludeprocess)):
-		printLog(log, "PROCESS " + processName)
-		os.chdir(processName)
-		try:
-			subprocess.call([ "python", "0_setup.py" ])
-		except Exception, e:
-			printLog(log, "<" + processName + "> " + str(e))
-		os.chdir("..")
-		try:
-			processLog = open(processName + "/log.log", "r")
-			processLogData = processLog.read()
-			processLog.close()
-			log.write(processLogData)
-		except Exception, e:
-			printLog(log, "<" + processName + "> " + str(e))
-		# subprocess.call("idle.bat")
-	else:
-		printLog(log, "IGNORE PROCESS " + processName)
-printLog(log, "")
-
-log.close()
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief Run all setup processes
+# \date 2009-02-18 15:28GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Run all setup processes
+# 
+# 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, argparse
+sys.path.append("../configuration")
+
+parser = argparse.ArgumentParser()
+parser.add_argument('--includeprocess', '-ipc', nargs='+')
+parser.add_argument('--excludeprocess', '-epc', nargs='+')
+args = parser.parse_args()
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+#printLog(log, "")
+#printLog(log, "-------")
+#printLog(log, "--- Setup project")
+#printLog(log, "-------")
+#printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+#printLog(log, "")
+
+#printLog(log, "")
+#printLog(log, "-------")
+#printLog(log, "--- Setup client directories")
+#printLog(log, "-------")
+#printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+#printLog(log, "")
+#for dir in ClientSetupDirectories:
+#	mkPath(log, InstallDirectory + "/" + dir)
+#printLog(log, "")
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Run the setup processes")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+# For each process
+for processName in ProcessToComplete:
+	if ((args.includeprocess == None or processName in args.includeprocess) and (args.excludeprocess == None or not processName in args.excludeprocess)):
+		printLog(log, "PROCESS " + processName)
+		os.chdir(processName)
+		try:
+			subprocess.call([ "python", "0_setup.py" ])
+		except Exception, e:
+			printLog(log, "<" + processName + "> " + str(e))
+		os.chdir("..")
+		try:
+			processLog = open(processName + "/log.log", "r")
+			processLogData = processLog.read()
+			processLog.close()
+			log.write(processLogData)
+		except Exception, e:
+			printLog(log, "<" + processName + "> " + str(e))
+		# subprocess.call("idle.bat")
+	else:
+		printLog(log, "IGNORE PROCESS " + processName)
+printLog(log, "")
+
+log.close()

nel/tools/build_gamedata/processes/1_export.py

@@ -1,73 +1,73 @@
-#!/usr/bin/python
-# 
-# \file 1_export.py
-# \brief Run all export processes
-# \date 2009-02-18 09:22GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all export processes
-# 
-# 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, argparse
-sys.path.append("../configuration")
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--includeprocess', '-ipc', nargs='+')
-parser.add_argument('--excludeprocess', '-epc', nargs='+')
-args = parser.parse_args()
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-# Log error
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Run the export processes")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-# For each process
-for processName in ProcessToComplete:
-	if ((args.includeprocess == None or processName in args.includeprocess) and (args.excludeprocess == None or not processName in args.excludeprocess)):
-		printLog(log, "PROCESS " + processName)
-		os.chdir(processName)
-		try:
-			subprocess.call([ "python", "1_export.py" ])
-		except Exception, e:
-			printLog(log, "<" + processName + "> " + str(e))
-		os.chdir("..")
-		try:
-			processLog = open(processName + "/log.log", "r")
-			processLogData = processLog.read()
-			processLog.close()
-			log.write(processLogData)
-		except Exception, e:
-			printLog(log, "<" + processName + "> " + str(e))
-		# subprocess.call("idle.bat")
-	else:
-		printLog(log, "IGNORE PROCESS " + processName)
-printLog(log, "")
-
-log.close()
+#!/usr/bin/python
+# 
+# \file 1_export.py
+# \brief Run all export processes
+# \date 2009-02-18 09:22GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Run all export processes
+# 
+# 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, argparse
+sys.path.append("../configuration")
+
+parser = argparse.ArgumentParser()
+parser.add_argument('--includeprocess', '-ipc', nargs='+')
+parser.add_argument('--excludeprocess', '-epc', nargs='+')
+args = parser.parse_args()
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+# Log error
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Run the export processes")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+# For each process
+for processName in ProcessToComplete:
+	if ((args.includeprocess == None or processName in args.includeprocess) and (args.excludeprocess == None or not processName in args.excludeprocess)):
+		printLog(log, "PROCESS " + processName)
+		os.chdir(processName)
+		try:
+			subprocess.call([ "python", "1_export.py" ])
+		except Exception, e:
+			printLog(log, "<" + processName + "> " + str(e))
+		os.chdir("..")
+		try:
+			processLog = open(processName + "/log.log", "r")
+			processLogData = processLog.read()
+			processLog.close()
+			log.write(processLogData)
+		except Exception, e:
+			printLog(log, "<" + processName + "> " + str(e))
+		# subprocess.call("idle.bat")
+	else:
+		printLog(log, "IGNORE PROCESS " + processName)
+printLog(log, "")
+
+log.close()

nel/tools/build_gamedata/processes/2_build.py

@@ -1,73 +1,73 @@
-#!/usr/bin/python
-# 
-# \file 2_build.py
-# \brief Run all build processes
-# \date 2009-02-18 09:22GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all build processes
-# 
-# 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, argparse
-sys.path.append("../configuration")
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--includeprocess', '-ipc', nargs='+')
-parser.add_argument('--excludeprocess', '-epc', nargs='+')
-args = parser.parse_args()
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-# Log error
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Run the build processes")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-# For each process
-for processName in ProcessToComplete:
-	if ((args.includeprocess == None or processName in args.includeprocess) and (args.excludeprocess == None or not processName in args.excludeprocess)):
-		printLog(log, "PROCESS " + processName)
-		os.chdir(processName)
-		try:
-			subprocess.call([ "python", "2_build.py" ])
-		except Exception, e:
-			printLog(log, "<" + processName + "> " + str(e))
-		os.chdir("..")
-		try:
-			processLog = open(processName + "/log.log", "r")
-			processLogData = processLog.read()
-			processLog.close()
-			log.write(processLogData)
-		except Exception, e:
-			printLog(log, "<" + processName + "> " + str(e))
-		# subprocess.call("idle.bat")
-	else:
-		printLog(log, "IGNORE PROCESS " + processName)
-printLog(log, "")
-
-log.close()
+#!/usr/bin/python
+# 
+# \file 2_build.py
+# \brief Run all build processes
+# \date 2009-02-18 09:22GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Run all build processes
+# 
+# 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, argparse
+sys.path.append("../configuration")
+
+parser = argparse.ArgumentParser()
+parser.add_argument('--includeprocess', '-ipc', nargs='+')
+parser.add_argument('--excludeprocess', '-epc', nargs='+')
+args = parser.parse_args()
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+# Log error
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Run the build processes")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+# For each process
+for processName in ProcessToComplete:
+	if ((args.includeprocess == None or processName in args.includeprocess) and (args.excludeprocess == None or not processName in args.excludeprocess)):
+		printLog(log, "PROCESS " + processName)
+		os.chdir(processName)
+		try:
+			subprocess.call([ "python", "2_build.py" ])
+		except Exception, e:
+			printLog(log, "<" + processName + "> " + str(e))
+		os.chdir("..")
+		try:
+			processLog = open(processName + "/log.log", "r")
+			processLogData = processLog.read()
+			processLog.close()
+			log.write(processLogData)
+		except Exception, e:
+			printLog(log, "<" + processName + "> " + str(e))
+		# subprocess.call("idle.bat")
+	else:
+		printLog(log, "IGNORE PROCESS " + processName)
+printLog(log, "")
+
+log.close()

nel/tools/build_gamedata/processes/3_install.py

@@ -1,72 +1,72 @@
-#!/usr/bin/python
-# 
-# \file 3_install.py
-# \brief Run all install processes
-# \date 2009-02-18 16:19GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all install processes
-# 
-# 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, argparse
-sys.path.append("../configuration")
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--includeprocess', '-ipc', nargs='+')
-parser.add_argument('--excludeprocess', '-epc', nargs='+')
-args = parser.parse_args()
-
-if os.path.isfile("log.log"):
-	os.remove("log.log")
-log = open("log.log", "w")
-from scripts import *
-from buildsite import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Run the install processes")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-# For each process
-for processName in ProcessToComplete:
-	if ((args.includeprocess == None or processName in args.includeprocess) and (args.excludeprocess == None or not processName in args.excludeprocess)):
-		printLog(log, "PROCESS " + processName)
-		os.chdir(processName)
-		try:
-			subprocess.call([ "python", "3_install.py" ])
-		except Exception, e:
-			printLog(log, "<" + processName + "> " + str(e))
-		os.chdir("..")
-		try:
-			processLog = open(processName + "/log.log", "r")
-			processLogData = processLog.read()
-			processLog.close()
-			log.write(processLogData)
-		except Exception, e:
-			printLog(log, "<" + processName + "> " + str(e))
-		# subprocess.call("idle.bat")
-	else:
-		printLog(log, "IGNORE PROCESS " + processName)
-printLog(log, "")
-
-log.close()
+#!/usr/bin/python
+# 
+# \file 3_install.py
+# \brief Run all install processes
+# \date 2009-02-18 16:19GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Run all install processes
+# 
+# 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, argparse
+sys.path.append("../configuration")
+
+parser = argparse.ArgumentParser()
+parser.add_argument('--includeprocess', '-ipc', nargs='+')
+parser.add_argument('--excludeprocess', '-epc', nargs='+')
+args = parser.parse_args()
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Run the install processes")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+# For each process
+for processName in ProcessToComplete:
+	if ((args.includeprocess == None or processName in args.includeprocess) and (args.excludeprocess == None or not processName in args.excludeprocess)):
+		printLog(log, "PROCESS " + processName)
+		os.chdir(processName)
+		try:
+			subprocess.call([ "python", "3_install.py" ])
+		except Exception, e:
+			printLog(log, "<" + processName + "> " + str(e))
+		os.chdir("..")
+		try:
+			processLog = open(processName + "/log.log", "r")
+			processLogData = processLog.read()
+			processLog.close()
+			log.write(processLogData)
+		except Exception, e:
+			printLog(log, "<" + processName + "> " + str(e))
+		# subprocess.call("idle.bat")
+	else:
+		printLog(log, "IGNORE PROCESS " + processName)
+printLog(log, "")
+
+log.close()

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

@@ -1,66 +1,66 @@
-#!/usr/bin/python
-# 
-# \file 0_setup.py
-# \brief setup dummy
-# \date 2010-05-24 13:42GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Setup dummy
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Setup dummy")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Setup source directories
-printLog(log, ">>> Setup source directories <<<")
-#for dir in MapSourceDirectories:
-#	mkPath(log, DatabaseDirectory + "/" + dir)
-
-# Setup export directories
-printLog(log, ">>> Setup export directories <<<")
-#mkPath(log, ExportBuildDirectory + "/" + DummyTagExportDirectory)
-
-# Setup build directories
-printLog(log, ">>> Setup build directories <<<")
-#mkPath(log, ExportBuildDirectory + "/" + DummyWithCoarseMeshBuildDirectory)
-
-# Setup client directories
-printLog(log, ">>> Setup client directories <<<")
-#mkPath(log, InstallDirectory + "/" + DummyInstallDirectory)
-
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief setup dummy
+# \date 2010-05-24 13:42GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Setup dummy
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Setup dummy")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Setup source directories
+printLog(log, ">>> Setup source directories <<<")
+#for dir in MapSourceDirectories:
+#	mkPath(log, DatabaseDirectory + "/" + dir)
+
+# Setup export directories
+printLog(log, ">>> Setup export directories <<<")
+#mkPath(log, ExportBuildDirectory + "/" + DummyTagExportDirectory)
+
+# Setup build directories
+printLog(log, ">>> Setup build directories <<<")
+#mkPath(log, ExportBuildDirectory + "/" + DummyWithCoarseMeshBuildDirectory)
+
+# Setup client directories
+printLog(log, ">>> Setup client directories <<<")
+#mkPath(log, InstallDirectory + "/" + DummyInstallDirectory)
+
+log.close()
+
+
+# end of file

nel/tools/build_gamedata/processes/_dummy/1_export.py

@@ -1,117 +1,117 @@
-#!/usr/bin/python
-# 
-# \file 1_export.py
-# \brief Export dummy
-# \date 2010-05-24 13:42GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Export dummy
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Export dummy")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-if MaxAvailable:
-	# Find tools
-	Max = findMax(log, MaxDirectory, MaxExecutable)
-	# ExecTimeout = findTool(log, ToolDirectories, ExecTimeoutTool, ToolSuffix)
-	printLog(log, "")
-	
-	# Export dummy 3dsmax
-	printLog(log, ">>> Export dummy 3dsmax <<<")
-	
-	# Build paths
-	#scriptSrc = "maxscript/dummy_export.ms"
-	# scriptDst = MaxDirectory + "/scripts/dummy_export.ms"
-	#scriptDst = MaxUserDirectory + "/scripts/dummy_export.ms"
-	#logFile = ScriptDirectory + "/processes/dummy/log.log"
-	#outDirTag = ExportBuildDirectory + "/" + DummyTagExportDirectory
-	#mkPath(log, outDirTag)
-	#outDirWithoutCoarse = ExportBuildDirectory + "/" + DummyExportDirectory
-	#mkPath(log, outDirWithoutCoarse)
-	#outDirWithCoarse = ExportBuildDirectory + "/" + DummyWithCoarseMeshExportDirectory
-	#mkPath(log, outDirWithCoarse)
-	#outDirLightmap = ExportBuildDirectory + "/" + DummyLightmapNotOptimizedExportDirectory
-	#mkPath(log, outDirLightmap)
-	#outDirAnim = ExportBuildDirectory + "/" + DummyAnimExportDirectory
-	#mkPath(log, outDirAnim)
-	
-	#tagList = findFiles(log, outDirTag, "", ".tag")
-	#tagLen = len(tagList)
-	
-	# For each directoy
-	#if os.path.isfile(scriptDst):
-	#	os.remove(scriptDst)
-	#for dir in DummySourceDirectories:
-	#	tagDiff = 1
-	#	dummySourceDir = DatabaseDirectory + "/" + dir
-	#	mkPath(log, dummySourceDir)
-	#	sSrc = open(scriptSrc, "r")
-	#	sDst = open(scriptDst, "w")
-	#	for line in sSrc:
-	#		newline = line.replace("output_logfile", logFile)
-	#		newline = newline.replace("dummy_source_directory", dummySourceDir)
-	#		newline = newline.replace("output_directory_tag", outDirTag)
-	#		newline = newline.replace("output_directory_without_coarse_mesh", outDirWithoutCoarse)
-	#		newline = newline.replace("output_directory_with_coarse_mesh", outDirWithCoarse)
-	#		newline = newline.replace("dummy_export_opt_export_lighting", DummyExportOptExportLighting)
-	#		newline = newline.replace("dummy_export_opt_shadow", DummyExportOptShadow)
-	#		newline = newline.replace("dummy_export_opt_lighting_limit", str(DummyExportOptLightingLimit))
-	#		newline = newline.replace("dummy_export_opt_lumel_size", DummyExportOptLumelSize)
-	#		newline = newline.replace("dummy_export_opt_oversampling", str(DummyExportOptOversampling))
-	#		newline = newline.replace("dummy_export_opt_lightmap_log", DummyExportOptLightmapLog)
-	#		newline = newline.replace("dummy_lightmap_path", outDirLightmap)
-	#		newline = newline.replace("output_directory_anim", outDirAnim)
-	#		sDst.write(newline)
-	#	sSrc.close()
-	#	sDst.close()
-	#	while tagDiff > 0:
-	#		printLog(log, "MAXSCRIPT " + scriptDst)
-	#		subprocess.call([ Max, "-U", "MAXScript", "dummy_export.ms", "-q", "-mi", "-mip" ])
-	#		tagList = findFiles(log, outDirTag, "", ".tag")
-	#		newTagLen = len(tagList)
-	#		tagDiff = newTagLen - tagLen
-	#		tagLen = newTagLen
-	#		printLog(log, "Exported " + str(tagDiff) + " .max files!")
-	#		tagDiff += hackBdummyTree() # force rerun also when bdummy tree deleted
-	#	os.remove(scriptDst)
-
-
-printLog(log, "")
-
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 1_export.py
+# \brief Export dummy
+# \date 2010-05-24 13:42GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Export dummy
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Export dummy")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+if MaxAvailable:
+	# Find tools
+	Max = findMax(log, MaxDirectory, MaxExecutable)
+	# ExecTimeout = findTool(log, ToolDirectories, ExecTimeoutTool, ToolSuffix)
+	printLog(log, "")
+	
+	# Export dummy 3dsmax
+	printLog(log, ">>> Export dummy 3dsmax <<<")
+	
+	# Build paths
+	#scriptSrc = "maxscript/dummy_export.ms"
+	# scriptDst = MaxDirectory + "/scripts/dummy_export.ms"
+	#scriptDst = MaxUserDirectory + "/scripts/dummy_export.ms"
+	#logFile = ScriptDirectory + "/processes/dummy/log.log"
+	#outDirTag = ExportBuildDirectory + "/" + DummyTagExportDirectory
+	#mkPath(log, outDirTag)
+	#outDirWithoutCoarse = ExportBuildDirectory + "/" + DummyExportDirectory
+	#mkPath(log, outDirWithoutCoarse)
+	#outDirWithCoarse = ExportBuildDirectory + "/" + DummyWithCoarseMeshExportDirectory
+	#mkPath(log, outDirWithCoarse)
+	#outDirLightmap = ExportBuildDirectory + "/" + DummyLightmapNotOptimizedExportDirectory
+	#mkPath(log, outDirLightmap)
+	#outDirAnim = ExportBuildDirectory + "/" + DummyAnimExportDirectory
+	#mkPath(log, outDirAnim)
+	
+	#tagList = findFiles(log, outDirTag, "", ".tag")
+	#tagLen = len(tagList)
+	
+	# For each directoy
+	#if os.path.isfile(scriptDst):
+	#	os.remove(scriptDst)
+	#for dir in DummySourceDirectories:
+	#	tagDiff = 1
+	#	dummySourceDir = DatabaseDirectory + "/" + dir
+	#	mkPath(log, dummySourceDir)
+	#	sSrc = open(scriptSrc, "r")
+	#	sDst = open(scriptDst, "w")
+	#	for line in sSrc:
+	#		newline = line.replace("output_logfile", logFile)
+	#		newline = newline.replace("dummy_source_directory", dummySourceDir)
+	#		newline = newline.replace("output_directory_tag", outDirTag)
+	#		newline = newline.replace("output_directory_without_coarse_mesh", outDirWithoutCoarse)
+	#		newline = newline.replace("output_directory_with_coarse_mesh", outDirWithCoarse)
+	#		newline = newline.replace("dummy_export_opt_export_lighting", DummyExportOptExportLighting)
+	#		newline = newline.replace("dummy_export_opt_shadow", DummyExportOptShadow)
+	#		newline = newline.replace("dummy_export_opt_lighting_limit", str(DummyExportOptLightingLimit))
+	#		newline = newline.replace("dummy_export_opt_lumel_size", DummyExportOptLumelSize)
+	#		newline = newline.replace("dummy_export_opt_oversampling", str(DummyExportOptOversampling))
+	#		newline = newline.replace("dummy_export_opt_lightmap_log", DummyExportOptLightmapLog)
+	#		newline = newline.replace("dummy_lightmap_path", outDirLightmap)
+	#		newline = newline.replace("output_directory_anim", outDirAnim)
+	#		sDst.write(newline)
+	#	sSrc.close()
+	#	sDst.close()
+	#	while tagDiff > 0:
+	#		printLog(log, "MAXSCRIPT " + scriptDst)
+	#		subprocess.call([ Max, "-U", "MAXScript", "dummy_export.ms", "-q", "-mi", "-mip" ])
+	#		tagList = findFiles(log, outDirTag, "", ".tag")
+	#		newTagLen = len(tagList)
+	#		tagDiff = newTagLen - tagLen
+	#		tagLen = newTagLen
+	#		printLog(log, "Exported " + str(tagDiff) + " .max files!")
+	#		tagDiff += hackBdummyTree() # force rerun also when bdummy tree deleted
+	#	os.remove(scriptDst)
+
+
+printLog(log, "")
+
+log.close()
+
+
+# end of file

nel/tools/build_gamedata/processes/_dummy/2_build.py

@@ -1,96 +1,96 @@
-#!/usr/bin/python
-# 
-# \file 2_build.py
-# \brief Build dummy
-# \date 2010-05-24 13:42GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Build dummy
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Build dummy")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Find tools
-ExecTimeout = findTool(log, ToolDirectories, ExecTimeoutTool, ToolSuffix)
-BuildShadowSkin = findTool(log, ToolDirectories, BuildShadowSkinTool, ToolSuffix)
-BuildClodtex = findTool(log, ToolDirectories, BuildClodtexTool, ToolSuffix)
-LightmapOptimizer = findTool(log, ToolDirectories, LightmapOptimizerTool, ToolSuffix)
-TgaToDds = findTool(log, ToolDirectories, TgaToDdsTool, ToolSuffix)
-BuildCoarseMesh = findTool(log, ToolDirectories, BuildCoarseMeshTool, ToolSuffix)
-
-#if 1: # todo: CoarseMeshTextureNames length > 0 ...
-#	printLog(log, ">>> Build coarse meshes <<<")
-#	dummyWithCoarseMesh = ExportBuildDirectory + "/" + DummyWithCoarseMeshExportDirectory
-#	mkPath(log, dummyWithCoarseMesh)
-#	dummyWithCoarseMeshBuilded = ExportBuildDirectory + "/" + DummyWithCoarseMeshBuildDirectory
-#	mkPath(log, dummyWithCoarseMeshBuilded)
-#	cf = open("confdummy_generated.cfg", "w")
-#	cf.write("texture_mul_size = " + TextureMulSizeValue + ";\n")
-#	cf.write("\n")
-#	cf.write("search_path = \n")
-#	cf.write("{\n")
-#	cf.write("\t\"" + dummyWithCoarseMesh + "\", \n")
-#	for dir in MapSourceDirectories:
-#		cf.write("\t\"" + DatabaseDirectory + "/" + dir + "\", \n")
-#	cf.write("};\n")
-#	cf.write("\n")
-#	cf.write("list_mesh = \n")
-#	cf.write("{\n")
-#	# For each dummy with coarse mesh
-#	files = findFiles(log, dummyWithCoarseMesh, "", ".dummy")
-#	for file in files:
-#		sourceFile = dummyWithCoarseMesh + "/" + file
-#		if os.path.isfile(sourceFile):
-#			destFile = dummyWithCoarseMeshBuilded + "/" + file
-#			cf.write("\t\"" + file + "\", \"" + destFile + "\", \n")
-#	cf.write("};\n")
-#	cf.write("\n")
-#	cf.write("output_textures = \n")
-#	cf.write("{\n")
-#	# For each dummy with coarse mesh
-#	for tn in CoarseMeshTextureNames:
-#		cf.write("\t\"" + dummyWithCoarseMesh + "/" + tn + ".tga\", \n")
-#	cf.write("};\n")
-#	cf.close()
-#	subprocess.call([ BuildCoarseMesh, "confdummy_generated.cfg" ])
-#	os.remove("confdummy_generated.cfg")
-#	for tn in CoarseMeshTextureNames:
-#		subprocess.call([ TgaToDds, dummyWithCoarseMesh + "/" + tn + ".tga", "-o", dummyWithCoarseMeshBuilded + "/" + tn + ".dds", "-a", "5" ])
-
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 2_build.py
+# \brief Build dummy
+# \date 2010-05-24 13:42GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Build dummy
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Build dummy")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Find tools
+ExecTimeout = findTool(log, ToolDirectories, ExecTimeoutTool, ToolSuffix)
+BuildShadowSkin = findTool(log, ToolDirectories, BuildShadowSkinTool, ToolSuffix)
+BuildClodtex = findTool(log, ToolDirectories, BuildClodtexTool, ToolSuffix)
+LightmapOptimizer = findTool(log, ToolDirectories, LightmapOptimizerTool, ToolSuffix)
+TgaToDds = findTool(log, ToolDirectories, TgaToDdsTool, ToolSuffix)
+BuildCoarseMesh = findTool(log, ToolDirectories, BuildCoarseMeshTool, ToolSuffix)
+
+#if 1: # todo: CoarseMeshTextureNames length > 0 ...
+#	printLog(log, ">>> Build coarse meshes <<<")
+#	dummyWithCoarseMesh = ExportBuildDirectory + "/" + DummyWithCoarseMeshExportDirectory
+#	mkPath(log, dummyWithCoarseMesh)
+#	dummyWithCoarseMeshBuilded = ExportBuildDirectory + "/" + DummyWithCoarseMeshBuildDirectory
+#	mkPath(log, dummyWithCoarseMeshBuilded)
+#	cf = open("confdummy_generated.cfg", "w")
+#	cf.write("texture_mul_size = " + TextureMulSizeValue + ";\n")
+#	cf.write("\n")
+#	cf.write("search_path = \n")
+#	cf.write("{\n")
+#	cf.write("\t\"" + dummyWithCoarseMesh + "\", \n")
+#	for dir in MapSourceDirectories:
+#		cf.write("\t\"" + DatabaseDirectory + "/" + dir + "\", \n")
+#	cf.write("};\n")
+#	cf.write("\n")
+#	cf.write("list_mesh = \n")
+#	cf.write("{\n")
+#	# For each dummy with coarse mesh
+#	files = findFiles(log, dummyWithCoarseMesh, "", ".dummy")
+#	for file in files:
+#		sourceFile = dummyWithCoarseMesh + "/" + file
+#		if os.path.isfile(sourceFile):
+#			destFile = dummyWithCoarseMeshBuilded + "/" + file
+#			cf.write("\t\"" + file + "\", \"" + destFile + "\", \n")
+#	cf.write("};\n")
+#	cf.write("\n")
+#	cf.write("output_textures = \n")
+#	cf.write("{\n")
+#	# For each dummy with coarse mesh
+#	for tn in CoarseMeshTextureNames:
+#		cf.write("\t\"" + dummyWithCoarseMesh + "/" + tn + ".tga\", \n")
+#	cf.write("};\n")
+#	cf.close()
+#	subprocess.call([ BuildCoarseMesh, "confdummy_generated.cfg" ])
+#	os.remove("confdummy_generated.cfg")
+#	for tn in CoarseMeshTextureNames:
+#		subprocess.call([ TgaToDds, dummyWithCoarseMesh + "/" + tn + ".tga", "-o", dummyWithCoarseMeshBuilded + "/" + tn + ".dds", "-a", "5" ])
+
+log.close()
+
+
+# end of file

nel/tools/build_gamedata/processes/_dummy/3_install.py

@@ -1,63 +1,63 @@
-#!/usr/bin/python
-# 
-# \file 3_install.py
-# \brief Install dummy
-# \date 2010-05-24 13:42GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Install dummy
-# 
-# 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 process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Install dummy")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-#installPath = InstallDirectory + "/" + DummyInstallDirectory
-#mkPath(log, installPath)
-
-printLog(log, ">>> Install dummy <<<")
-#mkPath(log, ExportBuildDirectory + "/" + DummyExportDirectory)
-#copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + DummyExportDirectory, installPath, ".dummy")
-#mkPath(log, ExportBuildDirectory + "/" + DummyWithCoarseMeshBuildDirectory)
-#copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + DummyWithCoarseMeshBuildDirectory, installPath, ".dummy")
-#copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + DummyWithCoarseMeshBuildDirectory, installPath, ".dds")
-
-#mkPath(log, ExportBuildDirectory + "/" + DummyAnimExportDirectory)
-#copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + DummyAnimExportDirectory, installPath, ".anim")
-
-printLog(log, "")
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 3_install.py
+# \brief Install dummy
+# \date 2010-05-24 13:42GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Install dummy
+# 
+# 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 process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Install dummy")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+#installPath = InstallDirectory + "/" + DummyInstallDirectory
+#mkPath(log, installPath)
+
+printLog(log, ">>> Install dummy <<<")
+#mkPath(log, ExportBuildDirectory + "/" + DummyExportDirectory)
+#copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + DummyExportDirectory, installPath, ".dummy")
+#mkPath(log, ExportBuildDirectory + "/" + DummyWithCoarseMeshBuildDirectory)
+#copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + DummyWithCoarseMeshBuildDirectory, installPath, ".dummy")
+#copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + DummyWithCoarseMeshBuildDirectory, installPath, ".dds")
+
+#mkPath(log, ExportBuildDirectory + "/" + DummyAnimExportDirectory)
+#copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + DummyAnimExportDirectory, installPath, ".anim")
+
+printLog(log, "")
+log.close()
+
+
+# end of file

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

@@ -1,98 +1,98 @@
-#!/usr/bin/python
-# 
-# \file 0_setup.py
-# \brief setup ai_wmap
-# \date 2010-05-24 13:42GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Setup ai_wmap
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Setup ai_wmap")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-# Setup build directories
-printLog(log, ">>> Setup build directories <<<")
-mkPath(log, ExportBuildDirectory + "/" + RbankOutputBuildDirectory)
-mkPath(log, ExportBuildDirectory + "/" + AiWmapBuildDirectory)
-mkPath(log, ExportBuildDirectory + "/" + AiWmapBuildTagDirectory)
-
-# Setup lookup directories
-printLog(log, ">>> Setup lookup directories <<<")
-for dir in IgLookupDirectories:
-	mkPath(log, ExportBuildDirectory + "/" + dir)
-for dir in PacsPrimLookupDirectories:
-	mkPath(log, ExportBuildDirectory + "/" + dir)
-
-# Setup client directories
-printLog(log, ">>> Setup install directories <<<")
-mkPath(log, InstallDirectory + "/" + AiWmapInstallDirectory)
-
-# Setup client directories
-printLog(log, ">>> Setup configuration <<<")
-mkPath(log, InstallDirectory + "/" + AiWmapInstallDirectory)
-mkPath(log, ActiveProjectDirectory + "/generated")
-cfg = open(ActiveProjectDirectory + "/generated/ai_build_wmap.cfg", "w")
-cfg.write("\n")
-cfg.write("// AI BUILD WMAP CONFIGURATION\n")
-cfg.write("\n")
-cfg.write("Paths = {\n")
-for dir in IgLookupDirectories:
-	cfg.write("\t\"" + ExportBuildDirectory + "/" + dir + "\", \n")
-cfg.write("\t\"" + ExportBuildDirectory + "/" + RbankOutputBuildDirectory + "\", \n")
-cfg.write("\t\"" + LeveldesignDirectory + "\", \n")
-cfg.write("};\n")
-cfg.write("\n")
-cfg.write("NoRecursePaths = { };\n")
-cfg.write("\n")
-cfg.write("PacsPrimPaths = {\n")
-for dir in PacsPrimLookupDirectories:
-	cfg.write("\t\"" + ExportBuildDirectory + "/" + dir + "\", \n")
-cfg.write("};\n")
-cfg.write("\n")
-cfg.write("OutputPath = \"" + ExportBuildDirectory + "/" + AiWmapBuildDirectory + "\";\n")
-cfg.write("\n")
-cfg.write("Commands = {\n")
-cfg.write("\t\"Verbose " + str(AiWmapVerbose) + "\", \n")
-for startPoint in AiWmapStartPoints:
-	cfg.write("\t\"setStartPoint " + startPoint + "\", \n")
-cfg.write("};\n")
-cfg.write("\n")
-cfg.close()
-
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief setup ai_wmap
+# \date 2010-05-24 13:42GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Setup ai_wmap
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Setup ai_wmap")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Setup build directories
+printLog(log, ">>> Setup build directories <<<")
+mkPath(log, ExportBuildDirectory + "/" + RbankOutputBuildDirectory)
+mkPath(log, ExportBuildDirectory + "/" + AiWmapBuildDirectory)
+mkPath(log, ExportBuildDirectory + "/" + AiWmapBuildTagDirectory)
+
+# Setup lookup directories
+printLog(log, ">>> Setup lookup directories <<<")
+for dir in IgLookupDirectories:
+	mkPath(log, ExportBuildDirectory + "/" + dir)
+for dir in PacsPrimLookupDirectories:
+	mkPath(log, ExportBuildDirectory + "/" + dir)
+
+# Setup client directories
+printLog(log, ">>> Setup install directories <<<")
+mkPath(log, InstallDirectory + "/" + AiWmapInstallDirectory)
+
+# Setup client directories
+printLog(log, ">>> Setup configuration <<<")
+mkPath(log, InstallDirectory + "/" + AiWmapInstallDirectory)
+mkPath(log, ActiveProjectDirectory + "/generated")
+cfg = open(ActiveProjectDirectory + "/generated/ai_build_wmap.cfg", "w")
+cfg.write("\n")
+cfg.write("// AI BUILD WMAP CONFIGURATION\n")
+cfg.write("\n")
+cfg.write("Paths = {\n")
+for dir in IgLookupDirectories:
+	cfg.write("\t\"" + ExportBuildDirectory + "/" + dir + "\", \n")
+cfg.write("\t\"" + ExportBuildDirectory + "/" + RbankOutputBuildDirectory + "\", \n")
+cfg.write("\t\"" + LeveldesignDirectory + "\", \n")
+cfg.write("};\n")
+cfg.write("\n")
+cfg.write("NoRecursePaths = { };\n")
+cfg.write("\n")
+cfg.write("PacsPrimPaths = {\n")
+for dir in PacsPrimLookupDirectories:
+	cfg.write("\t\"" + ExportBuildDirectory + "/" + dir + "\", \n")
+cfg.write("};\n")
+cfg.write("\n")
+cfg.write("OutputPath = \"" + ExportBuildDirectory + "/" + AiWmapBuildDirectory + "\";\n")
+cfg.write("\n")
+cfg.write("Commands = {\n")
+cfg.write("\t\"Verbose " + str(AiWmapVerbose) + "\", \n")
+for startPoint in AiWmapStartPoints:
+	cfg.write("\t\"setStartPoint " + startPoint + "\", \n")
+cfg.write("};\n")
+cfg.write("\n")
+cfg.close()
+
+log.close()
+
+
+# end of file

nel/tools/build_gamedata/processes/ai_wmap/1_export.py

@@ -1,49 +1,49 @@
-#!/usr/bin/python
-# 
-# \file 1_export.py
-# \brief Export ai_wmap
-# \date 2010-05-24 13:42GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Export ai_wmap
-# 
-# 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 import *
-from process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Export ai_wmap")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 1_export.py
+# \brief Export ai_wmap
+# \date 2010-05-24 13:42GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Export ai_wmap
+# 
+# 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 import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Export ai_wmap")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+log.close()
+
+
+# end of file

nel/tools/build_gamedata/processes/ai_wmap/3_install.py

@@ -1,57 +1,57 @@
-#!/usr/bin/python
-# 
-# \file 3_install.py
-# \brief Install ai_wmap
-# \date 2010-05-24 13:42GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Install ai_wmap
-# 
-# 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 process import *
-from tools import *
-from directories import *
-
-printLog(log, "")
-printLog(log, "-------")
-printLog(log, "--- Install ai_wmap")
-printLog(log, "-------")
-printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
-printLog(log, "")
-
-installPath = InstallDirectory + "/" + AiWmapInstallDirectory
-mkPath(log, installPath)
-
-printLog(log, ">>> Install ai_wmap <<<")
-mkPath(log, ExportBuildDirectory + "/" + AiWmapBuildDirectory)
-copyFilesNoTreeIfNeeded(log, ExportBuildDirectory + "/" + AiWmapBuildDirectory, installPath)
-
-printLog(log, "")
-log.close()
-
-
-# end of file
+#!/usr/bin/python
+# 
+# \file 3_install.py
+# \brief Install ai_wmap
+# \date 2010-05-24 13:42GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Install ai_wmap
+# 
+# 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 process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Install ai_wmap")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+installPath = InstallDirectory + "/" + AiWmapInstallDirectory
+mkPath(log, installPath)
+
+printLog(log, ">>> Install ai_wmap <<<")
+mkPath(log, ExportBuildDirectory + "/" + AiWmapBuildDirectory)
+copyFilesNoTreeIfNeeded(log, ExportBuildDirectory + "/" + AiWmapBuildDirectory, installPath)
+
+printLog(log, "")
+log.close()
+
+
+# end of file