From: Daniel Dunbar Date: Wed, 2 May 2012 22:46:36 +0000 (+0000) Subject: [docs] Include the Kaleidescope tutorial in the Sphinx docs build. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f2c696f01620024a46f995be766b240497fae41f;p=oota-llvm.git [docs] Include the Kaleidescope tutorial in the Sphinx docs build. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@156032 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/docs/Makefile b/docs/Makefile index f4fb4c52ef0..51bfab648e8 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -8,7 +8,7 @@ ##===----------------------------------------------------------------------===## LEVEL := .. -DIRS := CommandGuide tutorial +DIRS := CommandGuide ifdef BUILD_FOR_WEBSITE PROJ_OBJ_DIR = . diff --git a/docs/conf.py b/docs/conf.py index df713558ca9..5a39b69de18 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -138,10 +138,14 @@ html_sidebars = {'index': 'indexsidebar.html'} # We load all the old-school HTML documentation pages into Sphinx here. basedir = os.path.dirname(__file__) html_additional_pages = {} -for file in os.listdir(basedir): - if file.endswith('.html'): - name,_ = os.path.splitext(file) - html_additional_pages[name] = file +for directory in ('', 'tutorial'): + for file in os.listdir(os.path.join(basedir, directory)): + if not file.endswith('.html'): + continue + + subpath = os.path.join(directory, file) + name,_ = os.path.splitext(subpath) + html_additional_pages[name] = subpath # If false, no module index is generated. #html_domain_indices = True diff --git a/docs/tutorial/LangImpl1.html b/docs/tutorial/LangImpl1.html index 2e1746f1a66..a65646f2866 100644 --- a/docs/tutorial/LangImpl1.html +++ b/docs/tutorial/LangImpl1.html @@ -6,7 +6,7 @@ Kaleidoscope: Tutorial Introduction and the Lexer - + diff --git a/docs/tutorial/LangImpl2.html b/docs/tutorial/LangImpl2.html index 60e4f7f5e4e..292dd4e516c 100644 --- a/docs/tutorial/LangImpl2.html +++ b/docs/tutorial/LangImpl2.html @@ -6,7 +6,7 @@ Kaleidoscope: Implementing a Parser and AST - + diff --git a/docs/tutorial/LangImpl3.html b/docs/tutorial/LangImpl3.html index 22ef26c2bd1..4e9ac3ad5ff 100644 --- a/docs/tutorial/LangImpl3.html +++ b/docs/tutorial/LangImpl3.html @@ -6,7 +6,7 @@ Kaleidoscope: Implementing code generation to LLVM IR - + diff --git a/docs/tutorial/LangImpl4.html b/docs/tutorial/LangImpl4.html index d2cac627e79..8c5c31e7626 100644 --- a/docs/tutorial/LangImpl4.html +++ b/docs/tutorial/LangImpl4.html @@ -6,7 +6,7 @@ Kaleidoscope: Adding JIT and Optimizer Support - + diff --git a/docs/tutorial/LangImpl5.html b/docs/tutorial/LangImpl5.html index a42636fe593..0bb7e4f711f 100644 --- a/docs/tutorial/LangImpl5.html +++ b/docs/tutorial/LangImpl5.html @@ -6,7 +6,7 @@ Kaleidoscope: Extending the Language: Control Flow - + diff --git a/docs/tutorial/LangImpl6.html b/docs/tutorial/LangImpl6.html index 041af3b89c2..453b576dd37 100644 --- a/docs/tutorial/LangImpl6.html +++ b/docs/tutorial/LangImpl6.html @@ -6,7 +6,7 @@ Kaleidoscope: Extending the Language: User-defined Operators - + diff --git a/docs/tutorial/LangImpl7.html b/docs/tutorial/LangImpl7.html index 29b920c13bc..90bdeee16a8 100644 --- a/docs/tutorial/LangImpl7.html +++ b/docs/tutorial/LangImpl7.html @@ -7,7 +7,7 @@ construction - + diff --git a/docs/tutorial/LangImpl8.html b/docs/tutorial/LangImpl8.html index eed8c03d21c..efd1756f0cd 100644 --- a/docs/tutorial/LangImpl8.html +++ b/docs/tutorial/LangImpl8.html @@ -6,7 +6,7 @@ Kaleidoscope: Conclusion and other useful LLVM tidbits - + diff --git a/docs/tutorial/Makefile b/docs/tutorial/Makefile deleted file mode 100644 index fdf1bb68a72..00000000000 --- a/docs/tutorial/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -##===- docs/tutorial/Makefile ------------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL := ../.. -include $(LEVEL)/Makefile.common - -HTML := $(wildcard $(PROJ_SRC_DIR)/*.html) -PNG := $(wildcard $(PROJ_SRC_DIR)/*.png) -EXTRA_DIST := $(HTML) index.html -HTML_DIR := $(DESTDIR)$(PROJ_docsdir)/html/tutorial - -install-local:: $(HTML) - $(Echo) Installing HTML Tutorial Documentation - $(Verb) $(MKDIR) $(HTML_DIR) - $(Verb) $(DataInstall) $(HTML) $(HTML_DIR) - $(Verb) $(DataInstall) $(PNG) $(HTML_DIR) - $(Verb) $(DataInstall) $(PROJ_SRC_DIR)/index.html $(HTML_DIR) - -uninstall-local:: - $(Echo) Uninstalling Tutorial Documentation - $(Verb) $(RM) -rf $(HTML_DIR) - -printvars:: - $(Echo) "HTML : " '$(HTML)' diff --git a/docs/tutorial/OCamlLangImpl1.html b/docs/tutorial/OCamlLangImpl1.html index aa2bd876004..73fe07bb840 100644 --- a/docs/tutorial/OCamlLangImpl1.html +++ b/docs/tutorial/OCamlLangImpl1.html @@ -7,7 +7,7 @@ - + diff --git a/docs/tutorial/OCamlLangImpl2.html b/docs/tutorial/OCamlLangImpl2.html index 20e006d97c8..dd7e07b4224 100644 --- a/docs/tutorial/OCamlLangImpl2.html +++ b/docs/tutorial/OCamlLangImpl2.html @@ -7,7 +7,7 @@ - + diff --git a/docs/tutorial/OCamlLangImpl3.html b/docs/tutorial/OCamlLangImpl3.html index 49b62bd6c19..a49a0b5d9c6 100644 --- a/docs/tutorial/OCamlLangImpl3.html +++ b/docs/tutorial/OCamlLangImpl3.html @@ -7,7 +7,7 @@ - + diff --git a/docs/tutorial/OCamlLangImpl4.html b/docs/tutorial/OCamlLangImpl4.html index dd31ded57dd..ca427eb0e08 100644 --- a/docs/tutorial/OCamlLangImpl4.html +++ b/docs/tutorial/OCamlLangImpl4.html @@ -7,7 +7,7 @@ - + diff --git a/docs/tutorial/OCamlLangImpl5.html b/docs/tutorial/OCamlLangImpl5.html index d356f126a4c..feeed6a5337 100644 --- a/docs/tutorial/OCamlLangImpl5.html +++ b/docs/tutorial/OCamlLangImpl5.html @@ -7,7 +7,7 @@ - + diff --git a/docs/tutorial/OCamlLangImpl6.html b/docs/tutorial/OCamlLangImpl6.html index 480aab38f3c..0d1d2804e6f 100644 --- a/docs/tutorial/OCamlLangImpl6.html +++ b/docs/tutorial/OCamlLangImpl6.html @@ -7,7 +7,7 @@ - + diff --git a/docs/tutorial/OCamlLangImpl7.html b/docs/tutorial/OCamlLangImpl7.html index 51986b51a11..d106ad0701c 100644 --- a/docs/tutorial/OCamlLangImpl7.html +++ b/docs/tutorial/OCamlLangImpl7.html @@ -8,7 +8,7 @@ - + diff --git a/docs/tutorial/OCamlLangImpl8.html b/docs/tutorial/OCamlLangImpl8.html index eed8c03d21c..efd1756f0cd 100644 --- a/docs/tutorial/OCamlLangImpl8.html +++ b/docs/tutorial/OCamlLangImpl8.html @@ -6,7 +6,7 @@ Kaleidoscope: Conclusion and other useful LLVM tidbits - + diff --git a/docs/tutorial/index.html b/docs/tutorial/index.html index 0a8cae2c2c9..2c11a9a48b3 100644 --- a/docs/tutorial/index.html +++ b/docs/tutorial/index.html @@ -7,7 +7,7 @@ - +