Skip to content

Commit 9b49ed6

Browse files
fanquakefanquake
committed
Squashed 'src/univalue/' changes from 98fadc0909..a44caf65fe
a44caf65fe Merge bitcoin-core/univalue-subtree#28: Import fixes for sanitizer reported issues 135254331e Import fixes for sanitizer reported issues d5fb86940e refactor: use c++11 range based for loop in checkObject ff9c379304 refactor: Use nullptr (c++11) instead of NULL 08a99754d5 build: use ax_cxx_compile_stdcxx.m4 to check for C++11 support 66d3713ce7 Merge bitcoin-core/univalue-subtree#29: ci: travis -> cirrus 808d487292 ci: travis -> cirrus 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 #23: Merge changes from jgarzik/univalue@1ae6a23 f77d0f718d Merge commit '1ae6a231a0169938eb3972c1d48dd17cba5947e1' into HEAD 1ae6a231a0 Merge pull request #57 from MarcoFalke/test_fix 92bdd11f0b univalue_write: remove unneeded sstream.h include ffb621c130 Merge pull request #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 #50 from luke-jr/pushKV_bool 72392fb227 [tests] test pushKV for boolean values c23132bcf4 Pushing boolean value to univalue correctly 81faab26a1 Merge pull request #48 from fwolfst/47-UPDATE_MIT_LINK_TO_HTTPS b17634ef24 Update URLs to MIT license. 88ab64f6b5 Merge pull request #46 from jasonbcox/master 35ed96da31 Merge pull request #44 from MarcoFalke/Mf1709-univalue-cherrypick-explicit 420c226290 Merge pull request #45 from MarcoFalke/Mf1710-univalue-revert-test git-subtree-dir: src/univalue git-subtree-split: a44caf65fe55b9dd8ddb08f04c0f70409efd53b3
1 parent 2a55a0e commit 9b49ed6

16 files changed

+1369
-376
lines changed

‎.cirrus.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
env:
2+
MAKEJOBS: "-j4"
3+
RUN_TESTS: "true"
4+
BASE_OUTDIR: "$CIRRUS_WORKING_DIR/out_dir_base"
5+
DEBIAN_FRONTEND: "noninteractive"
6+
7+
task:
8+
container:
9+
image: ubuntu:focal
10+
cpu: 1
11+
memory: 1G
12+
greedy: true # https://medium.com/cirruslabs/introducing-greedy-container-instances-29aad06dc2b4
13+
14+
matrix:
15+
- name: "gcc"
16+
env:
17+
CC: "gcc"
18+
CXX: "g++"
19+
APT_PKGS: "gcc"
20+
- name: "clang"
21+
env:
22+
CC: "clang"
23+
CXX: "clang++"
24+
APT_PKGS: "clang"
25+
- name: "mingw"
26+
env:
27+
CC: ""
28+
CXX: ""
29+
UNIVALUE_CONFIG: "--host=x86_64-w64-mingw32"
30+
APT_PKGS: "g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64"
31+
RUN_TESTS: "false"
32+
33+
install_script:
34+
- apt update
35+
- apt install -y pkg-config build-essential libtool autotools-dev automake bsdmainutils
36+
- apt install -y $APT_PKGS
37+
autogen_script:
38+
- ./autogen.sh
39+
configure_script:
40+
- ./configure --cache-file=config.cache --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib $UNIVALUE_CONFIG
41+
make_script:
42+
- make $MAKEJOBS V=1
43+
test_script:
44+
- if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS distcheck; fi

‎.travis.yml

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

‎Makefile.am

Lines changed: 15 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1+
include sources.mk
12
ACLOCAL_AMFLAGS = -I build-aux/m4
2-
.PHONY: gen
3+
.PHONY: gen FORCE
34
.INTERMEDIATE: $(GENBIN)
45

5-
include_HEADERS = include/univalue.h
6-
noinst_HEADERS = lib/univalue_escapes.h lib/univalue_utffilter.h
6+
include_HEADERS = $(UNIVALUE_DIST_HEADERS_INT)
7+
noinst_HEADERS = $(UNIVALUE_LIB_HEADERS_INT)
78

89
lib_LTLIBRARIES = libunivalue.la
910

1011
pkgconfigdir = $(libdir)/pkgconfig
1112
pkgconfig_DATA = pc/libunivalue.pc
1213

13-
libunivalue_la_SOURCES = \
14-
lib/univalue.cpp \
15-
lib/univalue_get.cpp \
16-
lib/univalue_read.cpp \
17-
lib/univalue_write.cpp
14+
libunivalue_la_SOURCES = $(UNIVALUE_LIB_SOURCES_INT)
1815

1916
libunivalue_la_LDFLAGS = \
2017
-version-info $(LIBUNIVALUE_CURRENT):$(LIBUNIVALUE_REVISION):$(LIBUNIVALUE_AGE) \
@@ -30,89 +27,32 @@ $(GENBIN): $(GEN_SRCS)
3027
@echo Building $@
3128
$(AM_V_at)c++ -I$(top_srcdir)/include -o $@ $<
3229

33-
gen: lib/univalue_escapes.h $(GENBIN)
34-
@echo Updating $<
30+
gen: $(GENBIN) FORCE
31+
@echo Updating lib/univalue_escapes.h
3532
$(AM_V_at)$(GENBIN) > lib/univalue_escapes.h
3633

3734
noinst_PROGRAMS = $(TESTS) test/test_json
3835

39-
TEST_DATA_DIR=test
40-
41-
test_unitester_SOURCES = test/unitester.cpp
36+
test_unitester_SOURCES = $(UNIVALUE_TEST_UNITESTER_INT)
4237
test_unitester_LDADD = libunivalue.la
43-
test_unitester_CXXFLAGS = -I$(top_srcdir)/include -DJSON_TEST_SRC=\"$(srcdir)/$(TEST_DATA_DIR)\"
38+
test_unitester_CXXFLAGS = -I$(top_srcdir)/include -DJSON_TEST_SRC=\"$(srcdir)/$(UNIVALUE_TEST_DATA_DIR_INT)\"
4439
test_unitester_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
4540

46-
test_test_json_SOURCES = test/test_json.cpp
41+
test_test_json_SOURCES = $(UNIVALUE_TEST_JSON_INT)
4742
test_test_json_LDADD = libunivalue.la
4843
test_test_json_CXXFLAGS = -I$(top_srcdir)/include
4944
test_test_json_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
5045

51-
test_no_nul_SOURCES = test/no_nul.cpp
46+
test_no_nul_SOURCES = $(UNIVALUE_TEST_NO_NUL_INT)
5247
test_no_nul_LDADD = libunivalue.la
5348
test_no_nul_CXXFLAGS = -I$(top_srcdir)/include
5449
test_no_nul_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
5550

56-
test_object_SOURCES = test/object.cpp
51+
test_object_SOURCES = $(UNIVALUE_TEST_OBJECT_INT)
5752
test_object_LDADD = libunivalue.la
5853
test_object_CXXFLAGS = -I$(top_srcdir)/include
5954
test_object_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
6055

61-
TEST_FILES = \
62-
$(TEST_DATA_DIR)/fail10.json \
63-
$(TEST_DATA_DIR)/fail11.json \
64-
$(TEST_DATA_DIR)/fail12.json \
65-
$(TEST_DATA_DIR)/fail13.json \
66-
$(TEST_DATA_DIR)/fail14.json \
67-
$(TEST_DATA_DIR)/fail15.json \
68-
$(TEST_DATA_DIR)/fail16.json \
69-
$(TEST_DATA_DIR)/fail17.json \
70-
$(TEST_DATA_DIR)/fail18.json \
71-
$(TEST_DATA_DIR)/fail19.json \
72-
$(TEST_DATA_DIR)/fail1.json \
73-
$(TEST_DATA_DIR)/fail20.json \
74-
$(TEST_DATA_DIR)/fail21.json \
75-
$(TEST_DATA_DIR)/fail22.json \
76-
$(TEST_DATA_DIR)/fail23.json \
77-
$(TEST_DATA_DIR)/fail24.json \
78-
$(TEST_DATA_DIR)/fail25.json \
79-
$(TEST_DATA_DIR)/fail26.json \
80-
$(TEST_DATA_DIR)/fail27.json \
81-
$(TEST_DATA_DIR)/fail28.json \
82-
$(TEST_DATA_DIR)/fail29.json \
83-
$(TEST_DATA_DIR)/fail2.json \
84-
$(TEST_DATA_DIR)/fail30.json \
85-
$(TEST_DATA_DIR)/fail31.json \
86-
$(TEST_DATA_DIR)/fail32.json \
87-
$(TEST_DATA_DIR)/fail33.json \
88-
$(TEST_DATA_DIR)/fail34.json \
89-
$(TEST_DATA_DIR)/fail35.json \
90-
$(TEST_DATA_DIR)/fail36.json \
91-
$(TEST_DATA_DIR)/fail37.json \
92-
$(TEST_DATA_DIR)/fail38.json \
93-
$(TEST_DATA_DIR)/fail39.json \
94-
$(TEST_DATA_DIR)/fail40.json \
95-
$(TEST_DATA_DIR)/fail41.json \
96-
$(TEST_DATA_DIR)/fail42.json \
97-
$(TEST_DATA_DIR)/fail44.json \
98-
$(TEST_DATA_DIR)/fail45.json \
99-
$(TEST_DATA_DIR)/fail3.json \
100-
$(TEST_DATA_DIR)/fail4.json \
101-
$(TEST_DATA_DIR)/fail5.json \
102-
$(TEST_DATA_DIR)/fail6.json \
103-
$(TEST_DATA_DIR)/fail7.json \
104-
$(TEST_DATA_DIR)/fail8.json \
105-
$(TEST_DATA_DIR)/fail9.json \
106-
$(TEST_DATA_DIR)/pass1.json \
107-
$(TEST_DATA_DIR)/pass2.json \
108-
$(TEST_DATA_DIR)/pass3.json \
109-
$(TEST_DATA_DIR)/pass4.json \
110-
$(TEST_DATA_DIR)/round1.json \
111-
$(TEST_DATA_DIR)/round2.json \
112-
$(TEST_DATA_DIR)/round3.json \
113-
$(TEST_DATA_DIR)/round4.json \
114-
$(TEST_DATA_DIR)/round5.json \
115-
$(TEST_DATA_DIR)/round6.json \
116-
$(TEST_DATA_DIR)/round7.json
117-
118-
EXTRA_DIST=$(TEST_FILES) $(GEN_SRCS)
56+
TEST_FILES = $(UNIVALUE_TEST_FILES_INT)
57+
58+
EXTRA_DIST=$(UNIVALUE_TEST_FILES_INT) $(GEN_SRCS)

0 commit comments

Comments
 (0)