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.

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

Migration to RISC-V specifications template in asciidoc #107

Merged
merged 1 commit into from
Aug 28, 2024

Conversation

apazos
Copy link
Collaborator

@apazos apazos commented Jul 2, 2024

No description provided.

@kito-cheng
Copy link
Collaborator

PDF and html rendering seems good to me :)

PDF: riscv-asm.pdf

@apazos apazos force-pushed the migration branch 2 times, most recently from e0df3a5 to 46f9130 Compare July 3, 2024 21:21
@apazos
Copy link
Collaborator Author

apazos commented Jul 3, 2024

Thanks for trying @kito-cheng, I made a few more small changes.

@apazos
Copy link
Collaborator Author

apazos commented Jul 9, 2024

Pushed changes to make title page and toc appear, reorganizing prelude and preamble files

@apazos
Copy link
Collaborator Author

apazos commented Jul 11, 2024

Moved list of tables after document status

@cmuellner
Copy link
Collaborator

Docker-based build fails for me:

$ make
Checking if Docker is available...
Docker is available, building inside Docker container...
make[1]: Entering directory '/home/cm/work/riscv/rvi/riscv-asm-manual/asciidoc'
Starting build inside Docker container...
make build-docs
make[2]: Entering directory '/home/cm/work/riscv/rvi/riscv-asm-manual/asciidoc'
docker run --rm -v /home/cm/work/riscv/rvi/riscv-asm-manual/asciidoc:/build -w /build riscvintl/riscv-docs-base-container-image:latest /bin/sh -c " asciidoctor-pdf --trace -a compress -a revdate=2024-08-01 -a pdf-style=docs-resources/themes/risc-v_spec-pdf.yml -a pdf-fontsdir=docs-resources/fonts  -D build --failure-level=ERROR --require=asciidoctor-lists src/riscv-asm.adoc "
Emulate Docker CLI using podman. Create /etc/containers/nodocker to quiet msg.
asciidoctor: ERROR: prelude.adoc: line 3: include file not found: /build/docs-resources/global-config.adoc
asciidoctor: WARNING: image to embed not found or not readable: /build/docs-resources/images/risc-v_logo.png
make[2]: *** [Makefile:55: riscv-asm.pdf] Error 1
make[2]: Leaving directory '/home/cm/work/riscv/rvi/riscv-asm-manual/asciidoc'
make[1]: *** [Makefile:72: build-container] Error 2
make[1]: Leaving directory '/home/cm/work/riscv/rvi/riscv-asm-manual/asciidoc'
make: *** [Makefile:62: build] Error 2

Before the build, I pulled the latest container:

$ podman pull riscvintl/riscv-docs-base-container-image:latest
Trying to pull docker.io/riscvintl/riscv-docs-base-container-image:latest...
Getting image source signatures
Copying blob 35cb7b63668a skipped: already exists  
Copying blob 903e4dcc6386 skipped: already exists  
Copying blob 3713021b0277 skipped: already exists  
Copying config 30c49ab9f7 done   | 
Writing manifest to image destination
30c49ab9f7881fb33925c81ff10a66e22641b3c43f86b37d8f0998832fd369ee

Also, building native (Fedora 40) does not work because the Ruby package mathematical cannot be built on Fedora 40 (see gjtorikian/mathematical#134 and the waiting PR https://github.com/gjtorikian/mathematical/pull/135/files).

@wmat
Copy link
Contributor

wmat commented Aug 1, 2024 via email

@cmuellner
Copy link
Collaborator

@wmat, thanks for the hint. Indeed, I forgot to pull the submodule. However, I immediately ran into the next issue with the container build, because my system (Fedora 40) uses podman as docker replacement. I've created a PR that addresses this issue here.

Since the native build issue was quite annoying, I reached out to the owners of Ruby's mathematical package. I could get them to fix the build issue and even trigger a new release (https://github.com/gjtorikian/mathematical/releases/tag/v1.6.20).

@wmat
Copy link
Contributor

wmat commented Aug 14, 2024

Interesting. I'm using F40 as well, but with Docker, so I didn't see those issues.

@apazos apazos force-pushed the migration branch 2 times, most recently from 737ebd9 to 2e37eeb Compare August 16, 2024 17:20
@apazos
Copy link
Collaborator Author

apazos commented Aug 16, 2024

@cmuellner, now that you fixed your local build issue, can you please try to build again. I had to rebase the patch to take additional changes merged into riscv-asm.md and fix some out of sync issue with my local repo.

Copy link
Collaborator

@cmuellner cmuellner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cmuellner
Copy link
Collaborator

I've built this PR with git submodule update --init ; make on a Fedora machine (using Podman as container runtime) and everything looks ok.

While diffing the original Markdown with the generated PDF, I noticed that we have terrible content in this repo and really should work on this document in the future.

I consider this as ready to land.

@cmuellner cmuellner merged commit ad0de8c into riscv-non-isa:main Aug 28, 2024
@apazos apazos deleted the migration branch August 28, 2024 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants