Preparing release 0.9.1: warnings fix, Win CI build fix, build system improvement (#81)

* Fix build with C++17 enabled and system-provided boost package

* Fix build

* Fix build

* Build scripts cleanup and Readme file update

* Fix readme, improve appveyor  matrix

* Debug Win-based CI

* Debug Win-based CI

* Debug Win-based CI

* Fix runtime type bypass to gtest submodule

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI builds

* Debug Win CI build
Fix MSVC warnings

* Debug Win CI build

* [skip ci] Update readme

Author: flexferrum

.travis.yml

@@ -41,6 +41,26 @@ matrix:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['cmake', 'g++-7']
 
+    - os: linux
+      compiler: gcc
+      env:
+        COMPILER=g++-7
+        CMAKE_CXX_FLAGS=-std=c++17
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['cmake', 'g++-7']
+
+    - os: linux
+      compiler: gcc
+      env:
+        COMPILER=g++-7
+        SYSTEM_BOOST_PACKAGE=YES
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['cmake', 'g++-7']
+
     - os: linux
       compiler: clang
       env: COMPILER=clang++-5.0
@@ -60,11 +80,10 @@ matrix:
 before_install:
   - date -u
   - uname -a
-#  - sudo add-apt-repository -y ppa:samuel-bachmann/boost
-#  - sudo apt-get update -qq
+  - if [[ "${SYSTEM_BOOST_PACKAGE}" != "" ]]; then sudo add-apt-repository -y ppa:samuel-bachmann/boost && sudo apt-get update -qq; fi
 
 install:
-#  - sudo apt-get install libboost1.60-all-dev
+  - if [[ "${SYSTEM_BOOST_PACKAGE}" != "" ]]; then sudo apt-get install libboost1.60-all-dev; fi
 
 script:
   - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
@@ -73,7 +92,7 @@ script:
   - $CXX --version
 
   - mkdir -p build && cd build
-  - cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG .. && cmake --build . --config $BUILD_CONFIG -- -j4
+  - cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS .. && cmake --build . --config $BUILD_CONFIG -- -j4
   - ctest -C $BUILD_CONFIG -V
 
 

CMakeLists.txt

@@ -1,10 +1,12 @@
 cmake_minimum_required(VERSION 3.0.2)
-project(Jinja2Cpp VERSION 0.5.0)
+project(Jinja2Cpp VERSION 0.9.1)
+
+if (${CMAKE_VERSION} VERSION_GREATER "3.12") 
+    cmake_policy(SET CMP0074 OLD)
+endif ()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
     if (NOT UNIX)
         set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-Wa,-mbig-obj")
@@ -13,12 +15,11 @@ else ()
     set (COMMON_MSVC_OPTS "/wd4503 /DBOOST_ALL_NO_LIB")
 
     # MSVC
-    if (NOT DEFINED MSVC_RUNTIME_TYPE)
-        set (MSVC_RUNTIME_TYPE "/MD")
-        set (gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+    if (CMAKE_BUILD_TYPE MATCHES "Debug" AND MSVC_RUNTIME_TYPE)
+        set (MSVC_RUNTIME_TYPE "${MSVC_RUNTIME_TYPE}d")
     endif ()
     if (CMAKE_BUILD_TYPE MATCHES "Debug")
-        set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_RUNTIME_TYPE}d ${COMMON_MSVC_OPTS}")
+        set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_RUNTIME_TYPE} ${COMMON_MSVC_OPTS}")
         set (Boost_USE_DEBUG_RUNTIME ON)
     else ()
         set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MSVC_RUNTIME_TYPE}  ${COMMON_MSVC_OPTS}")
@@ -51,6 +52,9 @@ add_library(${LIB_TARGET_NAME} STATIC
     ${PublicHeaders}
     )
 
+string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_CFG_NAME)
+set(CURRENT_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BUILD_CFG_NAME}}")
+    
 add_subdirectory(thirdparty)
 
 target_link_libraries(${LIB_TARGET_NAME} PUBLIC expected-lite variant-lite value-ptr-lite optional-lite boost_variant boost_filesystem boost_algorithm)
@@ -61,14 +65,32 @@ target_include_directories(${LIB_TARGET_NAME}
 
 if(NOT MSVC)
     target_compile_options(${LIB_TARGET_NAME} PRIVATE -Wall -Werror)
+else ()
+    target_compile_options(${LIB_TARGET_NAME} PRIVATE /W4)
 endif()
 
+target_compile_definitions(${LIB_TARGET_NAME} PUBLIC variant_CONFIG_SELECT_VARIANT=variant_VARIANT_NONSTD)
+set_target_properties(${LIB_TARGET_NAME} PROPERTIES
+    CXX_STANDARD 14
+    CXX_STANDARD_REQUIRED ON)
+
 if (JINJA2CPP_BUILD_TESTS)
     enable_testing()
 
     CollectSources(TestSources TestHeaders ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test)
     add_executable(jinja2cpp_tests ${TestSources} ${TestHeaders})
     target_link_libraries(jinja2cpp_tests gtest gtest_main ${LIB_TARGET_NAME} ${EXTRA_TEST_LIBS})
+    
+    get_target_property(TEST_CXX_STD jinja2cpp_tests CXX_STANDARD)
+    
+    string (FIND "${CURRENT_CXX_FLAGS}" "-std" TEST_FLAGS_STD_POS)
+    string (FIND "${TEST_CXX_STD}" "NOTFOUND" TEST_CXX_STD_NOTFOUND_POS)
+    
+    if (NOT MSVC AND TEST_FLAGS_STD_POS EQUAL -1 AND NOT (TEST_CXX_STD_NOTFOUND_POS EQUAL -1))
+        set_target_properties(jinja2cpp_tests PROPERTIES
+            CXX_STANDARD 14
+            CXX_STANDARD_REQUIRED ON)
+    endif ()
 
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test_data/simple_template1.j2tpl

README.md

@@ -9,6 +9,7 @@
 [![Github Releases](https://img.shields.io/github/release/flexferrum/Jinja2Cpp/all.svg)](https://github.com/flexferrum/Jinja2Cpp/releases)
 [![Github Issues](https://img.shields.io/github/issues/flexferrum/Jinja2Cpp.svg)](http://github.com/flexferrum/Jinja2Cpp/issues)
 [![GitHub License](https://img.shields.io/badge/license-Mozilla-blue.svg)](https://raw.githubusercontent.com/flexferrum/Jinja2Cpp/master/LICENSE)
+[![Gitter Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Jinja2Cpp/Lobby)
 
 C++ implementation of big subset of Jinja2 template engine features. This library was inspired by [Jinja2CppLight](https://github.com/hughperkins/Jinja2CppLight) project and brings support of mostly all Jinja2 templates features into C++ world. Unlike [inja](https://github.com/pantor/inja) lib, you have to build Jinja2Cpp, but it has only one dependence: boost.
 
@@ -33,7 +34,9 @@ C++ implementation of big subset of Jinja2 template engine features. This librar
 - [Build and install](#build-and-install)
   - [Additional CMake build flags](#additional-cmake-build-flags)
 - [Link with you projects](#link-with-you-projects)
+- [Acknowledgments](#acknowledgments)
 - [Changelog](#changelog)
+  - [Version 0.9.1](#version-091)
   - [Version 0.9](#version-09)
   - [Version 0.6](#version-06)
 
@@ -526,8 +529,8 @@ Compilation of Jinja2Cpp tested on the following compilers (with C++14 enabled f
 - Linux gcc 6.0
 - Linux gcc 7.0
 - Linux clang 5.0
-- Microsoft Visual Studio 2015 x86
-- Microsoft Visual Studio 2017 x86
+- Microsoft Visual Studio 2015 x86, x64
+- Microsoft Visual Studio 2017 x86, x64
 
 # Build and install
 Jinja2Cpp has got only two external dependency: boost library (at least version 1.55) and expected-lite. Because of types from boost are used inside library, you should compile both your projects and Jinja2Cpp library with similar compiler settings. Otherwise ABI could be broken.
@@ -573,7 +576,7 @@ In order to compile Jinja2Cpp you need:
 ## Additional CMake build flags
 You can define (via -D command line CMake option) the following build flags:
 
-* **WITH_TESTS** (default TRUE) - build or not Jinja2Cpp tests.
+* **JINJA2CPP_BUILD_TESTS** (default TRUE) - build or not Jinja2Cpp tests.
 * **MSVC_RUNTIME_TYPE** (default /MD) - MSVC runtime type to link with (if you use Microsoft Visual Studio compiler).
 * **LIBRARY_TYPE** Could be STATIC (default for Windows platform) or SHARED (default for Linux). Specify the type of Jinja2Cpp library to build.
 
@@ -615,7 +618,20 @@ target_link_libraries(YourTarget
 #...
 ```
 
+# Acknowledgments
+Thanks to @manu343726 for CMake scripts improvement, bugs hunting and fixing and conan.io packaging.
+
+Thanks to @martinmoene for perfectly implemented xxx-lite libraries.
+
 # Changelog
+## Version 0.9.1
+* `applymacro` filter added which allows to apply arbitrary macro as a filter
+* dependencies to boost removed from the public interface
+* CMake scripts improved
+* Various bugs fixed
+* Improve reflection
+* Warnings cleanup
+
 ## Version 0.9
 * Support of 'extents'/'block' statements
 * Support of 'macro'/'call' statements

appveyor.yml

@@ -1,29 +1,54 @@
-version: 0.9.{build}
+version: 0.9.1.{build}
 
 os:
   - Visual Studio 2015
   - Visual Studio 2017
 
+platform:
+  - Win32
+  - x64
+
+configuration:
+  - Debug
+  - Release
+
 environment:
   matrix:
-    - PLATFORM: x64
-    - PLATFORM: x86
+    - BUILD_PLATFORM: x64
+      MSVC_RUNTIME_TYPE: /MD
+    - BUILD_PLATFORM: x64
+      MSVC_RUNTIME_TYPE: /MT
+    - BUILD_PLATFORM: x64
+      MSVC_RUNTIME_TYPE:
+    - BUILD_PLATFORM: x86
+      MSVC_RUNTIME_TYPE: /MD
+    - BUILD_PLATFORM: x86
+      MSVC_RUNTIME_TYPE: /MT
+    - BUILD_PLATFORM: x86
+      MSVC_RUNTIME_TYPE:
 
 matrix:
   fast_finish: false
+  exclude:
+    - platform: Win32
+      BUILD_PLATFORM: x64
+    - platform: x64
+      BUILD_PLATFORM: x86
 
 init:
-  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%PLATFORM%"=="x86" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
-  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
-
-install:
-  - git submodule -q update --init
+  - set BOOST_ROOT=C:\Libraries\boost_1_65_1
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%BUILD_PLATFORM%"=="x86" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%BUILD_PLATFORM%"=="x86" set PATH=%BOOST_ROOT%\lib32-msvc-14.1;%PATH%
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%BUILD_PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%BUILD_PLATFORM%"=="x64" set PATH=%BOOST_ROOT%\lib64-msvc-14.1;%PATH%
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%BUILD_PLATFORM%"=="x86" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%BUILD_PLATFORM%"=="x86" set PATH=%BOOST_ROOT%\lib32-msvc-14.0;%PATH%
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%BUILD_PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%BUILD_PLATFORM%"=="x64" set PATH=%BOOST_ROOT%\lib64-msvc-14.0;%PATH%
 
 build_script:
   - mkdir -p build && cd build
-  - set BOOST_DIR=C:\Libraries\boost_1_65_1
-  - cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release
+  - cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=%configuration% -DMSVC_RUNTIME_TYPE=%MSVC_RUNTIME_TYPE%
   - cmake --build . --target all
 
 test_script:

include/jinja2cpp/value.h

@@ -102,7 +102,13 @@ class Value {
 public:
     using ValueData = nonstd::variant<EmptyValue, bool, std::string, std::wstring, int64_t, double, RecWrapper<ValuesList>, RecWrapper<ValuesMap>, GenericList, GenericMap, UserFunction>;
 
-    Value() = default;
+    Value();
+    Value(const Value& val);
+    Value(Value&& val);
+    ~Value();
+    
+    Value& operator =(const Value&);
+    Value& operator =(Value&&);
     template<typename T>
     Value(T&& val, typename std::enable_if<!std::is_same<std::decay_t<T>, Value>::value && !std::is_same<std::decay_t<T>, ValuesList>::value>::type* = nullptr)
         : m_data(std::forward<T>(val))
@@ -211,6 +217,14 @@ inline Value GenericList::GetValueByIndex(int64_t index) const
     return m_accessor()->GetValueByIndex(index);
 }
 
+inline Value::Value() = default;
+inline Value::Value(const Value& val) = default;
+inline Value::Value(Value&& val) = default;
+inline Value::~Value() = default;
+inline Value& Value::operator =(const Value&) = default;
+inline Value& Value::operator =(Value&&) = default;
+
+
 } // jinja2
 
 #endif // JINJA2_VALUE_H

src/error_info.cpp

@@ -76,7 +76,7 @@ struct ValueRenderer
     }
 
 
-    void operator() (const UserFunction& val) const
+    void operator() (const UserFunction&) const
     {
     }
 

src/expression_evaluator.cpp

@@ -455,7 +455,7 @@ ParsedArguments ParseCallParamsImpl(const T& args, const CallParams& params, boo
             continue;
         }
 
-        int prevNotFound = argsInfo[startPosArg].prevNotFound;
+        prevNotFound = argsInfo[startPosArg].prevNotFound;
         if (prevNotFound != -1)
         {
             startPosArg = static_cast<std::size_t>(prevNotFound);

src/filesystem_handler.cpp

@@ -21,13 +21,13 @@ struct FileContentConverter
     {
         sPtr->reset(new std::wistringstream(content));
     }
-    void operator() (const std::wstring& content, CharFileStreamPtr* sPtr) const
+    void operator() (const std::wstring&, CharFileStreamPtr*) const
     {
 //        CharFileStreamPtr stream(new std::istringstream(content), [](std::istream* s) {delete static_cast<std::istringstream>(s);});
 //        std::swap(*sPtr, stream);
     }
 
-    void operator() (const std::string& content, WCharFileStreamPtr* sPtr) const
+    void operator() (const std::string&, WCharFileStreamPtr*) const
     {
 //        WCharFileStreamPtr stream(new std::wistringstream(content), [](std::wistream* s) {delete static_cast<std::wistringstream>(s);});
 //        std::swap(*sPtr, stream);
@@ -86,7 +86,7 @@ CharFileStreamPtr RealFileSystem::OpenStream(const std::string& name) const
     if (result->good())
         return result;
 
-    return CharFileStreamPtr(nullptr, [](std::istream* s){});
+    return CharFileStreamPtr(nullptr, [](std::istream*){});
 }
 
 WCharFileStreamPtr RealFileSystem::OpenWStream(const std::string& name) const
@@ -99,7 +99,7 @@ WCharFileStreamPtr RealFileSystem::OpenWStream(const std::string& name) const
     if (result->good())
         return result;
 
-    return WCharFileStreamPtr(nullptr, [](std::wistream* s){;});
+    return WCharFileStreamPtr(nullptr, [](std::wistream*){;});
 }
 
 } // jinja2

src/filters.cpp

@@ -469,7 +469,7 @@ struct PrettyPrinter : visitors::BaseVisitor<InternalValue>
         return "'"s + str + "'"s;
     }
 
-    InternalValue operator()(const std::wstring& str) const
+    InternalValue operator()(const std::wstring&) const
     {
         return "'<wchar_string>'"s;
     }
@@ -479,7 +479,7 @@ struct PrettyPrinter : visitors::BaseVisitor<InternalValue>
         return val ? "true"s : "false"s;
     }
 
-    InternalValue operator()(EmptyValue val) const
+    InternalValue operator()(EmptyValue) const
     {
         return "none"s;
     }
@@ -515,7 +515,7 @@ Random::Random(FilterParams params)
 
 }
 
-InternalValue Random::Filter(const InternalValue& baseVal, RenderContext& context)
+InternalValue Random::Filter(const InternalValue&, RenderContext&)
 {
     return InternalValue();
 }
@@ -687,32 +687,32 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte
     return result;
 }
 
-Serialize::Serialize(FilterParams params, Serialize::Mode mode)
+Serialize::Serialize(FilterParams, Serialize::Mode)
 {
 
 }
 
-InternalValue Serialize::Filter(const InternalValue& baseVal, RenderContext& context)
+InternalValue Serialize::Filter(const InternalValue&, RenderContext&)
 {
     return InternalValue();
 }
 
-Slice::Slice(FilterParams params, Slice::Mode mode)
+Slice::Slice(FilterParams, Slice::Mode)
 {
 
 }
 
-InternalValue Slice::Filter(const InternalValue& baseVal, RenderContext& context)
+InternalValue Slice::Filter(const InternalValue&, RenderContext&)
 {
     return InternalValue();
 }
 
-StringFormat::StringFormat(FilterParams params, StringFormat::Mode mode)
+StringFormat::StringFormat(FilterParams, StringFormat::Mode)
 {
 
 }
 
-InternalValue StringFormat::Filter(const InternalValue& baseVal, RenderContext& context)
+InternalValue StringFormat::Filter(const InternalValue&, RenderContext&)
 {
     return InternalValue();
 }