Skip to content

Commit e0e0419

Browse files
pmienkpmienk
authored
Merge pull request #331 from pmienk/master
Generalize --build-<> --with-<> installation instructions, enable v4 secp256k1 build option.
2 parents ddbe57a + 88036c9 commit e0e0419

12 files changed

+170
-343
lines changed

‎generate3.xml‎

Lines changed: 25 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136

137137
<install>
138138
<!-- Boost.system is necessary for detection, which is only required for test. -->
139-
<build name="boost" version="1.73.0" parallel="true" nuget="true" >
139+
<build name="boost" version="1.73.0" parallel="true" nuget="true" presentation="Boost" conditional="true" >
140140
<option value="--with-system" />
141141
<option value="--with-test" />
142142
</build>
@@ -158,13 +158,10 @@
158158
<configuration name="gnu-release" />
159159
<configuration name="static" />
160160
<configuration name="shared" />
161-
<configuration name="gnu-optimized-size" />
162161
<configuration name="nix-gnu-debug-static" />
163162
<configuration name="nix-gnu-debug-shared" />
164163
<configuration name="nix-gnu-release-static" />
165164
<configuration name="nix-gnu-release-shared" />
166-
<configuration name="nix-gnu-release-static-size" />
167-
<configuration name="nix-gnu-release-shared-size" />
168165
</presets>
169166

170167
<ci>
@@ -375,7 +372,7 @@
375372

376373
<install>
377374
<!-- Building with our minimum (c++11 only) version of ICU. -->
378-
<build name="icu" version="55.2" parallel="true" >
375+
<build name="icu" version="55.2" parallel="true" presentation="ICU" conditional="true" >
379376
<flag value="-w" />
380377
<!-- TODO: verify this with more recent ICU. -->
381378
<!-- Bug in ICU 55.2 build requires enable-draft. -->
@@ -389,7 +386,7 @@
389386
<option value="--disable-tests" />
390387
<option value="--disable-samples" />
391388
</build>
392-
<build name="boost" version="1.73.0" parallel="true" nuget="true" >
389+
<build name="boost" version="1.73.0" parallel="true" nuget="true" presentation="Boost" conditional="true" >
393390
<option value="--with-atomic" />
394391
<option value="--with-chrono" />
395392
<option value="--with-date_time" />
@@ -415,27 +412,16 @@
415412
</install>
416413

417414
<presets>
418-
<mapping name="bitcoin-system" type="remove" parameter="icu" />
415+
<mapping name="bitcoin-system" type="base" />
419416
<configuration name="nix-base" />
420417
<configuration name="gnu-debug" />
421418
<configuration name="gnu-release" />
422419
<configuration name="static" />
423420
<configuration name="shared" />
424-
<configuration name="gnu-optimized-size" />
425-
<configuration name="with_icu" />
426-
<configuration name="without_icu" />
427-
<configuration name="nix-gnu-debug-static-with_icu" />
428-
<configuration name="nix-gnu-debug-static-without_icu" />
429-
<configuration name="nix-gnu-debug-shared-with_icu" />
430-
<configuration name="nix-gnu-debug-shared-without_icu" />
431-
<configuration name="nix-gnu-release-static-with_icu" />
432-
<configuration name="nix-gnu-release-static-without_icu" />
433-
<configuration name="nix-gnu-release-shared-with_icu" />
434-
<configuration name="nix-gnu-release-shared-without_icu" />
435-
<configuration name="nix-gnu-release-static-size-with_icu" />
436-
<configuration name="nix-gnu-release-static-size-without_icu" />
437-
<configuration name="nix-gnu-release-shared-size-with_icu" />
438-
<configuration name="nix-gnu-release-shared-size-without_icu" />
421+
<configuration name="nix-gnu-debug-static" />
422+
<configuration name="nix-gnu-debug-shared" />
423+
<configuration name="nix-gnu-release-static" />
424+
<configuration name="nix-gnu-release-shared" />
439425
</presets>
440426

441427
<ci>
@@ -604,19 +590,16 @@
604590

605591
<presets>
606592
<mapping name="bitcoin-network" type="base" />
607-
<mapping name="bitcoin-system" type="add" parameter="icu" />
593+
<mapping name="bitcoin-system" type="base" />
608594
<configuration name="nix-base" />
609595
<configuration name="gnu-debug" />
610596
<configuration name="gnu-release" />
611597
<configuration name="static" />
612598
<configuration name="shared" />
613-
<configuration name="gnu-optimized-size" />
614599
<configuration name="nix-gnu-debug-static" />
615600
<configuration name="nix-gnu-debug-shared" />
616601
<configuration name="nix-gnu-release-static" />
617602
<configuration name="nix-gnu-release-shared" />
618-
<configuration name="nix-gnu-release-static-size" />
619-
<configuration name="nix-gnu-release-shared-size" />
620603
</presets>
621604

622605
<ci>
@@ -787,7 +770,7 @@
787770
<option value="${with_boost}" />
788771
<option value="${with_pkgconfigdir}" />
789772
</build>
790-
<build name="zmq" version="4.3.5" parallel="true" nuget="true" >
773+
<build name="zmq" version="4.3.5" parallel="true" nuget="true" presentation="ZeroMQ" conditional="true" >
791774
<flag value="-w" />
792775
<option value="--disable-Werror" />
793776
</build>
@@ -801,25 +784,21 @@
801784

802785
<presets>
803786
<mapping name="bitcoin-protocol" type="base" />
804-
<mapping name="bitcoin-system" type="add" parameter="icu" />
787+
<mapping name="bitcoin-system" type="base" />
805788
<configuration name="nix-base" />
806789
<configuration name="gnu-debug" />
807790
<configuration name="gnu-release" />
808791
<configuration name="static" />
809792
<configuration name="shared" />
810-
<configuration name="gnu-optimized-size" />
811793
<configuration name="nix-gnu-debug-static" />
812794
<configuration name="nix-gnu-debug-shared" />
813795
<configuration name="nix-gnu-release-static" />
814796
<configuration name="nix-gnu-release-shared" />
815-
<configuration name="nix-gnu-release-static-size" />
816-
<configuration name="nix-gnu-release-shared-size" />
817797
</presets>
818798

819799
<ci>
820800
<axis name="boost" build="true" />
821801
<axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
822-
<axis name="mbedtls" build="true" />
823802
<axis name="zmq" build="true" />
824803

825804
<coverage>
@@ -833,7 +812,6 @@
833812
assert="ndebug" link="dynamic" optimization="size">
834813
<axis name="boost" value="build" />
835814
<!-- <axis name="icu" value="build" /> -->
836-
<axis name="mbedtls" value="build" />
837815
<axis name="zmq" value="build" />
838816
<option autotools="--enable-isystem" />
839817
</job>
@@ -843,7 +821,6 @@
843821
assert="ndebug" link="static" optimization="size">
844822
<axis name="boost" value="build" />
845823
<!-- <axis name="icu" value="build" /> -->
846-
<!-- <axis name="mbedtls" /> -->
847824
<axis name="zmq" value="build" />
848825
<option autotools="--enable-isystem" />
849826
</job>
@@ -855,7 +832,6 @@
855832
preset="nix-gnu-debug-shared">
856833
<axis name="boost" value="build" />
857834
<!-- axis name="icu" /> -->
858-
<axis name="mbedtls" value="build" />
859835
<axis name="zmq" value="build" />
860836
<option autotools="--enable-isystem" />
861837
</job>
@@ -867,7 +843,6 @@
867843
preset="nix-gnu-release-static-size">
868844
<axis name="boost" value="build" />
869845
<axis name="icu" value="build" />
870-
<!-- <axis name="mbedtls" /> -->
871846
<axis name="zmq" value="build" />
872847
<option autotools="--enable-isystem" />
873848
</job>
@@ -879,7 +854,6 @@
879854
preset="nix-gnu-release-shared-size">
880855
<axis name="boost" value="build" />
881856
<!-- <axis name="icu" /> -->
882-
<!-- <axis name="mbedtls" /> -->
883857
<axis name="zmq" value="build" />
884858
<option autotools="--enable-isystem" />
885859
</job>
@@ -891,7 +865,6 @@
891865
<!-- coverage="true" -->
892866
<axis name="boost" value="build" />
893867
<axis name="icu" value="build" />
894-
<axis name="mbedtls" value="build" />
895868
<axis name="zmq" value="build" />
896869
<option autotools="--enable-isystem" />
897870
</job>
@@ -902,7 +875,6 @@
902875
assert="ndebug" link="static" optimization="debug">
903876
<axis name="boost" value="build" />
904877
<axis name="icu" value="build" />
905-
<axis name="mbedtls" value="build" />
906878
<axis name="zmq" value="build" />
907879
</job>
908880

@@ -1009,19 +981,16 @@
1009981
<presets>
1010982
<mapping name="bitcoin-client" type="base" />
1011983
<mapping name="bitcoin-protocol" type="base" />
1012-
<mapping name="bitcoin-system" type="add" parameter="icu" />
984+
<mapping name="bitcoin-system" type="base" />
1013985
<configuration name="nix-base" />
1014986
<configuration name="gnu-debug" />
1015987
<configuration name="gnu-release" />
1016988
<configuration name="static" />
1017989
<configuration name="shared" />
1018-
<configuration name="gnu-optimized-size" />
1019990
<configuration name="nix-gnu-debug-static" />
1020991
<configuration name="nix-gnu-debug-shared" />
1021992
<configuration name="nix-gnu-release-static" />
1022993
<configuration name="nix-gnu-release-shared" />
1023-
<configuration name="nix-gnu-release-static-size" />
1024-
<configuration name="nix-gnu-release-shared-size" />
1025994
</presets>
1026995

1027996
<ci>
@@ -1234,19 +1203,16 @@
12341203
<mapping name="bitcoin-network" type="base" />
12351204
<mapping name="bitcoin-client" type="base" />
12361205
<mapping name="bitcoin-protocol" type="base" />
1237-
<mapping name="bitcoin-system" type="add" parameter="icu" />
1206+
<mapping name="bitcoin-system" type="base" />
12381207
<configuration name="nix-base" />
12391208
<configuration name="gnu-debug" />
12401209
<configuration name="gnu-release" />
12411210
<configuration name="static" />
12421211
<configuration name="shared" />
1243-
<configuration name="gnu-optimized-size" />
12441212
<configuration name="nix-gnu-debug-static" />
12451213
<configuration name="nix-gnu-debug-shared" />
12461214
<configuration name="nix-gnu-release-static" />
12471215
<configuration name="nix-gnu-release-shared" />
1248-
<configuration name="nix-gnu-release-static-size" />
1249-
<configuration name="nix-gnu-release-shared-size" />
12501216
</presets>
12511217

12521218
<ci>
@@ -1422,19 +1388,16 @@
14221388

14231389
<presets>
14241390
<mapping name="bitcoin-database" type="base" />
1425-
<mapping name="bitcoin-system" type="add" parameter="icu" />
1391+
<mapping name="bitcoin-system" type="base" />
14261392
<configuration name="nix-base" />
14271393
<configuration name="gnu-debug" />
14281394
<configuration name="gnu-release" />
14291395
<configuration name="static" />
14301396
<configuration name="shared" />
1431-
<configuration name="gnu-optimized-size" />
14321397
<configuration name="nix-gnu-debug-static" />
14331398
<configuration name="nix-gnu-debug-shared" />
14341399
<configuration name="nix-gnu-release-static" />
14351400
<configuration name="nix-gnu-release-shared" />
1436-
<configuration name="nix-gnu-release-static-size" />
1437-
<configuration name="nix-gnu-release-shared-size" />
14381401
</presets>
14391402

14401403
<ci>
@@ -1595,7 +1558,7 @@
15951558
<option value="${with_boost}" />
15961559
<option value="${with_pkgconfigdir}" />
15971560
</build>
1598-
<build name="bitcoin-consensus" github="libbitcoin" repository="libbitcoin-consensus" branch="version3" parallel="true" conditional="true" >
1561+
<build name="bitcoin-consensus" github="libbitcoin" repository="libbitcoin-consensus" branch="version3" parallel="true" option="consensus" conditional="true" >
15991562
<option value="--without-tests" cmake="-Dwith-tests=no" />
16001563
<option value="${with_boost}" />
16011564
<option value="${with_pkgconfigdir}" />
@@ -1607,30 +1570,19 @@
16071570
</install>
16081571

16091572
<presets>
1610-
<mapping name="bitcoin-blockchain" type="remove" parameter="consensus" />
1573+
<mapping name="bitcoin-blockchain" type="base" />
16111574
<mapping name="bitcoin-consensus" type="base" />
16121575
<mapping name="bitcoin-database" type="base" />
1613-
<mapping name="bitcoin-system" type="add" parameter="icu" />
1576+
<mapping name="bitcoin-system" type="base" />
16141577
<configuration name="nix-base" />
16151578
<configuration name="gnu-debug" />
16161579
<configuration name="gnu-release" />
16171580
<configuration name="static" />
16181581
<configuration name="shared" />
1619-
<configuration name="gnu-optimized-size" />
1620-
<configuration name="with_consensus" />
1621-
<configuration name="without_consensus" />
1622-
<configuration name="nix-gnu-debug-static-with_consensus" />
1623-
<configuration name="nix-gnu-debug-static-without_consensus" />
1624-
<configuration name="nix-gnu-debug-shared-with_consensus" />
1625-
<configuration name="nix-gnu-debug-shared-without_consensus" />
1626-
<configuration name="nix-gnu-release-static-with_consensus" />
1627-
<configuration name="nix-gnu-release-static-without_consensus" />
1628-
<configuration name="nix-gnu-release-shared-with_consensus" />
1629-
<configuration name="nix-gnu-release-shared-without_consensus" />
1630-
<configuration name="nix-gnu-release-static-size-with_consensus" />
1631-
<configuration name="nix-gnu-release-static-size-without_consensus" />
1632-
<configuration name="nix-gnu-release-shared-size-with_consensus" />
1633-
<configuration name="nix-gnu-release-shared-size-without_consensus" />
1582+
<configuration name="nix-gnu-debug-static" />
1583+
<configuration name="nix-gnu-debug-shared" />
1584+
<configuration name="nix-gnu-release-static" />
1585+
<configuration name="nix-gnu-release-shared" />
16341586
</presets>
16351587

16361588
<ci>
@@ -1816,22 +1768,19 @@
18161768
<presets>
18171769
<mapping name="bitcoin-node" type="base" />
18181770
<mapping name="bitcoin-network" type="base" />
1819-
<mapping name="bitcoin-blockchain" type="add" parameter="consensus" />
1771+
<mapping name="bitcoin-blockchain" type="base" />
18201772
<mapping name="bitcoin-consensus" type="base" />
18211773
<mapping name="bitcoin-database" type="base" />
1822-
<mapping name="bitcoin-system" type="add" parameter="icu" />
1774+
<mapping name="bitcoin-system" type="base" />
18231775
<configuration name="nix-base" />
18241776
<configuration name="gnu-debug" />
18251777
<configuration name="gnu-release" />
18261778
<configuration name="static" />
18271779
<configuration name="shared" />
1828-
<configuration name="gnu-optimized-size" />
18291780
<configuration name="nix-gnu-debug-static" />
18301781
<configuration name="nix-gnu-debug-shared" />
18311782
<configuration name="nix-gnu-release-static" />
18321783
<configuration name="nix-gnu-release-shared" />
1833-
<configuration name="nix-gnu-release-static-size" />
1834-
<configuration name="nix-gnu-release-shared-size" />
18351784
</presets>
18361785

18371786
<ci>
@@ -2021,22 +1970,19 @@
20211970
<mapping name="bitcoin-protocol" type="base" />
20221971
<mapping name="bitcoin-node" type="base" />
20231972
<mapping name="bitcoin-network" type="base" />
2024-
<mapping name="bitcoin-blockchain" type="add" parameter="consensus" />
1973+
<mapping name="bitcoin-blockchain" type="base" />
20251974
<mapping name="bitcoin-consensus" type="base" />
20261975
<mapping name="bitcoin-database" type="base" />
2027-
<mapping name="bitcoin-system" type="add" parameter="icu" />
1976+
<mapping name="bitcoin-system" type="base" />
20281977
<configuration name="nix-base" />
20291978
<configuration name="gnu-debug" />
20301979
<configuration name="gnu-release" />
20311980
<configuration name="static" />
20321981
<configuration name="shared" />
2033-
<configuration name="gnu-optimized-size" />
20341982
<configuration name="nix-gnu-debug-static" />
20351983
<configuration name="nix-gnu-debug-shared" />
20361984
<configuration name="nix-gnu-release-static" />
20371985
<configuration name="nix-gnu-release-shared" />
2038-
<configuration name="nix-gnu-release-static-size" />
2039-
<configuration name="nix-gnu-release-shared-size" />
20401986
</presets>
20411987

20421988
<ci>

0 commit comments

Comments
 (0)