From ce986790d0edf7047bda1fc5014b7e219476b6c0 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 24 Sep 2015 21:44:04 +0200 Subject: [PATCH] [DEV] update next lutin version --- etk/log.cpp | 2 +- etk/log.h | 2 +- etk/os/FSNode.cpp | 5 ++++- lutin_etk-test.py | 10 +++++----- lutin_etk.py | 30 +++++++++++++++--------------- tools/lutin_test-debug.py | 10 +++++----- 6 files changed, 31 insertions(+), 28 deletions(-) diff --git a/etk/log.cpp b/etk/log.cpp index 8a3d7fd..9213b69 100644 --- a/etk/log.cpp +++ b/etk/log.cpp @@ -68,7 +68,7 @@ #endif #ifdef DEBUG - #define DEFAULT_LOG_LEVEL etk::log::logLevelInfo + #define DEFAULT_LOG_LEVEL etk::log::logLevelDebug #define DEFAULT_LOG_COLOR true #define DEFAULT_LOG_LINE true #define DEFAULT_LOG_THREAD_ID true diff --git a/etk/log.h b/etk/log.h index ec52b85..21677ec 100644 --- a/etk/log.h +++ b/etk/log.h @@ -121,7 +121,7 @@ namespace etk { #ifdef __class__ #undef __class__ #endif -#define __class__ (NULL) +#define __class__ (nullptr) // generic define for all logs:: #define TK_LOG_BASE(logId,info,data) \ diff --git a/etk/os/FSNode.cpp b/etk/os/FSNode.cpp index a4230d8..c337e2c 100644 --- a/etk/os/FSNode.cpp +++ b/etk/os/FSNode.cpp @@ -839,7 +839,7 @@ void etk::FSNode::generateFileSystemPath() { // check in the application folder. TK_DBG_MODE("DATA Search in application data:"); m_systemFileName = simplifyPath(baseFolderData + "/" + m_userFileName); - if (directCheckFile(m_systemFileName) == true) { + if (directCheckFile(m_systemFileName, true) == true) { return; } if (m_libSearch.size() == 0) { @@ -1321,6 +1321,9 @@ bool etk::FSNode::operator!= (const etk::FSNode& _obj ) const { } std::ostream& etk::operator <<(std::ostream &_os, const etk::FSNode &_obj) { + if (_obj.m_libSearch.size() != 0) { + _os << "{" << _obj.m_libSearch << "}"; + } _os << "[" << _obj.m_type << "]->\"" << _obj.m_userFileName << "\""; return _os; } diff --git a/lutin_etk-test.py b/lutin_etk-test.py index 5102825..49f3fe0 100644 --- a/lutin_etk-test.py +++ b/lutin_etk-test.py @@ -9,16 +9,16 @@ def get_desc(): def create(target): # module name is 'edn' and type binary. - myModule = module.Module(__file__, 'etk-test', 'BINARY') + my_module = module.Module(__file__, 'etk-test', 'BINARY') # add the file to compile: - myModule.add_src_file([ + my_module.add_src_file([ 'test/main.cpp']) - myModule.add_module_depend(['etk', 'gtest']) + my_module.add_module_depend(['etk', 'gtest']) - #myModule.compile_flags_XX(["-nostdinc++"]); + #my_module.compile_flags_XX(["-nostdinc++"]); # add the currrent module at the system - return myModule + return my_module diff --git a/lutin_etk.py b/lutin_etk.py index 24df98e..7c46d42 100644 --- a/lutin_etk.py +++ b/lutin_etk.py @@ -8,11 +8,11 @@ def get_desc(): def create(target): # module name is 'edn' and type binary. - myModule = module.Module(__file__, 'etk', 'LIBRARY') + my_module = module.Module(__file__, 'etk', 'LIBRARY') # add extra compilation flags : - myModule.add_extra_compile_flags() + my_module.add_extra_compile_flags() # add the file to compile: - myModule.add_src_file([ + my_module.add_src_file([ 'etk/debug.cpp', 'etk/etk.cpp', 'etk/stdTools.cpp', @@ -31,9 +31,9 @@ def create(target): 'etk/archive/Zip.cpp']) if target.name=="IOs": - myModule.add_src_file('etk/logIOs.m') + my_module.add_src_file('etk/logIOs.m') - myModule.add_header_file([ + my_module.add_header_file([ 'etk/etk.h', 'etk/types.h', 'etk/stdTools.h', @@ -56,29 +56,29 @@ def create(target): if target.config["mode"] == "release": # TODO : The other way is to remove this ... # TODO : Fore release mode : the etk folder are absolutly not at the same position in the tree ... - myModule.compile_flags('c', "-DMODE_RELEASE") + my_module.compile_flags('c', "-DMODE_RELEASE") else: - myModule.add_export_flag('c', "-DDEBUG_LEVEL=3") - myModule.add_export_flag('c', "-DDEBUG=1") + my_module.add_export_flag('c', "-DDEBUG_LEVEL=3") + my_module.add_export_flag('c', "-DDEBUG=1") # Bor backtrace display : if target.name != "Windows": - myModule.add_export_flag('link', "-ldl -rdynamic") + my_module.add_export_flag('link', "-ldl -rdynamic") - myModule.compile_version_XX(2011) + my_module.compile_version_XX(2011) # name of the dependency - myModule.add_optionnal_module_depend('minizip', ["c++", "-DETK_BUILD_MINIZIP"]) - myModule.add_optionnal_module_depend('linearmath', ["c", "-DETK_BUILD_LINEARMATH"], export=True) + my_module.add_optionnal_module_depend('minizip', ["c++", "-DETK_BUILD_MINIZIP"]) + my_module.add_optionnal_module_depend('linearmath', ["c", "-DETK_BUILD_LINEARMATH"], export=True) if target.name=="Windows": pass elif target.name=="Android": pass else: - myModule.add_export_flag('link', "-lpthread") + my_module.add_export_flag('link', "-lpthread") - myModule.add_path(tools.get_current_path(__file__)) + my_module.add_path(tools.get_current_path(__file__)) # add the currrent module at the - return myModule + return my_module diff --git a/tools/lutin_test-debug.py b/tools/lutin_test-debug.py index fe0ea35..b23ca51 100644 --- a/tools/lutin_test-debug.py +++ b/tools/lutin_test-debug.py @@ -8,12 +8,12 @@ def get_desc(): def create(target): - myModule = module.Module(__file__, 'test-debug', 'LIBRARY') - myModule.add_src_file([ + my_module = module.Module(__file__, 'test-debug', 'LIBRARY') + my_module.add_src_file([ 'test-debug/debug.cpp' ]) - myModule.add_module_depend('etk') - myModule.add_export_path(tools.get_current_path(__file__)) - return myModule + my_module.add_module_depend('etk') + my_module.add_export_path(tools.get_current_path(__file__)) + return my_module