jinja2cpp: add new version 1.3.2 #21305

toge · 2023-11-22T01:37:16Z

Specify library name and version: jinja2cpp/1.3.2

jinja2cpp/1.3.2 requires Boost::json.
But Boost::json is not avaiable in apple-clang.
https://github.com/conan-io/conan-center-index/pull/5246/files#r616257192

In this PR, I will drop apple-clang support for jinja2cpp/1.3.2.
I'm trying to relax apple-clang condition for boost.

I've read the contributing guidelines.
I've used a recent Conan client version close to the currently deployed.
I've tried at least one configuration locally with the conan-center hook activated.

rmorozov · 2023-11-22T07:28:37Z

recipes/jinja2cpp/all/patches/fix-cmake-1.3.1.patch

+
+ if (NOT DEFINED JINJA2_PRIVATE_LIBS_INT)
+     set(JINJA2CPP_PRIVATE_LIBS ${JINJA2CPP_PRIVATE_LIBS}
+-        Boost::variant Boost::filesystem Boost::algorithm Boost::lexical_cast Boost::json


@toge , would you mind telling me why we removing boost::regex, boost::json?

boost::regex seems to significantly speed ups template loading?

@rmorozov
Oh, it's my mistake.
Thank you for your review!

I have added special option to choose which regex to use - default one is boost regex, but if it is not suitable feel free to override and use std regex as it was earlier

https://github.com/jinja2cpp/Jinja2Cpp/blob/4393211baa8ba69437d070be3c9fcba59aad6793/CMakeLists.txt#L15

rmorozov · 2023-11-23T14:42:10Z

recipes/jinja2cpp/all/conanfile.py

@@ -76,6 +76,12 @@ def validate(self):
            raise ConanInvalidConfiguration(
                f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support."
            )
+        if Version(self.version) >= "1.3.1" and self.settings.compiler == "apple-clang":


I have a special switch for this case
https://github.com/jinja2cpp/Jinja2Cpp/blob/master/CMakeLists.txt#L18

for apple-clang there can be -DJINJA2CPP_WITH_JSON_BINDINGS=rapid, which doesn't require boost::json

@rmorozov
Thanks a lot!
I will fix this issue.

@rmorozov
I tried to compile jinja2cpp/1.3.1 with apple-clang with INJA2CPP_WITH_JSON_BINDINGS=rapid.
But I get the same compile error due to Boost::json.
This is because CMakeLists.txt in jinja2cpp/1.3.1 tries to link Boost::json despite the value of INJA2CPP_WITH_JSON_BINDINGS.
I will try to make jinja2cpp/1.3.1 not compatible with apple-clang in this PR, because I think it is necessary to fix CMakeLists.txt or conan's boost recipe.

toge · 2024-02-01T23:46:35Z

@RubenRBS
Cloud you review it?

valgur · 2024-03-24T14:10:48Z

recipes/jinja2cpp/all/patches/fix-cmake-1.3.1.patch

+diff --git a/src/helpers.h b/src/helpers.h
+index 3af280f..b1c31fe 100644
+--- a/src/helpers.h
+++ b/src/helpers.h
+@@ -32,12 +32,21 @@ struct MultiStringLiteral
+ #endif
+     }
+
+#if defined(_MSC_VER) && (_MSC_VER <= 1900)
+    template<typename CharT>
+    auto GetValueStr() const
+    {
+        auto memPtr = SelectMemberPtr<CharT, &MultiStringLiteral::charValue, &MultiStringLiteral::wcharValue>::GetPtr();
+        return std::basic_string<CharT>(this->*memPtr);
+    }
+#else
+     template<typename CharT>
+     constexpr auto GetValueStr() const
+     {
+         constexpr auto memPtr = SelectMemberPtr<CharT, &MultiStringLiteral::charValue, &MultiStringLiteral::wcharValue>::GetPtr();
+         return std::basic_string<CharT>(this->*memPtr);
+     }
+#endif
+
+     template<typename CharT, const char* MultiStringLiteral::*, const wchar_t* MultiStringLiteral::*>
+     struct SelectMemberPtr;


This should be a separate patch. Submitted upstream as well, if possible.

AbrilRBS

Sorry for the delay @toge, I'll get to this review early next monday, this PR fell thru the cracks and I just now found it again :)

uilianries

Hello and thank you for bumping this recipe.

Boost regex is not mandatory in 1.3.2, but used by default due its speed:

jinja2cpp/Jinja2Cpp@1.2.1...1.3.2#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20aR20

jinja2cpp/Jinja2Cpp@1.2.1...1.3.2#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R277

I would suggest adding a logic in generate to follow that support:

def generate(self):
    tc = CMakeToolchain(self)
    if Version(self.version) >= "1.3.2":
        tc.cache_variables["JINJA2CPP_USE_REGEX"] = "std" if self.dependencies["boost"].options.without_regex else "boost"

toge · 2024-07-29T10:00:55Z

@uilianries
Sorry for late response.

Your suggested code doesn't work well.

CMake Error at CMakeLists.txt:188 (target_link_libraries):
  Target "jinja2cpp" links to:

    Boost::regex

  but the target was not found.  Possible reasons include:

    * There is a typo in the target name.
    * A find_package call is missing for an IMPORTED target.
    * An ALIAS target is missing.

Boost::regex is always required in external_boost_deps.cmake.
https://github.com/jinja2cpp/Jinja2Cpp/blob/1.3.2/thirdparty/external_boost_deps.cmake#L56

It may be a bug.

I added with_regex option to select regex library.
Could you review it again?

conan-center-bot · 2024-07-29T11:34:24Z

Conan v1 pipeline ✔️

All green in build 7 (f5fbed679dd4d18874ff61ae526c9a35a73b0b62):

jinja2cpp/1.3.2:
All packages built successfully! (All logs)
jinja2cpp/1.2.1:
All packages built successfully! (All logs)
jinja2cpp/1.1.0:
All packages built successfully! (All logs)

Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 7 (f5fbed679dd4d18874ff61ae526c9a35a73b0b62):

jinja2cpp/1.3.2:
All packages built successfully! (All logs)
jinja2cpp/1.1.0:
All packages built successfully! (All logs)
jinja2cpp/1.2.1:
All packages built successfully! (All logs)

uilianries · 2024-07-29T14:43:05Z

@toge thank you for pinging. I'll take a look tomorrow 😁

uilianries

LGTM. Thank you @toge!

jinja2cpp: add version 1.3.1

4e0bd3b

conan-center-bot added the Failed label Nov 22, 2023

This comment has been minimized.

Sign in to view

update cmake

88d90f7

This comment has been minimized.

Sign in to view

remvoe Boost::json,regex

9910906

This comment has been minimized.

Sign in to view

fix link libraries

62086ca

ericLemanissier mentioned this pull request Nov 22, 2023

Updatable recipes ericLemanissier/conan-center-bot#1

Closed

This comment has been minimized.

Sign in to view

rmorozov reviewed Nov 22, 2023

View reviewed changes

remove Boost::json, add Boost::regex

8b53968

This comment has been minimized.

Sign in to view

remove Boost::json

6bbb2d2

conan-center-bot added Service Under Maintenance and removed Failed labels Nov 22, 2023

This comment has been minimized.

Sign in to view

prince-chrismc mentioned this pull request Nov 22, 2023

Pull Requests Ready to be Reviewed prince-chrismc/conan-center-index-pending-review#1

Open

This was referenced Nov 22, 2023

Updatable recipes qchateau/conan-center-bot#1

Open

[request] Updatable recipes #3470

Closed

conan-center-bot added Failed and removed Service Under Maintenance labels Nov 22, 2023

This comment has been minimized.

Sign in to view

revert Boost::json

2920227

This comment has been minimized.

Sign in to view

drop support apple-clang

cef9c50

AbrilRBS self-assigned this Nov 23, 2023

conan-center-bot removed the Failed label Nov 23, 2023

This comment has been minimized.

Sign in to view

rmorozov reviewed Nov 23, 2023

View reviewed changes

ghost mentioned this pull request Jan 13, 2024

jinja2cpp: update dependencies #22303

Closed

3 tasks

Merge branch 'master' into jinja2cpp-1.3.1

e02df1c

This comment has been minimized.

Sign in to view

conan-center-bot requested a review from jcar87 February 20, 2024 11:40

valgur suggested changes Mar 24, 2024

View reviewed changes

conan-center-bot requested a review from AbrilRBS April 24, 2024 11:41

conan-center-bot requested a review from franramirez688 June 21, 2024 11:38

AbrilRBS reviewed Jun 22, 2024

View reviewed changes

update 1.3.2

6b9c957

toge changed the title ~~jinja2cpp: add version 1.3.1~~ jinja2cpp: add version 1.3.2 Jun 27, 2024

conan-center-bot added Failed Unexpected Error labels Jun 27, 2024

This comment has been minimized.

Sign in to view

toge changed the title ~~jinja2cpp: add version 1.3.2~~ jinja2cpp: add new version 1.3.2 Jul 1, 2024

conan-center-bot removed Unexpected Error Failed labels Jul 1, 2024

This comment has been minimized.

Sign in to view

uilianries reviewed Jul 2, 2024

View reviewed changes

add option with_regex

f5fbed6

uilianries approved these changes Jul 30, 2024

View reviewed changes

uilianries requested a review from AbrilRBS July 30, 2024 12:03

AbrilRBS approved these changes Jul 30, 2024

View reviewed changes

conan-center-bot merged commit 3ad8288 into conan-io:master Jul 30, 2024
20 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

jinja2cpp: add new version 1.3.2 #21305

jinja2cpp: add new version 1.3.2 #21305

toge commented Nov 22, 2023 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rmorozov Nov 22, 2023

toge Nov 22, 2023

rmorozov Nov 22, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rmorozov Nov 23, 2023

toge Nov 24, 2023

toge Nov 24, 2023

This comment has been minimized.

toge commented Feb 1, 2024

valgur Mar 24, 2024

AbrilRBS left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

uilianries left a comment

toge commented Jul 29, 2024

conan-center-bot commented Jul 29, 2024

uilianries commented Jul 29, 2024

uilianries left a comment

jinja2cpp: add new version 1.3.2 #21305

jinja2cpp: add new version 1.3.2 #21305

Conversation

toge commented Nov 22, 2023 • edited Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rmorozov Nov 22, 2023

Choose a reason for hiding this comment

toge Nov 22, 2023

Choose a reason for hiding this comment

rmorozov Nov 22, 2023

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rmorozov Nov 23, 2023

Choose a reason for hiding this comment

toge Nov 24, 2023

Choose a reason for hiding this comment

toge Nov 24, 2023

Choose a reason for hiding this comment

This comment has been minimized.

toge commented Feb 1, 2024

valgur Mar 24, 2024

Choose a reason for hiding this comment

AbrilRBS left a comment

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

uilianries left a comment

Choose a reason for hiding this comment

toge commented Jul 29, 2024

conan-center-bot commented Jul 29, 2024

Conan v1 pipeline ✔️

Conan v2 pipeline ✔️

uilianries commented Jul 29, 2024

uilianries left a comment

Choose a reason for hiding this comment

toge commented Nov 22, 2023 •

edited

Loading