You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by va...@apache.org on 2017/07/20 18:50:48 UTC
[1/2] mahout git commit: convenience script to build oldsite set
base_path to empty value. improved menu layout. removed some redundant items
Repository: mahout
Updated Branches:
refs/heads/master 74766e309 -> 129f1b35c
convenience script to build oldsite
set base_path to empty value.
improved menu layout. removed some redundant items
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/d043db40
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/d043db40
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/d043db40
Branch: refs/heads/master
Commit: d043db4035f641b92be392bdb09320e896a93c0a
Parents: 74766e3
Author: vanstee <va...@apache.org>
Authored: Mon Jul 10 12:59:00 2017 -0400
Committer: vanstee <va...@apache.org>
Committed: Thu Jul 20 14:28:51 2017 -0400
----------------------------------------------------------------------
website/build_oldsite.sh | 31 +++++++++++++++++++++++++++++++
website/front/_includes/navbar.html | 21 ++++++++++++---------
website/oldsite/_config.yml | 2 +-
3 files changed, 44 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/d043db40/website/build_oldsite.sh
----------------------------------------------------------------------
diff --git a/website/build_oldsite.sh b/website/build_oldsite.sh
new file mode 100644
index 0000000..e4dc51b
--- /dev/null
+++ b/website/build_oldsite.sh
@@ -0,0 +1,31 @@
+#/bin/bash
+
+
+#################################################
+# create OLDSITE
+#################################################
+
+MHT_GIT_DIR=/data/work/git-repos/mahout/
+TMP_WEB_DIR=/tmp/mahout_tmp_web/
+
+# Checkout master and update to latest code
+rm -rf $TMP_WEB_DIR/*
+mkdir -p $TMP_WEB_DIR
+cd $MHT_GIT_DIR
+# git checkout master
+# git fetch apache
+# git reset --hard apache/master
+#
+
+# Build static content
+cd ${MHT_GIT_DIR}/website/oldsite
+rake theme:switch name="mahout-retro"
+JEKYLL_ENV=production bundle exec jekyll build
+cp -R ${MHT_GIT_DIR}/website/oldsite/_site/* $TMP_WEB_DIR
+
+echo "-------------------------------------------------------"
+echo To test website open a new with browser window at localhost:4000
+echo "Start Jekyll server in a terminal window..."
+echo cd $TMP_WEB_DIR
+echo jekyll serve
+echo "-------------------------------------------------------"
http://git-wip-us.apache.org/repos/asf/mahout/blob/d043db40/website/front/_includes/navbar.html
----------------------------------------------------------------------
diff --git a/website/front/_includes/navbar.html b/website/front/_includes/navbar.html
index 87a7072..787b3d5 100644
--- a/website/front/_includes/navbar.html
+++ b/website/front/_includes/navbar.html
@@ -5,26 +5,30 @@
<!-- Download -->
<li><a href="{{ BASE_PATH }}/downloads.html">Download Mahout</a></li>
- <!-- Community -->
+ <!-- Developers -->
<li id="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Developers<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a href="/developers/key-concepts.html">Key-Concepts</a></li> <!-- needs to be filled out -->
- <li><a href="/developers/index.html">Developer Resources</a></li>
- <li><a href="/developers/issue-tracker.html">Issues Tracking (JIRA)</a></li>
+ <!--<li><a href="/developers/key-concepts.html">Key-Concepts</a></li> needs to be filled out -->
+ <!--<li><a href="/developers/index.html">Developer Resources</a></li> moved to docs -->
<!--<li><a href="/developers/patch-check-list.html">Patch Check List</a></li> going to github template -->
<!--<li><a href="/developers/reference.html">References</a></li> a lot of overlap with books, talks, etc. page -->
- <li><a href="/developers/release-notes.html">Release Notes</a></li>
<!--<li><a href="/developers/thirdparty-dependencies.html">Third Party Dependencies</a></li> is our site the reasonable place for this? -->
<!--<li><a href="/developers/version-control.html">Version Control</a></li>-->
<li class="divider"></li>
<li class="nav-header"> <b>How Tos</b></li>
<li><a href="/developers/how-to-contribute.html">How to Contribute</a></li>
- <li><a href="/developers/githubPRs.html">Github PRs</a></li> <!-- gtg, added new info for develop and feature branching -->
+ <li><a href="/developers/buildingmahout.html">How to Build Mahout</a></li>
+ <li><a href="/developers/githubPRs.html">How to Merge a Github PR</a></li> <!-- gtg, added new info for develop and feature branching -->
<li><a href="/developers/how-to-become-a-committer.html">How to Become a Committer</a></li>
<li><a href="/developers/how-to-release.html">How to Release</a></li>
<li><a href="/developers/how-to-update-the-website.html">How to Update the Website</a></li>
<li><a href="/developers/publish-website.html">How to Publish the Website</a></li>
+ <li class="divider"></li>
+ <li class="nav-header"> <b>Miscellaneous</b></li>
+ <li><a href="/developers/issue-tracker.html">Issues Tracking (JIRA)</a></li>
+ <li><a href="/developers/release-notes.html">Release Notes</a></li>
+
</ul>
</li>
@@ -41,7 +45,7 @@
</li>
- <!-- Getting Started -->
+ <!-- Community -->
<li id="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community<span class="caret"></span></a>
<ul class="dropdown-menu">
@@ -49,7 +53,6 @@
<li><a href="/community/blogs.html">Blog Posts About Mahout</a></li>
<li><a href="/community/recent-upcoming-talks.html">Recent and Upcoming Talks</a></li>
<!--<li><a href="/community/books-tutorials-and-talks.html">Books Tutorials and Talks</a></li>-->
- <li><a href="/community/buildingmahout.html">Building Mahout</a></li>
<!--<li><a href="/community/faq.html">FAQ</a></li> needs a lot of updating -->
<li><a href="/community/gsoc.html">GSoC</a></li> <!-- Is OK- updated Map/Reduce verbage to reflect Samsara -->
<!--<li><a href="/community/mahout-benchmarks.html">Mahout Benchmarks</a></li> These are old, Keep them? -->
@@ -61,7 +64,7 @@
<li><a href="/community/who-we-are.html">Who We Are</a></li> <!-- nikolai needs to add himself -->
</ul>
</li>
- <li><a href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a></li>
+ <!--<li><a href="/docs/0.13.1-SNAPSHOT/index.html">Overview</a></li> not sure this need to be-->
</ul>
<form class="navbar-form navbar-left">
http://git-wip-us.apache.org/repos/asf/mahout/blob/d043db40/website/oldsite/_config.yml
----------------------------------------------------------------------
diff --git a/website/oldsite/_config.yml b/website/oldsite/_config.yml
index dcc8bf7..a11e614 100644
--- a/website/oldsite/_config.yml
+++ b/website/oldsite/_config.yml
@@ -58,7 +58,7 @@ JB :
# - Only the following values are falsy: ["", null, false]
# - When setting BASE_PATH it must be a valid url.
# This means always setting the protocol (http|https) or prefixing with "/"
- BASE_PATH : /docs/0.13.0
+ BASE_PATH :
# By default, the asset_path is automatically defined relative to BASE_PATH plus the enabled theme.
# ex: [BASE_PATH]/assets/themes/[THEME-NAME]
[2/2] mahout git commit: added build_newsite.sh using mahout retro
theme
Posted by va...@apache.org.
added build_newsite.sh
using mahout retro theme
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/129f1b35
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/129f1b35
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/129f1b35
Branch: refs/heads/master
Commit: 129f1b35c9de3392c6f271cc8bad08d2ccf27860
Parents: d043db4
Author: vanstee <va...@apache.org>
Authored: Thu Jul 20 14:40:55 2017 -0400
Committer: vanstee <va...@apache.org>
Committed: Thu Jul 20 14:42:57 2017 -0400
----------------------------------------------------------------------
website/build_newsite.sh | 39 ++++++++++++++++++++++++++++++
website/build_oldsite.sh | 0
website/oldsite/_layouts/default.html | 4 +--
website/oldsite/_layouts/page.html | 4 +--
website/oldsite/_layouts/post.html | 4 +--
5 files changed, 45 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/129f1b35/website/build_newsite.sh
----------------------------------------------------------------------
diff --git a/website/build_newsite.sh b/website/build_newsite.sh
new file mode 100755
index 0000000..c079a2d
--- /dev/null
+++ b/website/build_newsite.sh
@@ -0,0 +1,39 @@
+#/bin/bash
+
+MHT_GIT_DIR=/data/work/git-repos/mahout/
+TMP_WEB_DIR=/tmp/new/mahout_tmp_web/
+BASEDOCURL="docs/0.13.1-SNAPSHOT"
+
+THEME=mahout # mahout-retro, mahout, mahout2, mahout3
+
+# Checkout master and update to latest code
+rm -rf $TMP_WEB_DIR/*
+mkdir -p $TMP_WEB_DIR
+cd $MHT_GIT_DIR
+# git checkout website
+# git fetch apache
+# git reset --hard apache/master
+#
+
+# Build static content
+cd ${MHT_GIT_DIR}/website/front
+rake theme:switch name="$THEME"
+JEKYLL_ENV=production bundle exec jekyll build
+cp -R ${MHT_GIT_DIR}/website/front/_site/* $TMP_WEB_DIR
+
+
+# # Build version specific content
+mkdir -p ${TMP_WEB_DIR}/${BASEDOCURL}
+rm -rf ${TMP_WEB_DIR}/${BASEDOCURL}/*
+cd ${MHT_GIT_DIR}/website/docs
+rake theme:switch name="$THEME"
+JEKYLL_ENV=production bundle exec jekyll build
+cp -R ${MHT_GIT_DIR}/website/docs/_site/* ${TMP_WEB_DIR}/${BASEDOCURL}/
+#cp -R ${MHT_GIT_DIR}/website/docs/_site/* ${TMP_WEB_DIR}/0.13.0/
+
+echo "-------------------------------------------------------"
+echo To test website open a new with browser window at localhost:4000
+echo "Start Jekyll server in a terminal window..."
+echo cd $TMP_WEB_DIR
+echo jekyll serve
+echo "-------------------------------------------------------"
http://git-wip-us.apache.org/repos/asf/mahout/blob/129f1b35/website/build_oldsite.sh
----------------------------------------------------------------------
diff --git a/website/build_oldsite.sh b/website/build_oldsite.sh
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mahout/blob/129f1b35/website/oldsite/_layouts/default.html
----------------------------------------------------------------------
diff --git a/website/oldsite/_layouts/default.html b/website/oldsite/_layouts/default.html
index ec60279..fb9c05d 100644
--- a/website/oldsite/_layouts/default.html
+++ b/website/oldsite/_layouts/default.html
@@ -1,6 +1,6 @@
---
theme :
- name : mahout3
+ name : mahout-retro
---
{% include JB/setup %}
-{% include themes/mahout3/default.html %}
+{% include themes/mahout-retro/default.html %}
http://git-wip-us.apache.org/repos/asf/mahout/blob/129f1b35/website/oldsite/_layouts/page.html
----------------------------------------------------------------------
diff --git a/website/oldsite/_layouts/page.html b/website/oldsite/_layouts/page.html
index 0e123f9..fafefd2 100644
--- a/website/oldsite/_layouts/page.html
+++ b/website/oldsite/_layouts/page.html
@@ -1,7 +1,7 @@
---
theme :
- name : mahout3
+ name : mahout-retro
layout: default
---
{% include JB/setup %}
-{% include themes/mahout3/page.html %}
+{% include themes/mahout-retro/page.html %}
http://git-wip-us.apache.org/repos/asf/mahout/blob/129f1b35/website/oldsite/_layouts/post.html
----------------------------------------------------------------------
diff --git a/website/oldsite/_layouts/post.html b/website/oldsite/_layouts/post.html
index 9b8f584..44dc541 100644
--- a/website/oldsite/_layouts/post.html
+++ b/website/oldsite/_layouts/post.html
@@ -1,7 +1,7 @@
---
theme :
- name : mahout3
+ name : mahout-retro
layout: default
---
{% include JB/setup %}
-{% include themes/mahout3/post.html %}
+{% include themes/mahout-retro/post.html %}