Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor makefile: var to inject adoc options; change to build dir instead of outfiles #30

Merged
merged 1 commit into from
Jan 24, 2024
Merged

refactor makefile: var to inject adoc options; change to build dir instead of outfiles #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ riscvintl/riscv-docs-base-container-image:latest

SRC_DIR := src
BUILD_DIR := build
HEADER_SOURCE := $(SRC_DIR)/header.adoc
PDF_RESULT := $(BUILD_DIR)/spec-sample.pdf
HTML_RESULT := $(BUILD_DIR)/spec-sample.html

HEADER_SOURCE := $(SRC_DIR)/spec-sample.adoc
XTRA_ADOC_OPTS :=
ASCIIDOCTOR_PDF := asciidoctor-pdf
ASCIIDOCTOR_HTML := asciidoctor
OPTIONS := --trace \
Expand All @@ -34,6 +32,8 @@ OPTIONS := --trace \
-a revdate=${DATE} \
-a pdf-fontsdir=docs-resources/fonts \
-a pdf-theme=docs-resources/themes/riscv-pdf.yml \
$(XTRA_ADOC_OPTS) \
-D build \
--failure-level=ERROR
REQUIRES := --require=asciidoctor-bibtex \
--require=asciidoctor-diagram \
Expand All @@ -55,14 +55,14 @@ build:

build-container:
@echo "Starting build inside Docker container..."
$(DOCKER_RUN) /bin/sh -c "$(ASCIIDOCTOR_PDF) $(OPTIONS) $(REQUIRES) --out-file=$(PDF_RESULT) $(HEADER_SOURCE)"
$(DOCKER_RUN) /bin/sh -c "$(ASCIIDOCTOR_HTML) $(OPTIONS) $(REQUIRES) --out-file=$(HTML_RESULT) $(HEADER_SOURCE)"
$(DOCKER_RUN) /bin/sh -c "$(ASCIIDOCTOR_PDF) $(OPTIONS) $(REQUIRES) $(HEADER_SOURCE)"
$(DOCKER_RUN) /bin/sh -c "$(ASCIIDOCTOR_HTML) $(OPTIONS) $(REQUIRES) $(HEADER_SOURCE)"
@echo "Build completed successfully inside Docker container."

build-no-container:
@echo "Starting build..."
$(ASCIIDOCTOR_PDF) $(OPTIONS) $(REQUIRES) --out-file=$(PDF_RESULT) $(HEADER_SOURCE)
$(ASCIIDOCTOR_HTML) $(OPTIONS) $(REQUIRES) --out-file=$(HTML_RESULT) $(HEADER_SOURCE)
$(ASCIIDOCTOR_PDF) $(OPTIONS) $(REQUIRES) $(HEADER_SOURCE)
$(ASCIIDOCTOR_HTML) $(OPTIONS) $(REQUIRES) $(HEADER_SOURCE)
@echo "Build completed successfully."

clean:
Expand Down
2 changes: 1 addition & 1 deletion docs-resources
Open in desktop
Submodule docs-resources updated 15 files
+15 −0 .github/workflows/pre-commit.yml
+18 −0 .pre-commit-config.yaml
+1 −2 LICENSE
+31 −31 README.md
+1 −1 fonts/OFL-M.txt
+1 −1 fonts/OFL-P.txt
+1 −1 fonts/OFL1.txt
+ − images/AdvPLIC-ex-1Domain.png
+ − images/AdvPLIC-ex-2Domains.png
+ − images/AdvPLIC-ex-3Domains.png
+ − images/IOMMU-MRIF.png
+ − images/IOMMU-guestIntrFiles.png
+ − images/intrsWithIMSICs.png
+ − images/intrsWithoutIMSICs.png
+20 −19 themes/riscv-pdf.yml
0 src/header.adoc → src/spec-sample.adoc
View file
Open in desktop
File renamed without changes.
Loading