diff options
| author |   Ed Kern <ejk@cisco.com> | 2018-10-11 10:37:08 -0600 |
|---|---|---|
| committer | Ed Kern <ejk@cisco.com> | 2018-10-29 10:27:01 -0600 |
| commit | e621897737bcfe66377cb0c66a56fbab05351740 (patch) | |
| tree | cddeafc603404e62453e6113ee9086faaf0e9f35 /jjb/vpp/include-raw-vpp-sphinx-docs.sh | |
| parent | 4a60ebc8e56fe75aa44d9facd1c452ce3318277d (diff) | |
VPP: sphinx doc changes
Altered push location and makefile comannds
Moved sphinx builds into new stream containing only
new branches
Change-Id: I3bdb4ea709209e12e7c590f75c8b8f2ca648b60d
Signed-off-by: Ed Kern <ejk@cisco.com>
Diffstat (limited to 'jjb/vpp/include-raw-vpp-sphinx-docs.sh')
| -rw-r--r-- | jjb/vpp/include-raw-vpp-sphinx-docs.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/jjb/vpp/include-raw-vpp-sphinx-docs.sh b/jjb/vpp/include-raw-vpp-sphinx-docs.sh index 5ab0df27e..100dee6c5 100644 --- a/jjb/vpp/include-raw-vpp-sphinx-docs.sh +++ b/jjb/vpp/include-raw-vpp-sphinx-docs.sh @@ -3,19 +3,19 @@ set -xe -o pipefail [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site" [ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp [ "$DOC_FILE" ] || DOC_FILE=vpp.docs.zip -[ "$DOC_DIR" ] || DOC_DIR=build-root/docs/html -[ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site/ +[ "$DOC_DIR" ] || DOC_DIR=./docs/_build/html +[ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site [ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources [ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" [ "$VERSION" ] || VERSION=$(./build-root/scripts/version rpm-version) -make doxygen +make docs-venv +make docs if [[ ${JOB_NAME} == *merge* ]]; then mkdir -p $(dirname ${RESOURCES_DIR}) mv -f ${DOC_DIR} ${RESOURCES_DIR} cd ${SITE_DIR} - find . -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete cat > pom.xml << EOF <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -40,11 +40,11 @@ if [[ ${JOB_NAME} == *merge* ]]; then <distributionManagement> <site> <id>fdio-site</id> - <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION}</url> + <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/v${VERSION}</url> </site> </distributionManagement> </project> EOF ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C cd - -fi
\ No newline at end of file +fi |