Skip to content

Commit 8371441

Browse files
committed
Merge branch 'release/v0.2.3'
2 parents d44ab30 + 8e1e883 commit 8371441

75 files changed

Lines changed: 1386 additions & 428 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.cmake-format.yaml

Lines changed: 0 additions & 246 deletions
This file was deleted.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[Describe your pull request here. Please read the description below and make sure you follow the checklist.]
2+
3+
---
4+
5+
## Pull Request Checklist
6+
7+
Read the [CONTRIBUTING.md](https://github.com/fktn-k/fkYAML/blob/develop/CONTRIBUTING.md) file for detailed information.
8+
9+
- [ ] Changes are described in the pull request or in a referenced [issue](https://github.com/fktn-k/fkYAML/issues).
10+
- [ ] The test suite compiles and runs without any error.
11+
- [ ] [The code coverage](https://coveralls.io/github/fktn-k/fkYAML) on your branch is 100%.
12+
- [ ] The documentation is updated if you added/changed a feature.
13+
14+
## Please don't
15+
16+
- The C++11 support varies between different **compilers** and versions. Please note the [list of supported compilers](https://github.com/fktn-k/fkYAML/blob/develop/README.md#supported-compilers). Some compilers like GCC 4.7 (and earlier), Clang 3.3 (and earlier), or Microsoft Visual Studio 13.0 and earlier are known not to work due to missing or incomplete C++11 support. Please refrain from proposing changes that work around these compiler's limitations with `#ifdef`s or other means.
17+
- Please refrain from proposing changes that would **break [YAML](https://yaml.org/) specifications**. If you propose a conformant extension of YAML to be supported by the library, please motivate this extension.
18+
- Please do not open pull requests that address **multiple issues**.

.gitignore

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
build*
2-
.vscode/
3-
.vs/
1+
/build*
2+
/.vscode/
3+
/.vs/
44

55
# documentation
66
/docs/mkdocs/site/
7-
/docs/mkdocs/venv/
7+
/docs/mkdocs/venv/
8+
9+
# natvis generator
10+
/tool/natvis_generator/venv/

.reuse/templates/fkYAML.commented.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// _______ __ __ __ _____ __ __ __
22
/// | __| |_/ | \_/ |/ _ \ / \/ \| | fkYAML: A C++ header-only YAML library
3-
/// | __| _ < \_ _/| ___ | _ | |___ version 0.2.2
3+
/// | __| _ < \_ _/| ___ | _ | |___ version 0.2.3
44
/// |__| |_| \__| |_| |_| |_|___||___|______| https://github.com/fktn-k/fkYAML
55
///
66
{% for copyright_line in copyright_lines %}

.reuse/templates/fkYAML_support.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
_______ __ __ __ _____ __ __ __
22
| __| |_/ | \_/ |/ _ \ / \/ \| | fkYAML: A C++ header-only YAML library (supporting code)
3-
| __| _ < \_ _/| ___ | _ | |___ version 0.2.2
3+
| __| _ < \_ _/| ___ | _ | |___ version 0.2.3
44
|__| |_| \__| |_| |_| |_|___||___|______| https://github.com/fktn-k/fkYAML
55

66
{% for copyright_line in copyright_lines %}

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [v0.2.3](https://github.com/fktn-k/fkYAML/releases/tag/v0.2.3) (2023-12-03)
4+
5+
[Full Changelog](https://github.com/fktn-k/fkYAML/compare/v0.2.2...v0.2.3)
6+
7+
- Feature/232 user defined literal for deserialization [\#235](https://github.com/fktn-k/fkYAML/pull/235) ([fktn-k](https://github.com/fktn-k))
8+
- \#159 Support block scalar styles [\#228](https://github.com/fktn-k/fkYAML/pull/228) ([fktn-k](https://github.com/fktn-k))
9+
- Feature/226 add natvis file [\#227](https://github.com/fktn-k/fkYAML/pull/227) ([fktn-k](https://github.com/fktn-k))
10+
11+
- fixed parsing UTF-16 encoded inputs which do not end with a surrogate… [\#234](https://github.com/fktn-k/fkYAML/pull/234) ([fktn-k](https://github.com/fktn-k))
12+
13+
- Improved contribution guide [\#231](https://github.com/fktn-k/fkYAML/pull/231) ([fktn-k](https://github.com/fktn-k))
14+
- Removed dependency on the cmake-format tool [\#230](https://github.com/fktn-k/fkYAML/pull/230) ([fktn-k](https://github.com/fktn-k))
15+
- Fixed wrong URLs in the releases page of the documentation [\#225](https://github.com/fktn-k/fkYAML/pull/225) ([fktn-k](https://github.com/fktn-k))
16+
317
## [v0.2.2](https://github.com/fktn-k/fkYAML/releases/tag/v0.2.2) (2023-11-27)
418

519
[Full Changelog](https://github.com/fktn-k/fkYAML/compare/v0.2.1...v0.2.2)

CMakeLists.txt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.8)
66

77
project(
88
fkYAML
9-
VERSION 0.2.2
9+
VERSION 0.2.3
1010
LANGUAGES CXX)
1111

1212
#############################################################
@@ -82,6 +82,15 @@ target_include_directories(
8282
${FK_YAML_TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${FK_YAML_INCLUDE_BUILD_DIR}>
8383
$<INSTALL_INTERFACE:${FK_YAML_INCLUDE_INSTALL_DIR}>)
8484

85+
# add .natvis file to apply custom debug view for MSVC
86+
if(MSVC)
87+
set(FK_YAML_INSTALL_NATVIS ON)
88+
set(FK_YAML_NATVIS_FILE "fkYAML.natvis")
89+
target_sources(
90+
${FK_YAML_TARGET_NAME} INTERFACE $<INSTALL_INTERFACE:${FK_YAML_NATVIS_FILE}>
91+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${FK_YAML_NATVIS_FILE}>)
92+
endif()
93+
8594
############################
8695
# Integrate with tools #
8796
############################
@@ -129,6 +138,10 @@ if(FK_YAML_INSTALL)
129138
install(DIRECTORY "${FK_YAML_INCLUDE_BUILD_DIR}" DESTINATION include)
130139
install(FILES "${FK_YAML_CMAKE_PROJECT_CONFIG_FILE}" "${FK_YAML_CMAKE_VERSION_CONFIG_FILE}"
131140
DESTINATION "${FK_YAML_CONFIG_INSTALL_DIR}")
141+
if(FK_YAML_INSTALL_NATVIS)
142+
install(FILES ${FK_YAML_NATVIS_FILE}
143+
DESTINATION .)
144+
endif()
132145
export(
133146
TARGETS ${FK_YAML_TARGET_NAME}
134147
NAMESPACE ${PROJECT_NAME}::

0 commit comments

Comments
 (0)