Skip to content

Commit 17a0335

Browse files
committed
move various doc files out of top-level directory
1 parent 2ec1b42 commit 17a0335

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

.gitignore

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ TAGS
55
/ninja
66
/ninja_test
77
/graph.png
8-
/README.html
9-
/manual.html
10-
/doxygen
8+
/doc/manual.html
9+
/doc/doxygen

configure.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ def src(filename):
5656
return os.path.join('src', filename)
5757
def built(filename):
5858
return os.path.join('$builddir', filename)
59+
def doc(filename):
60+
return os.path.join('doc', filename)
5961
def cxx(name, **kwargs):
6062
return n.build(built(name + '.o'), 'cxx', src(name + '.cc'), **kwargs)
6163

@@ -160,26 +162,26 @@ def cxx(name, **kwargs):
160162

161163
n.comment('Generate the manual using asciidoc.')
162164
n.rule('asciidoc',
163-
command='asciidoc -a toc $in',
165+
command='asciidoc -a toc $in -o $out',
164166
description='ASCIIDOC $in')
165-
n.build('manual.html', 'asciidoc', 'manual.asciidoc')
167+
manual = n.build(doc('manual.html'), 'asciidoc', doc('manual.asciidoc'))
166168
n.build('manual', 'phony',
167-
order_only='manual.html')
169+
order_only=manual)
168170
n.newline()
169171

170172
n.comment('Generate Doxygen.')
171173
n.rule('doxygen',
172174
command='doxygen $in',
173175
description='DOXYGEN $in')
174176
n.variable('doxygen_mainpage_generator',
175-
'./gen_doxygen_mainpage.sh')
177+
src('gen_doxygen_mainpage.sh'))
176178
n.rule('doxygen_mainpage',
177179
command='$doxygen_mainpage_generator $in > $out',
178180
description='DOXYGEN_MAINPAGE $out')
179181
mainpage = n.build(built('doxygen_mainpage'), 'doxygen_mainpage',
180182
['README', 'HACKING', 'COPYING'],
181183
implicit=['$doxygen_mainpage_generator'])
182-
n.build('doxygen', 'doxygen', 'doxygen.config',
184+
n.build('doxygen', 'doxygen', doc('doxygen.config'),
183185
implicit=mainpage)
184186
n.newline()
185187

doxygen.config renamed to doc/doxygen.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ PROJECT_NAME = "Ninja"
3030
# If a relative path is entered, it will be relative to the location
3131
# where doxygen was started. If left blank the current directory will be used.
3232

33-
OUTPUT_DIRECTORY = "doxygen/"
33+
OUTPUT_DIRECTORY = "doc/doxygen/"
3434

3535
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
3636
# 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -1054,7 +1054,7 @@ TAGFILES =
10541054
# When a file name is specified after GENERATE_TAGFILE, doxygen will create
10551055
# a tag file that is based on the input files it reads.
10561056

1057-
GENERATE_TAGFILE = doxygen/html/Ninja.TAGFILE
1057+
GENERATE_TAGFILE = doc/doxygen/html/Ninja.TAGFILE
10581058

10591059
# If the ALLEXTERNALS tag is set to YES all external classes will be listed
10601060
# in the class index. If set to NO only the inherited external classes
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)