Skip to content

Commit ea2e690

Browse files
committed
Generic serialization and JSON eutput support
1 parent 1c5dfc1 commit ea2e690

Some content is hidden

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

48 files changed

+2207
-705
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,8 @@ jobs:
261261
- name: Generate headers
262262
run: |
263263
cd ../boost-root/libs/leaf
264-
python3 gen/generate_single_header.py -i include/boost/leaf/detail/all.hpp -p include -o test/leaf.hpp boost/leaf
264+
python3 scripts/generate_single_header.py -i include/boost/leaf/detail/all.hpp -p include -o test/leaf.hpp boost/leaf
265+
python3 scripts/download_nlohmann_json.py
265266
266267
- name: Run tests
267268
run: |
@@ -329,7 +330,8 @@ jobs:
329330
- name: Generate headers
330331
run: |
331332
cd ../boost-root/libs/leaf
332-
python3 gen/generate_single_header.py -i include/boost/leaf/detail/all.hpp -p include -o test/leaf.hpp boost/leaf
333+
python3 scripts/generate_single_header.py -i include/boost/leaf/detail/all.hpp -p include -o test/leaf.hpp boost/leaf
334+
python3 scripts/download_nlohmann_json.py
333335
334336
- name: Run tests
335337
shell: cmd

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
REF=$(git show-ref $GITHUB_REF --hash)
4444
cd ../boost-root/libs/leaf
45-
python gen/generate_single_header.py -i include/boost/leaf/detail/all.hpp -p include -o doc/html/leaf.hpp boost/leaf --hash "$REF"
45+
python scripts/generate_single_header.py -i include/boost/leaf/detail/all.hpp -p include -o doc/html/leaf.hpp boost/leaf --hash "$REF"
4646
4747
- name: Deploy to GitHub Pages
4848
uses: JamesIves/github-pages-deploy-action@4.0.0

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ subprojects/*/
1515
.vscode/settings.json
1616
.vscode/c_cpp_properties.json
1717
test/leaf.hpp
18+
test/nlohmann/*
1819
doc/leaf.html

.vscode/tasks.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,13 @@
4848
{
4949
"label": "Generate leaf.hpp",
5050
"type": "shell",
51-
"command": "cd ${workspaceRoot} && python gen/generate_single_header.py -i include/boost/leaf/detail/all.hpp -p ${workspaceRoot}/include -o ${workspaceRoot}/test/leaf.hpp boost/leaf",
51+
"command": "cd ${workspaceRoot} && python scripts/generate_single_header.py -i include/boost/leaf/detail/all.hpp -p ${workspaceRoot}/include -o ${workspaceRoot}/test/leaf.hpp boost/leaf",
52+
"problemMatcher": []
53+
},
54+
{
55+
"label": "Download nlohmann/json.hpp",
56+
"type": "shell",
57+
"command": "cd ${workspaceRoot} && python scripts/download_nlohmann_json.py",
5258
"problemMatcher": []
5359
},
5460
{
@@ -81,7 +87,8 @@
8187
"label": "Run all unit tests (debug)",
8288
"type": "shell",
8389
"dependsOn": [
84-
"Generate leaf.hpp"
90+
"Generate leaf.hpp",
91+
"Download nlohmann/json.hpp"
8592
],
8693
"command": "cd ${workspaceRoot}/_bld/debug && ninja && meson test && cd ${workspaceRoot}/_bld/debug && ninja && meson test",
8794
"problemMatcher": {
@@ -106,7 +113,8 @@
106113
"label": "Run all unit tests (release)",
107114
"type": "shell",
108115
"dependsOn": [
109-
"Generate leaf.hpp"
116+
"Generate leaf.hpp",
117+
"Download nlohmann/json.hpp"
110118
],
111119
"command": "cd ${workspaceRoot}/_bld/release && ninja && meson test && cd ${workspaceRoot}/_bld/release_single_header && ninja && meson test",
112120
"problemMatcher": {
@@ -131,7 +139,8 @@
131139
"label": "Run all unit tests (b2, all configurations)",
132140
"type": "shell",
133141
"dependsOn": [
134-
"Generate leaf.hpp"
142+
"Generate leaf.hpp",
143+
"Download nlohmann/json.hpp"
135144
],
136145
"command": "../../b2 --abbreviate-paths test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header,leaf_debug_embedded,leaf_release_embedded exception-handling=off rtti=off cxxstd=11,14,1z,17 && ../../b2 --abbreviate-paths test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header exception-handling=on,off cxxstd=11,14,1z,17",
137146
"problemMatcher": {

0 commit comments

Comments
 (0)