Skip to content

Commit 3b66b1c

Browse files
committed
[MINOR][DOCS] Minor doc fixes related with doc build and uses script dir in SQL doc gen script
## What changes were proposed in this pull request? This PR proposes both: - Add information about Javadoc, SQL docs and few more information in `docs/README.md` and a comment in `docs/_plugins/copy_api_dirs.rb` related with Javadoc. - Adds some commands so that the script always runs the SQL docs build under `./sql` directory (for directly running `./sql/create-docs.sh` in the root directory). ## How was this patch tested? Manual tests with `jekyll build` and `./sql/create-docs.sh` in the root directory. Author: hyukjinkwon <[email protected]> Closes apache#19019 from HyukjinKwon/minor-doc-build.
1 parent 522e1f8 commit 3b66b1c

File tree

3 files changed

+45
-31
lines changed

3 files changed

+45
-31
lines changed

docs/README.md

Lines changed: 40 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,22 @@ documentation yourself. Why build it yourself? So that you have the docs that co
99
whichever version of Spark you currently have checked out of revision control.
1010

1111
## Prerequisites
12-
The Spark documentation build uses a number of tools to build HTML docs and API docs in Scala,
13-
Python and R.
12+
13+
The Spark documentation build uses a number of tools to build HTML docs and API docs in Scala, Java,
14+
Python, R and SQL.
1415

1516
You need to have [Ruby](https://www.ruby-lang.org/en/documentation/installation/) and
1617
[Python](https://docs.python.org/2/using/unix.html#getting-and-installing-the-latest-version-of-python)
1718
installed. Also install the following libraries:
19+
1820
```sh
19-
$ sudo gem install jekyll jekyll-redirect-from pygments.rb
20-
$ sudo pip install Pygments
21-
# Following is needed only for generating API docs
22-
$ sudo pip install sphinx pypandoc mkdocs
23-
$ sudo Rscript -e 'install.packages(c("knitr", "devtools", "roxygen2", "testthat", "rmarkdown"), repos="http://cran.stat.ucla.edu/")'
21+
$ sudo gem install jekyll jekyll-redirect-from pygments.rb
22+
$ sudo pip install Pygments
23+
# Following is needed only for generating API docs
24+
$ sudo pip install sphinx pypandoc mkdocs
25+
$ sudo Rscript -e 'install.packages(c("knitr", "devtools", "roxygen2", "testthat", "rmarkdown"), repos="http://cran.stat.ucla.edu/")'
2426
```
27+
2528
(Note: If you are on a system with both Ruby 1.9 and Ruby 2.0 you may need to replace gem with gem2.0)
2629

2730
## Generating the Documentation HTML
@@ -32,42 +35,49 @@ the source code and be captured by revision control (currently git). This way th
3235
includes the version of the documentation that is relevant regardless of which version or release
3336
you have checked out or downloaded.
3437

35-
In this directory you will find textfiles formatted using Markdown, with an ".md" suffix. You can
36-
read those text files directly if you want. Start with index.md.
38+
In this directory you will find text files formatted using Markdown, with an ".md" suffix. You can
39+
read those text files directly if you want. Start with `index.md`.
3740

3841
Execute `jekyll build` from the `docs/` directory to compile the site. Compiling the site with
39-
Jekyll will create a directory called `_site` containing index.html as well as the rest of the
42+
Jekyll will create a directory called `_site` containing `index.html` as well as the rest of the
4043
compiled files.
4144

42-
$ cd docs
43-
$ jekyll build
45+
```sh
46+
$ cd docs
47+
$ jekyll build
48+
```
4449

4550
You can modify the default Jekyll build as follows:
51+
4652
```sh
47-
# Skip generating API docs (which takes a while)
48-
$ SKIP_API=1 jekyll build
49-
50-
# Serve content locally on port 4000
51-
$ jekyll serve --watch
52-
53-
# Build the site with extra features used on the live page
54-
$ PRODUCTION=1 jekyll build
53+
# Skip generating API docs (which takes a while)
54+
$ SKIP_API=1 jekyll build
55+
56+
# Serve content locally on port 4000
57+
$ jekyll serve --watch
58+
59+
# Build the site with extra features used on the live page
60+
$ PRODUCTION=1 jekyll build
5561
```
5662

57-
## API Docs (Scaladoc, Sphinx, roxygen2)
63+
## API Docs (Scaladoc, Javadoc, Sphinx, roxygen2, MkDocs)
5864

59-
You can build just the Spark scaladoc by running `build/sbt unidoc` from the SPARK_PROJECT_ROOT directory.
65+
You can build just the Spark scaladoc and javadoc by running `build/sbt unidoc` from the `SPARK_HOME` directory.
6066

6167
Similarly, you can build just the PySpark docs by running `make html` from the
62-
SPARK_PROJECT_ROOT/python/docs directory. Documentation is only generated for classes that are listed as
63-
public in `__init__.py`. The SparkR docs can be built by running SPARK_PROJECT_ROOT/R/create-docs.sh.
68+
`SPARK_HOME/python/docs` directory. Documentation is only generated for classes that are listed as
69+
public in `__init__.py`. The SparkR docs can be built by running `SPARK_HOME/R/create-docs.sh`, and
70+
the SQL docs can be built by running `SPARK_HOME/sql/create-docs.sh`
71+
after [building Spark](https://github.com/apache/spark#building-spark) first.
6472

65-
When you run `jekyll` in the `docs` directory, it will also copy over the scaladoc for the various
73+
When you run `jekyll build` in the `docs` directory, it will also copy over the scaladoc and javadoc for the various
6674
Spark subprojects into the `docs` directory (and then also into the `_site` directory). We use a
6775
jekyll plugin to run `build/sbt unidoc` before building the site so if you haven't run it (recently) it
68-
may take some time as it generates all of the scaladoc. The jekyll plugin also generates the
69-
PySpark docs using [Sphinx](http://sphinx-doc.org/).
76+
may take some time as it generates all of the scaladoc and javadoc using [Unidoc](https://github.com/sbt/sbt-unidoc).
77+
The jekyll plugin also generates the PySpark docs using [Sphinx](http://sphinx-doc.org/), SparkR docs
78+
using [roxygen2](https://cran.r-project.org/web/packages/roxygen2/index.html) and SQL docs
79+
using [MkDocs](http://www.mkdocs.org/).
7080

71-
NOTE: To skip the step of building and copying over the Scala, Python, R and SQL API docs, run `SKIP_API=1
72-
jekyll`. In addition, `SKIP_SCALADOC=1`, `SKIP_PYTHONDOC=1`, `SKIP_RDOC=1` and `SKIP_SQLDOC=1` can be used
73-
to skip a single step of the corresponding language.
81+
NOTE: To skip the step of building and copying over the Scala, Java, Python, R and SQL API docs, run `SKIP_API=1
82+
jekyll build`. In addition, `SKIP_SCALADOC=1`, `SKIP_PYTHONDOC=1`, `SKIP_RDOC=1` and `SKIP_SQLDOC=1` can be used
83+
to skip a single step of the corresponding language. `SKIP_SCALADOC` indicates skipping both the Scala and Java docs.

docs/_plugins/copy_api_dirs.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
if not (ENV['SKIP_API'] == '1')
2222
if not (ENV['SKIP_SCALADOC'] == '1')
23-
# Build Scaladoc for Java/Scala
23+
# Build Scaladoc for Scala and Javadoc for Java
2424

2525
puts "Moving to project root and building API docs."
2626
curr_dir = pwd

sql/create-docs.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ if ! hash mkdocs 2>/dev/null; then
3737
pip install mkdocs
3838
fi
3939

40+
pushd "$FWDIR" > /dev/null
41+
4042
# Now create the markdown file
4143
rm -fr docs
4244
mkdir docs
@@ -47,3 +49,5 @@ echo "Generating markdown files for SQL documentation."
4749
echo "Generating HTML files for SQL documentation."
4850
mkdocs build --clean
4951
rm -fr docs
52+
53+
popd

0 commit comments

Comments
 (0)