Skip to content

S
swiftshader
Commit 4cba1cbb by Reed Kotler Committed by Jim Stichnoth
Options

Move Doxyfile files to docs and associated makefile. This is a prelude to…

Move Doxyfile files to docs and associated makefile. This is a prelude to allowing a docs directory for all the RST files as well as expanding the makefile to build the docs for those too, not just the doxygen output. The doxygen html has been moved to build/docs/html so it's not in a source directory. Gitignore has been fixed to allow files in docs now without complaining. BUG= R=stichnot@chromium.org Review URL: https://codereview.chromium.org/1562703002 . Patch from Reed Kotler <rkotlerimgtec@gmail.com>.
parent 4acf11ac
Showing with 15 additions and 12 deletions
.gitignore
...@@ -10,5 +10,4 @@ ...@@ -10,5 +10,4 @@
# Ignore specific patterns at the top-level directory # Ignore specific patterns at the top-level directory
/pnacl-sz /pnacl-sz
/build/ /build/
/docs/html/
/crosstest/Output/ /crosstest/Output/
Makefile.standalone
...@@ -510,11 +510,10 @@ bloat: make_symlink ...@@ -510,11 +510,10 @@ bloat: make_symlink
@echo See Subzero size breakdown in bloat/pnacl-sz.bloat.html @echo See Subzero size breakdown in bloat/pnacl-sz.bloat.html
docs: docs:
doxygen Doxyfile make -C docs -f Makefile.standalone
@echo See file://`pwd`/docs/html/index.html
clean: clean:
rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json
clean-all: clean clean-all: clean
rm -rf build/ docs/html rm -rf build/ crosstest/Output/
Doxyfile → docs/Doxyfile
...@@ -58,7 +58,7 @@ PROJECT_LOGO = ...@@ -58,7 +58,7 @@ PROJECT_LOGO =
# entered, it will be relative to the location where doxygen was started. If # entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used. # left blank the current directory will be used.
OUTPUT_DIRECTORY = "docs" OUTPUT_DIRECTORY = "../build/docs"
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and # directories (in 2 levels) under the output directory of each output format and
...@@ -743,13 +743,13 @@ WARN_LOGFILE = ...@@ -743,13 +743,13 @@ WARN_LOGFILE =
# spaces. # spaces.
# Note: If this tag is empty the current directory is searched. # Note: If this tag is empty the current directory is searched.
INPUT = "src" \ INPUT = "../src" \
"../llvm/include/llvm/ADT" \ "../../llvm/include/llvm/ADT" \
"../llvm/include/llvm/Bitcode" \ "../../llvm/include/llvm/Bitcode" \
"../llvm/include/llvm/Config" \ "../../llvm/include/llvm/Config" \
"../llvm/include/llvm/IR" \ "../../llvm/include/llvm/IR" \
"../llvm/include/llvm/IRReader" \ "../../llvm/include/llvm/IRReader" \
"../llvm/include/llvm/Support" "../../llvm/include/llvm/Support"
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
......
docs/Makefile.standalone 0 → 100644
.PHONY: all
all:
doxygen Doxyfile
@echo See file://`pwd`/../build/docs/html/index.html
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment