separate sphinx build tree between languages (fixes #31)

jubatus · Feb 14, 2013 · dab2fba · dab2fba
1 parent 6721c55
commit dab2fba
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 25 deletions.
diff --git a/OMakefile b/OMakefile
@@ -16,12 +16,14 @@ SPHINXBUILD   = sphinx-build
 paper         =
 builddir      = build
 srcdir        = source
+supplementdir = supplement
+langs         = en ja
 sources       = $(find $(srcdir) -type=f)
 
 # Internal variables.
 paperopt_a4     = -D latex_paper_size=a4
 paperopt_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(builddir)/doctrees $(sphinxopts) $(srcdir) # $(paperopt_$(paper)) $(sphinxopts) .
+ALLSPHINXOPTS   = $(sphinxopts) # $(paperopt_$(paper)) $(sphinxopts) .
 
 .PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest singlehtml
 
@@ -54,8 +56,13 @@ clean:
 	-rm -rf $(builddir)/*
 
 DepBuild(target, message) =
-	$(target): $(sources) $(srcdir)/conf.py # $(SPHINXBUILD)
-		$(SPHINXBUILD) -b $(target) $(ALLSPHINXOPTS) $(builddir)/$(target)
+	$(target): $(sources) # $(SPHINXBUILD)
+		foreach(lang, $(langs)):
+			$(SPHINXBUILD) -b $(target) $(ALLSPHINXOPTS) \
+				-d $(builddir)/doctrees/$(lang) \
+				$(srcdir)/$(lang) \
+				$(builddir)/$(target)/$(lang)
+		/bin/cp -rf $(supplementdir)/* $(builddir)
 		eprintln( $(message) )
 
 # # In fact I'd like to write like following:

diff --git a/source/_static/tanakh/presen.html b/source/_static/tanakh/presen.html
@@ -1,4 +1,4 @@
-<html><head><title>pficommonと<br>MessagePack-RPC</title><meta charset="utf-8" /><script src="http://html5slides.googlecode.com/svn/trunk/slides.js"></script><link rel="stylesheet" href="syntax.css" /><link rel="stylesheet" href="style.css" /></head><body style="display: none"><section class="slides layout-regular template-pfi"><article><h1>pficommonと<br>MessagePack-RPC</h1><p>田中英行&nbsp;<a href="mailto:tanakh@preferred.jp" alt="">tanakh@preferred.jp</a><br />2011/11/07</p></article><article><h3>自己紹介</h3><ul><li>田中英行&nbsp;(@tanakh)</li><li>(株)Preferred&nbsp;Infrastracture&nbsp;研究開発部門</li><li>ライブラリやサーバ作成など</li><li>Jubatusのサーバ部分</li></ul><p><br>&nbsp;<img src="http://jubat.us/_static/title.png" alt="" class="centered" /></p></article><article><h3>本日の概要</h3><ul><li>Jubatusとともにひっそりと公開したC++ライブラリ&nbsp;<em>pficommon</em>&nbsp;のご紹介</li><li><em>MessagePack-RPC</em>&nbsp;についても少し</li></ul></article><article><h2>C++ライブラリ&nbsp;pficommon</h2></article><article><h3>pficommonとは？</h3><ul><li>C++用汎用ライブラリ</li><li><a href="http://github.com/pfi/pficommon.git" alt="">http://github.com/pfi/pficommon.git</a></li><li>マルチスレッドサーバとネットワークプログラミングをやりやすく</li><li>モダンなC++コードを書きやすく</li><li><a href="http://preferred.jp/sedue.html" alt="">Sedue</a>で利用</li></ul><p><img src="http://jp.ebase-solutions.com/image/img-Sedue.png" alt="" class="centered" /></p></article><article><h3>開発コンセプト</h3><ul><li>小さくインストールしやすい<ul><li>⇒&nbsp;Boostはインストールするのが大変</li></ul></li><li>古いコンパイラ(g++-3.x.y)でも通る<ul><li>⇒&nbsp;CentOSなどのサポート</li></ul></li><li>C++0x&nbsp;(C++11)&nbsp;への移行のつなぎ</li></ul></article><article><h3>ライブラリ構成</h3><ul><li>pfi::lang<ul><li>Boost/tr1/C++11-std&nbsp;の再実装</li></ul></li><li>pfi::concurrent<ul><li>並行プログラミングのサポート</li></ul></li><li>pfi::network<ul><li>ネットワークプログラミングのサポート</li></ul></li><li>pfi::text<ul><li>テキスト処理・各種フォーマットのパーザ</li></ul></li><li>pfi::data<ul><li>各種データ構造・アルゴリズム</li></ul></li><li>pfi::database<ul><li>データベースサポート</li></ul></li></ul></article><article><h3>pfi::lang</h3><ul><li><p>モダンなC++コードを書くためのライブラリ</p></li><li>shared_ptr&nbsp;/&nbsp;scoped_ptr</li><li>function</li><li>bind</li><li>noncopyable</li><li><p>etc...</p></li></ul></article><article><h3>pfi::concurrent</h3><ul><li><p>並行プログラミングのためのライブラリ</p></li><li>thread</li><li>(recursive)&nbsp;mutex&nbsp;/&nbsp;read-write&nbsp;mutex&nbsp;/&nbsp;scoped&nbsp;locker</li><li>conditional&nbsp;variable</li><li>同期変数&nbsp;/&nbsp;同期キュー</li><li>タスクキュー</li><li>threading&nbsp;model</li><li><p>メモリバリア</p></li></ul></article><article><h3>例</h3><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html><head><title>pficommonと<br>MessagePack-RPC</title><meta charset="utf-8" /><script src="http://html5slides.googlecode.com/svn/trunk/slides.js"></script><link rel="stylesheet" href="syntax.css" /><link rel="stylesheet" href="style.css" /></head><body style="display: none"><section class="slides layout-regular template-pfi"><article><h1>pficommonと<br>MessagePack-RPC</h1><p>田中英行&nbsp;<a href="mailto:tanakh@preferred.jp" alt="">tanakh@preferred.jp</a><br />2011/11/07</p></article><article><h3>自己紹介</h3><ul><li>田中英行&nbsp;(@tanakh)</li><li>(株)Preferred&nbsp;Infrastracture&nbsp;研究開発部門</li><li>ライブラリやサーバ作成など</li><li>Jubatusのサーバ部分</li></ul><p><br>&nbsp;<img src="http://jubat.us/en/_static/title.png" alt="" class="centered" /></p></article><article><h3>本日の概要</h3><ul><li>Jubatusとともにひっそりと公開したC++ライブラリ&nbsp;<em>pficommon</em>&nbsp;のご紹介</li><li><em>MessagePack-RPC</em>&nbsp;についても少し</li></ul></article><article><h2>C++ライブラリ&nbsp;pficommon</h2></article><article><h3>pficommonとは？</h3><ul><li>C++用汎用ライブラリ</li><li><a href="http://github.com/pfi/pficommon.git" alt="">http://github.com/pfi/pficommon.git</a></li><li>マルチスレッドサーバとネットワークプログラミングをやりやすく</li><li>モダンなC++コードを書きやすく</li><li><a href="http://preferred.jp/sedue.html" alt="">Sedue</a>で利用</li></ul><p><img src="http://jp.ebase-solutions.com/image/img-Sedue.png" alt="" class="centered" /></p></article><article><h3>開発コンセプト</h3><ul><li>小さくインストールしやすい<ul><li>⇒&nbsp;Boostはインストールするのが大変</li></ul></li><li>古いコンパイラ(g++-3.x.y)でも通る<ul><li>⇒&nbsp;CentOSなどのサポート</li></ul></li><li>C++0x&nbsp;(C++11)&nbsp;への移行のつなぎ</li></ul></article><article><h3>ライブラリ構成</h3><ul><li>pfi::lang<ul><li>Boost/tr1/C++11-std&nbsp;の再実装</li></ul></li><li>pfi::concurrent<ul><li>並行プログラミングのサポート</li></ul></li><li>pfi::network<ul><li>ネットワークプログラミングのサポート</li></ul></li><li>pfi::text<ul><li>テキスト処理・各種フォーマットのパーザ</li></ul></li><li>pfi::data<ul><li>各種データ構造・アルゴリズム</li></ul></li><li>pfi::database<ul><li>データベースサポート</li></ul></li></ul></article><article><h3>pfi::lang</h3><ul><li><p>モダンなC++コードを書くためのライブラリ</p></li><li>shared_ptr&nbsp;/&nbsp;scoped_ptr</li><li>function</li><li>bind</li><li>noncopyable</li><li><p>etc...</p></li></ul></article><article><h3>pfi::concurrent</h3><ul><li><p>並行プログラミングのためのライブラリ</p></li><li>thread</li><li>(recursive)&nbsp;mutex&nbsp;/&nbsp;read-write&nbsp;mutex&nbsp;/&nbsp;scoped&nbsp;locker</li><li>conditional&nbsp;variable</li><li>同期変数&nbsp;/&nbsp;同期キュー</li><li>タスクキュー</li><li>threading&nbsp;model</li><li><p>メモリバリア</p></li></ul></article><article><h3>例</h3><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><pre class="noprettyprint sourceCode"
   ><code class="sourceCode cpp"
@@ -608,4 +608,4 @@
   ></html
 >
 <p><img src="http://tctechcrunch.files.wordpress.com/2010/07/github-logo.png?w=260" alt="" class="centered" /></p><div align="center">fork&nbsp;me!</div>
-</article><article><h3></h3><p><br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<strong>ご清聴ありがとうございました</strong></p></article></section></body></html>
+</article><article><h3></h3><p><br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<strong>ご清聴ありがとうございました</strong></p></article></section></body></html>
diff --git a/source/conf.py b/source/conf.py
@@ -27,7 +27,7 @@
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.pngmath'] #, 'rst2pdf.pdfbuilder']
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['../../_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -103,7 +103,7 @@
 #html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = ['../_templates']
+html_theme_path = ['../../_templates']
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -126,7 +126,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ['../_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

diff --git a/source/en/conf.py b/source/en/conf.py
@@ -0,0 +1,2 @@
+execfile("../conf.py")
+language = 'en'
diff --git a/source/index.rst → source/en/index.rst b/source/index.rst → source/en/index.rst
@@ -7,35 +7,31 @@ Jubatus is a distributed processing framework and streaming machine learning lib
 - Feature Vector Converter (fv_converter): Data Preprocess and Feature Extraction
 - Framework for Distributed Online Machine Learning with Fault Tolerance
 
-See :doc:`ja/index_ja` for Japanese documentation.
+`Japanese documentation <../ja/>`_ is also available.
 
 Get Jubatus
 -----------
 
 The latest version of Jubatus is |release|. Jubatus is distributed under LGPL v2.1.
 
 * Download Source: `TAR <https://github.com/jubatus/jubatus/tarball/master>`_ / `ZIP <https://github.com/jubatus/jubatus/zipball/master>`_ / `Git <https://github.com/jubatus/jubatus.git>`_
-* Binary Packages: see :doc:`en/quickstart`
+* Binary Packages: see :doc:`quickstart`
 
 Table of Contents
 -----------------
 
 .. toctree::
    :maxdepth: 3
 
-   en/quickstart
-   en/overview
-   en/tutorial
-   en/tutorial_distributed
-   en/documentation
-   en/references
-   en/howtocontribute
-   en/misc
+   quickstart
+   overview
+   tutorial
+   tutorial_distributed
+   documentation
+   references
+   howtocontribute
+   misc
 
-.. toctree::
-   :hidden:
-
-   ja/index_ja
 
 Other Resources
 ===============

diff --git a/source/en/misc.rst b/source/en/misc.rst
@@ -11,7 +11,7 @@ Publications
  - `"How Jubatus works in Distributed environment" <http://www.slideshare.net/JubatusOfficial/jubatus-workshop>`_ by Kota UENISHI
  - "Jubatus' application and handson" by Satoshi ODA
  - "Estimating nergy consumption using Jubatus" by Shinta NAKAYAMA
- - `"pficommon and MessagePack-RPC" <../_static/tanakh/presen.html>`_ by Hideyuki TANAKA
+ - `"pficommon and MessagePack-RPC" <_static/tanakh/presen.html>`_ by Hideyuki TANAKA
 
 - 岡野原，他 "大規模分散リアルタイム学習支える技術と今後の展望"， WebDB forum 2011, Tokyo.
 

diff --git a/source/ja/conf.py b/source/ja/conf.py
@@ -0,0 +1,2 @@
+execfile("../conf.py")
+language = 'ja'
diff --git a/source/ja/index_ja.rst → source/ja/index.rst b/source/ja/index_ja.rst → source/ja/index.rst
@@ -7,7 +7,7 @@ Jubatus は以下の特徴を持ったオンライン機械学習向け分散処
 - 特徴ベクトル変換器 (fv_converter): データの前処理と特徴抽出
 - フォルトトレラントな分散機械学習のためのフレームワーク
 
-See :doc:`../index` for English documentation.
+`English documentation <../en/>`_ is also available.
 
 Get Jubatus
 -----------

diff --git a/source/ja/misc.rst b/source/ja/misc.rst
@@ -11,7 +11,7 @@ Publications
  - `"How Jubatus works in Distributed environment" <http://www.slideshare.net/JubatusOfficial/jubatus-workshop>`_ by Kota UENISHI
  - "Jubatus' application and handson" by Satoshi ODA
  - "Estimating nergy consumption using Jubatus" by Shinta NAKAYAMA
- - `"pficommon and MessagePack-RPC" <../_static/tanakh/presen.html>`_ by Hideyuki TANAKA
+ - `"pficommon and MessagePack-RPC" <_static/tanakh/presen.html>`_ by Hideyuki TANAKA
 
 - 岡野原，他 "大規模分散リアルタイム学習支える技術と今後の展望"， WebDB forum 2011, Tokyo.
 

diff --git a/supplement/html/index.html b/supplement/html/index.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Jubatus</title>
+    <meta http-equiv="refresh" content="0;url=en/">
+  </head>
+</html>
diff --git a/supplement/html/ja/index_ja.html b/supplement/html/ja/index_ja.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Jubatus</title>
+    <meta http-equiv="refresh" content="0;url=./">
+  </head>
+</html>