Skip to content

Commit 943a1cd

Browse files
committed
make: cleanup builds
Previously we used additional attributes in the makefile. Switch these out into new index_*.adoc files so they are easier to reason about and build natively from the command line.
1 parent ddbe289 commit 943a1cd

File tree

6 files changed

+46
-27
lines changed

6 files changed

+46
-27
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ html:
5050
mkdir -p bin
5151
## Single page HTML
5252
## Set imagesdir to parent_dir/images to work with jekyll build
53-
bundle exec asciidoctor --attribute imagesdir=./images --attribute mermaid-format=svg -r asciidoctor-diagram -o onboarding-to-bitcoin-core.html index.adoc
53+
bundle exec asciidoctor -r asciidoctor-diagram -o onboarding-to-bitcoin-core.html index.adoc
5454
## Delete non-deterministic asciidoctor output
5555
sed -i '/^Last updated /d' onboarding-to-bitcoin-core.html
5656
mv onboarding-to-bitcoin-core.html bin/
5757
cp -r images bin/
5858

5959
pdf:
60-
bundle exec asciidoctor --attribute imagesdir=./images --attribute mermaid-format=png -r asciidoctor-pdf -b pdf -r asciidoctor-diagram -o onboarding-to-bitcoin-core.pdf index.adoc
60+
bundle exec asciidoctor -r asciidoctor-pdf -b pdf -r asciidoctor-diagram -o onboarding-to-bitcoin-core.pdf index_pdf.adoc
6161
mv onboarding-to-bitcoin-core.pdf bin/
6262

6363
epub:
64-
asciidoctor -b epub3 -r asciidoctor-epub3 -r asciidoctor-diagram --attribute mermaid-format=png --attribute doctype=book index.adoc
64+
asciidoctor -b epub3 -r asciidoctor-epub3 -r asciidoctor-diagram -o index.epub index_epub.adoc
6565
mv index.epub bin/onboarding-to-bitcoin-core.epub

_config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ mermaid:
7272
# their entries' file path in the `include:` list.
7373
exclude:
7474
- .jekyll-cache/
75+
- all_chapters.adoc
7576
- 01_overview-and-development.adoc
7677
- 02_architecture.adoc
7778
- 03_consensus-and-validation.adoc
@@ -84,7 +85,8 @@ exclude:
8485
- 10_rpc.adoc
8586
- asciidoc_workflow.adoc
8687
- index.adoc
87-
- old.index.adoc
88+
- index_pdf.adoc
89+
- index_epub.adoc
8890
- settings.adoc
8991
- README.adoc
9092
- book.html

all_chapters.adoc

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
include::01_overview-and-development.adoc[]
2+
3+
include::02_architecture.adoc[]
4+
5+
include::03_consensus-and-validation.adoc[]
6+
7+
include::04_wallet.adoc[]
8+
9+
include::05_gui.adoc[]
10+
11+
include::06_p2p.adoc[]
12+
13+
include::07_mempool.adoc[]
14+
15+
include::08_script.adoc[]
16+
17+
include::09_build-system.adoc[]
18+
19+
include::10_rpc.adoc[]
20+
21+
include::appendix.adoc[]
22+
23+
include::glossary.adoc[]

index.adoc

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,6 @@
22
include::settings.adoc[]
33
:leveloffset: +1
44

5-
include::01_overview-and-development.adoc[]
6-
7-
include::02_architecture.adoc[]
8-
9-
include::03_consensus-and-validation.adoc[]
10-
11-
include::04_wallet.adoc[]
12-
13-
include::05_gui.adoc[]
14-
15-
include::06_p2p.adoc[]
16-
17-
include::07_mempool.adoc[]
18-
19-
include::08_script.adoc[]
20-
21-
include::09_build-system.adoc[]
22-
23-
include::10_rpc.adoc[]
24-
25-
include::appendix.adoc[]
26-
27-
include::glossary.adoc[]
5+
include::all_chapters.adoc[]
286

297
:leveloffset: -1

index_epub.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
= Onboarding to Bitcoin Core
2+
include::settings.adoc[]
3+
:leveloffset: +1
4+
:mermaid-format: png
5+
6+
include::all_chapters.adoc[]
7+
8+
:leveloffset: -1

index_pdf.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
= Onboarding to Bitcoin Core
2+
include::settings.adoc[]
3+
:leveloffset: +1
4+
:mermaid-format: png
5+
6+
include::all_chapters.adoc[]
7+
8+
:leveloffset: -1

0 commit comments

Comments
 (0)