External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release_json_fwd' into develop

Browse Source
This commit is contained in:
Niels Lohmann 2022-08-07 14:53:52 +02:00
commit 96736ac195
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -232,9 +232,11 @@ release: include.zip json.tar.xz
mkdir release_files
gpg --armor --detach-sig include.zip
gpg --armor --detach-sig $(AMALGAMATED_FILE)
gpg --armor --detach-sig $(AMALGAMATED_FWD_FILE)
gpg --armor --detach-sig json.tar.xz
cp $(AMALGAMATED_FILE) release_files
mv $(AMALGAMATED_FILE).asc json.tar.xz json.tar.xz.asc include.zip include.zip.asc release_files
cp $(AMALGAMATED_FWD_FILE) release_files
mv $(AMALGAMATED_FILE).asc $(AMALGAMATED_FWD_FILE).asc json.tar.xz json.tar.xz.asc include.zip include.zip.asc release_files
cd release_files ; shasum -a 256 json.hpp include.zip json.tar.xz > hashes.txt

1
meson.build
View File

@ -14,6 +14,7 @@ nlohmann_json_multiple_headers = declare_dependency(
if not meson.is_subproject()
install_headers('single_include/nlohmann/json.hpp', subdir: 'nlohmann')
install_headers('single_include/nlohmann/json_fwd.hpp', subdir: 'nlohmann')
pkgc = import('pkgconfig')
pkgc.generate(name: 'nlohmann_json',

3
wsjcpp.yml
View File

@ -21,3 +21,6 @@ distribution:
- source-file: "single_include/nlohmann/json.hpp"
target-file: "json.hpp"
type: "source-code"
- source-file: "single_include/nlohmann/json_fwd.hpp"
target-file: "json_fwd.hpp"
type: "source-code"