kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpe...@apache.org
Subject [1/2] kudu git commit: docs: Fix "make site"
Date Mon, 27 Mar 2017 22:37:55 GMT
Repository: kudu
Updated Branches:
  refs/heads/master 0254216c1 -> 58e1d26d8


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 <todd@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/b719b1e7
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/b719b1e7
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/b719b1e7

Branch: refs/heads/master
Commit: b719b1e7c7e2a78f8e818a9c8275b5d030835811
Parents: 0254216
Author: Mike Percy <mpercy@apache.org>
Authored: Fri Mar 24 19:33:43 2017 -0700
Committer: Todd Lipcon <todd@apache.org>
Committed: Mon Mar 27 18:39:34 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/b719b1e7/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/b719b1e7/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"


Mime
View raw message