Skip to content

Release 1.0 preparation #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 67 commits into from
Oct 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
28faca6
Test appveyor clang/MinGW builds
flexferrum Aug 26, 2019
a741a91
Test appveyor MinGW/clang builds
flexferrum Aug 26, 2019
e3f82f9
Test appveyor MinGW/clang builds
flexferrum Aug 26, 2019
24ede6e
Test appveyor.yml MinGW/clang builds
flexferrum Aug 26, 2019
73947db
Test appveyor MinGW/clang builds
flexferrum Aug 26, 2019
dd6a6fb
Test appveyor MinGW/clang builds
flexferrum Aug 26, 2019
64fcc04
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
cc4733e
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
6b01f43
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
e536641
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
7cdbd2a
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
a98dc84
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
6cf05e1
Test appveyor MinGW/clang builds
flexferrum Aug 26, 2019
9d56d32
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
e264f34
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
f414756
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
7fc3446
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
a792de5
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
16b650a
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
89135e3
Test appveyor MinGW/clang test
flexferrum Aug 26, 2019
67352a2
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
b4c4c18
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
dc9988a
Test appveyor MinGW/clang build
flexferrum Aug 26, 2019
c122767
Test appveyor clang build
flexferrum Aug 26, 2019
a5ab62f
Test appveyor clang build
flexferrum Aug 27, 2019
7fdf86f
Test appveyor clang build
flexferrum Aug 27, 2019
c36b7aa
Update appveyor.yml
flexferrum Aug 27, 2019
775c3ab
Update appveyor.yml
flexferrum Aug 27, 2019
6763b83
[skip ci] Update Readme.md
flexferrum Aug 27, 2019
9db14f1
[skip ci] Fix conan_build dependency management build scenario
flexferrum Aug 31, 2019
aafc6f3
- Add documentation
flexferrum Sep 1, 2019
4ce5dc0
Fix missed variable reference
flexferrum Sep 1, 2019
63c9870
[skip ci] Update conan.io badge
flexferrum Sep 2, 2019
4ab1bac
Debug failed appveyor tests
flexferrum Sep 2, 2019
5be0426
Merge branch 'release_1_0_prep' of github.com:jinja2cpp/Jinja2Cpp int…
flexferrum Sep 2, 2019
fe1d813
Debug failed appveyor builds
flexferrum Sep 2, 2019
62c5f56
Debug failed appveyor builds
flexferrum Sep 2, 2019
dfa27be
Improve MSVC C++ runtime type handling
flexferrum Sep 2, 2019
98f46c4
Return build configurations to appveyor.yml
flexferrum Sep 2, 2019
3f39e82
Debug appveyor builds
flexferrum Sep 3, 2019
7722da1
Debug appveyor build
flexferrum Sep 3, 2019
68ed7ea
Debug appveyor builds (3)
flexferrum Sep 3, 2019
2b992f7
Debug build (4)
flexferrum Sep 3, 2019
a08084c
Debug build (5)
flexferrum Sep 3, 2019
d3b248b
- Fix crash in broken `extends`/`block` statements parsing
flexferrum Sep 14, 2019
01c2500
Merge branch 'release_1_0_prep' of github.com:jinja2cpp/Jinja2Cpp int…
flexferrum Sep 14, 2019
6bb91c9
Implement template cache inside jinja2::TemplateEnv
flexferrum Sep 14, 2019
2d5fd79
Implement context passing to the user-defined callables, fix warnings
flexferrum Sep 15, 2019
22a9339
Remove 'robin hood hashing' submodule
flexferrum Sep 15, 2019
cfccb8c
Fix build: remove robin hood hashing lib
flexferrum Sep 15, 2019
46d5c3c
Fix macro call in expression context
flexferrum Sep 16, 2019
b63c482
Merge branch 'release_1_0_prep' of github.com:jinja2cpp/Jinja2Cpp int…
flexferrum Sep 16, 2019
181f3e0
Add `ToString` method to the `ErrorInfoTpl` class
flexferrum Sep 22, 2019
0e85e55
Improve reflection and add more doxygen comments
flexferrum Sep 23, 2019
6964136
Remove unnecessary typedef in error_info.cpp
flexferrum Sep 24, 2019
5c6a80a
Fix buggy format string
flexferrum Sep 24, 2019
999bae2
Add osx images to Travis CI
flexferrum Sep 26, 2019
1fe23ce
Improve setup of travis osx environments
flexferrum Sep 26, 2019
d582ce5
Add reference documentation
flexferrum Sep 30, 2019
5564b84
Add clang 7 and 8 to the travis CI
flexferrum Sep 30, 2019
c6a5f3b
Add gcc 8 and 9 to travis CI
flexferrum Sep 30, 2019
3c70c14
Force use nonstd::optional and nonstd::string_view with C++17 enabled
flexferrum Sep 30, 2019
55c259e
Enable warning for gcc 8 and 9
flexferrum Sep 30, 2019
f359f06
Fix travis build
flexferrum Sep 30, 2019
78aef9e
Fix travis gcc 8/9 build with C++17 enabled
flexferrum Sep 30, 2019
94012e3
Fix error in travis config
flexferrum Sep 30, 2019
b07112c
Fix travis config errors
flexferrum Sep 30, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
BasedOnStyle: Mozilla
IndentWidth: 4
ColumnLimit: 160
BreakBeforeBraces: Custom
BraceWrapping:
AfterControlStatement: true
AfterClass: true
AfterNamespace: true
AfterFunction: true
BeforeCatch: true
BeforeElse: true
AfterStruct: true
AccessModifierOffset: -4
BinPackParameters: false
AlwaysBreakAfterReturnType: None
AlwaysBreakAfterDefinitionReturnType: None
AllowAllParametersOfDeclarationOnNextLine: false
ConstructorInitializerIndentWidth: 4
NamespaceIndentation: None
PointerAlignment: Left
Standard: Cpp11
UseTab: Never
AlignAfterOpenBracket: Align
PenaltyReturnTypeOnItsOwnLine: 0
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^((<|")(shared)\/)'
Priority: 4
- Regex: '^((<|")(components)\/)'
Priority: 3
- Regex: '^(<.*\.(h|hpp|hxx)>)'
Priority: 2
- Regex: '^".*'
Priority: 1
- Regex: '^(<[\w]*>)'
Priority: 5
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
[submodule "thirdparty/fmtlib"]
path = thirdparty/fmtlib
url = https://github.com/fmtlib/fmt.git
[submodule "thirdparty/robin-hood-hashing"]
path = thirdparty/robin-hood-hashing
url = https://github.com/martinus/robin-hood-hashing.git
[submodule "thirdparty/json/nlohmann"]
path = thirdparty/json/nlohmann
url = https://github.com/nlohmann/json.git
Expand Down
Loading