diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-09-26 23:33:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 23:33:53 -0500 |
| commit | 4ceea0426c933c853b3479acaa3e523c2b34a467 (patch) | |
| tree | 4c0e10af18b3d8804dffe8ed2f1cf7298915bb2c | |
| parent | d03f0a20cc0f98ee55fbca65d71ff59026bee323 (diff) | |
| parent | 80166176a3a53498e989bfa6eb8a58859c0428ad (diff) | |
| download | servo-4ceea0426c933c853b3479acaa3e523c2b34a467.tar.gz servo-4ceea0426c933c853b3479acaa3e523c2b34a467.zip | |
Auto merge of #13410 - jdm:doc_fix, r=Ms2ger
Fix doc build by resurrecting generation of supported DOM APIs.h
This should fix #12964.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13410)
<!-- Reviewable:end -->
| -rw-r--r-- | components/script/CMakeLists.txt | 16 | ||||
| -rwxr-xr-x | etc/ci/upload_docs.sh | 8 |
2 files changed, 21 insertions, 3 deletions
diff --git a/components/script/CMakeLists.txt b/components/script/CMakeLists.txt index 30bb03f56b5..54936386b80 100644 --- a/components/script/CMakeLists.txt +++ b/components/script/CMakeLists.txt @@ -72,6 +72,22 @@ add_custom_command( VERBATIM ) +add_custom_command( + OUTPUT apis.html + COMMAND python -B ${bindings_src}/pythonpath.py -I ${bindings_src}/parser -I ${bindings_src}/ply + ${bindings_src}/GlobalGen.py + --cachedir=_cache + --filelist=webidls.list + --only-html + ${bindings_src}/Bindings.conf + . + ${PROJECT_SOURCE_DIR} + DEPENDS _cache ${globalgen_deps} ${webidls} + VERBATIM + ) + +add_custom_target(supported-apis DEPENDS apis.html) + # We need an intermediate custom target for this, due to this misfeature: # > If any dependency is an OUTPUT of another custom command in the same # > directory CMake automatically brings the other custom command into the diff --git a/etc/ci/upload_docs.sh b/etc/ci/upload_docs.sh index f55e5cb73db..4d159ce53d8 100755 --- a/etc/ci/upload_docs.sh +++ b/etc/ci/upload_docs.sh @@ -20,9 +20,11 @@ cp etc/doc.servo.org/* target/doc/ python components/style/properties/build.py servo html -OUT_DIR="$(pwd)/target/doc/servo" \ - make -f makefile.cargo -C components/script dom_docs -rm -rf target/doc/servo/.cache +cd components/script +cmake . +cmake --build . --target supported-apis +cp apis.html target/doc/servo/ +cd ../.. ghp-import -n target/doc git push -qf "https://${TOKEN}@github.com/servo/doc.servo.org.git" gh-pages |