forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed 'src/univalue/' changes from 98fadc0909..c390ac375f
c390ac375f Merge bitcoin-core/univalue-subtree#19: Split sources for easier buildsystem integration 4a5b0a1c65 build: Move source entries out to sources.mk 6c7d94b33c build: cleanup wonky gen usage a222637c6d Merge bitcoin#23: Merge changes from jgarzik/univalue@1ae6a23 f77d0f718d Merge commit '1ae6a231a0169938eb3972c1d48dd17cba5947e1' into HEAD 1ae6a231a0 Merge pull request bitcoin#57 from MarcoFalke/test_fix 92bdd11f0b univalue_write: remove unneeded sstream.h include ffb621c130 Merge pull request bitcoin#56 from drodil/remove_sstream_header f33acf9fe8 Merge commit '7890db9~' into HEAD 66e0adec4d Remove unnecessary sstream header from univalue.h 88967f6586 Version 1.0.4 1dc113dbef Merge pull request bitcoin#50 from luke-jr/pushKV_bool 72392fb227 [tests] test pushKV for boolean values c23132bcf4 Pushing boolean value to univalue correctly 81faab26a1 Merge pull request bitcoin#48 from fwolfst/47-UPDATE_MIT_LINK_TO_HTTPS b17634ef24 Update URLs to MIT license. 88ab64f6b5 Merge pull request bitcoin#46 from jasonbcox/master 35ed96da31 Merge pull request bitcoin#44 from MarcoFalke/Mf1709-univalue-cherrypick-explicit 420c226290 Merge pull request bitcoin#45 from MarcoFalke/Mf1710-univalue-revert-test git-subtree-dir: src/univalue git-subtree-split: c390ac375f2fad0433c8fb1b4b5e30749e112a89
- Loading branch information
Showing
12 changed files
with
123 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| # - All variables are namespaced with UNIVALUE_ to avoid colliding with | ||
| # downstream makefiles. | ||
| # - All Variables ending in _HEADERS or _SOURCES confuse automake, so the | ||
| # _INT postfix is applied. | ||
| # - Convenience variables, for example a UNIVALUE_TEST_DIR should not be used | ||
| # as they interfere with automatic dependency generation | ||
| # - The %reldir% is the relative path from the Makefile.am. This allows | ||
| # downstreams to use these variables without having to manually account for | ||
| # the path change. | ||
|
|
||
| UNIVALUE_INCLUDE_DIR_INT = %reldir%/include | ||
|
|
||
| UNIVALUE_DIST_HEADERS_INT = | ||
| UNIVALUE_DIST_HEADERS_INT += %reldir%/include/univalue.h | ||
|
|
||
| UNIVALUE_LIB_HEADERS_INT = | ||
| UNIVALUE_LIB_HEADERS_INT += %reldir%/lib/univalue_utffilter.h | ||
| UNIVALUE_LIB_HEADERS_INT += %reldir%/lib/univalue_escapes.h | ||
|
|
||
| UNIVALUE_LIB_SOURCES_INT = | ||
| UNIVALUE_LIB_SOURCES_INT += %reldir%/lib/univalue.cpp | ||
| UNIVALUE_LIB_SOURCES_INT += %reldir%/lib/univalue_get.cpp | ||
| UNIVALUE_LIB_SOURCES_INT += %reldir%/lib/univalue_read.cpp | ||
| UNIVALUE_LIB_SOURCES_INT += %reldir%/lib/univalue_write.cpp | ||
|
|
||
| UNIVALUE_TEST_DATA_DIR_INT = %reldir%/test | ||
|
|
||
| UNIVALUE_TEST_UNITESTER_INT = | ||
| UNIVALUE_TEST_UNITESTER_INT += %reldir%/test/unitester.cpp | ||
|
|
||
| UNIVALUE_TEST_JSON_INT = | ||
| UNIVALUE_TEST_JSON_INT += %reldir%/test/test_json.cpp | ||
|
|
||
| UNIVALUE_TEST_NO_NUL_INT = | ||
| UNIVALUE_TEST_NO_NUL_INT += %reldir%/test/no_nul.cpp | ||
|
|
||
| UNIVALUE_TEST_OBJECT_INT = | ||
| UNIVALUE_TEST_OBJECT_INT += %reldir%/test/object.cpp | ||
|
|
||
| UNIVALUE_TEST_FILES_INT = | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail1.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail2.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail3.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail4.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail5.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail6.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail7.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail8.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail9.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail10.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail11.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail12.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail13.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail14.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail15.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail16.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail17.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail18.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail19.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail20.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail21.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail22.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail23.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail24.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail25.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail26.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail27.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail28.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail29.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail30.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail31.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail32.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail33.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail34.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail35.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail36.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail37.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail38.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail39.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail40.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail41.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail42.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail44.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/fail45.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/pass1.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/pass2.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/pass3.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/pass4.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/round1.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/round2.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/round3.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/round4.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/round5.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/round6.json | ||
| UNIVALUE_TEST_FILES_INT += %reldir%/test/round7.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters