Merge pull request #526 from antmicro/umarcor/subdir-docs

rename 'source' to 'docs'; add section 'Contributing' and README.md
This commit is contained in:
Karol Gugala 2022-02-21 21:15:32 +01:00 committed by GitHub
commit b9b1b28bff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 35 additions and 28 deletions

2
.gitignore vendored
View File

@ -1,4 +1,2 @@
/source/_build/
/source/env/
*.pyc
*.sw*

View File

@ -3,7 +3,7 @@
TOP_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
# A pip `requirements.txt` file.
REQUIREMENTS_FILE := requirements.txt
REQUIREMENTS_FILE := docs/requirements.txt
# A conda `environment.yml` file.
ENVIRONMENT_FILE := environment.yml
@ -21,7 +21,7 @@ BUILDDIR = _build
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) docs
help:
@echo "Please use \`make <target>' where <target> is one of"

7
README.md Normal file
View File

@ -0,0 +1,7 @@
# F4PGA
This is the entrypoint to the documentation of F4PGA.
- [f4pga.readthedocs.io](https://f4pga.readthedocs.io)
- [f4pga.readthedocs.io/projects/arch-defs](https://f4pga.readthedocs.io/projects/arch-defs)
- [f4pga-examples.readthedocs.io](https://f4pga-examples.readthedocs.io)

2
docs/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/_build/
/env/

View File

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 307 B

View File

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 65 KiB

View File

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 78 KiB

View File

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 114 KiB

View File

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -0,0 +1,15 @@
Building the documentation
##########################
Activate the virtual environment and install dependencies::
make env
make enter
Build the whole documentation::
make html
For more options see::
make help

View File

@ -1,25 +1,5 @@
===============
Getting Started
===============
Building documentation
----------------------
Activate the virtual environment and install dependencies::
make env
make enter
Build the whole documentation::
make html
For more options see::
make help
Packages in virtual environment
-------------------------------
###############################
To install packages in conda environment you can use both
``conda`` and ``pip``.

View File

@ -2,7 +2,6 @@ F4PGA documentation
###################
.. toctree::
:maxdepth: 3
introduction
toolchain-desc/index
@ -10,3 +9,9 @@ F4PGA documentation
Project X-Ray ➚ <https://f4pga.readthedocs.io/projects/prjxray/en/latest/>
Project Trellis ➚ <https://prjtrellis.readthedocs.io/en/latest/>
FPGA Assembly (FASM) ➚ <https://fasm.readthedocs.io/en/latest/>
.. toctree::
:caption: Contributing
contributing/building-docs
contributing/venv

View File

@ -8,4 +8,4 @@ dependencies:
- pygobject
- pip
- pip:
- -r requirements.txt
- -r docs/requirements.txt

View File

@ -7,7 +7,7 @@ version: 2
# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: source/conf.py
configuration: docs/conf.py
# Optionally build your docs in additional formats such as PDF and ePub
formats: []