You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by jd...@apache.org on 2017/04/18 21:24:24 UTC
[2/5] kudu git commit: docs: Fix "make site"
docs: Fix "make site"
* "make site" was broken due to changed command-line argments on
"docs/support/scripts/make_site.sh". This patch fixes that
discrepancy.
* Also, assume the "apache" remote exists for the site build. That
assumption is consistent with the "build-support/push_to_asf.py"
script.
Change-Id: I9050eec37ea6b5b4917a4c8269de4178c3c14cb2
Reviewed-on: http://gerrit.cloudera.org:8080/6488
Tested-by: Kudu Jenkins
Reviewed-by: Todd Lipcon <to...@apache.org>
(cherry picked from commit b719b1e7c7e2a78f8e818a9c8275b5d030835811)
Reviewed-on: http://gerrit.cloudera.org:8080/6643
Reviewed-by: Mike Percy <mp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/4e2e0d1e
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/4e2e0d1e
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/4e2e0d1e
Branch: refs/heads/branch-1.3.x
Commit: 4e2e0d1e9c951e4fc71e102c8762d05464b8e66f
Parents: 881789c
Author: Mike Percy <mp...@apache.org>
Authored: Fri Mar 24 19:33:43 2017 -0700
Committer: Jean-Daniel Cryans <jd...@apache.org>
Committed: Tue Apr 18 21:21:30 2017 +0000
----------------------------------------------------------------------
CMakeLists.txt | 4 ++--
docs/support/scripts/make_site.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/4e2e0d1e/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84329a5..2ec5f80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1095,10 +1095,10 @@ endif (UNIX)
if (UNIX)
if (NOT DOXYGEN_FOUND)
add_custom_target(site
- ${CMAKE_CURRENT_SOURCE_DIR}/docs/support/scripts/make_site.sh)
+ ${CMAKE_CURRENT_SOURCE_DIR}/docs/support/scripts/make_site.sh --no-doxygen)
else ()
add_custom_target(site
- ${CMAKE_CURRENT_SOURCE_DIR}/docs/support/scripts/make_site.sh doxygen)
+ ${CMAKE_CURRENT_SOURCE_DIR}/docs/support/scripts/make_site.sh)
endif ()
endif (UNIX)
http://git-wip-us.apache.org/repos/asf/kudu/blob/4e2e0d1e/docs/support/scripts/make_site.sh
----------------------------------------------------------------------
diff --git a/docs/support/scripts/make_site.sh b/docs/support/scripts/make_site.sh
index 76913c2..ec24b54 100755
--- a/docs/support/scripts/make_site.sh
+++ b/docs/support/scripts/make_site.sh
@@ -41,7 +41,7 @@ if [ $# -gt 0 ]; then
"--no-doxygen") OPT_DOXYGEN='' ;;
"--help") usage ;;
"-h") usage ;;
- *) echo "Unknown command-line option: $arg"; usage ;;
+ *) echo "$0: Unknown command-line option: $arg"; usage ;;
esac
done
fi
@@ -75,7 +75,7 @@ fi
make -j$(getconf _NPROCESSORS_ONLN) $MAKE_TARGETS
# Check out the gh-pages repo into $SITE_OUTPUT_DIR
-git clone -q $(git config --get remote.origin.url) --reference $SOURCE_ROOT -b gh-pages --depth 1 "$SITE_OUTPUT_DIR"
+git clone -q $(git config --get remote.apache.url) --reference $SOURCE_ROOT -b gh-pages --depth 1 "$SITE_OUTPUT_DIR"
# Build the docs using the styles from the Jekyll site
rm -Rf "$SITE_OUTPUT_DIR/docs"