Skip to content

Commit 2f58418

Browse files
committed
Documentation updates in perparation for 4.0 [ci skip]
* Switch API docs to readthedocs theme * Add links in manpage SEE ALSO to external websites. These are not just live, but also listed out (Linux manpages won't have the hyperlinks) * Links use docbook5 xlink:href instead of deprecated (claimed to be removed, but apparently not) ulink syntax * Comment out manpage Examples section, and leave a pointer to scons-cookbook.readthedocs.io instead * Regenerate everything, mainly to pick up compilation_db stuff. Signed-off-by: Mats Wichmann <[email protected]>
1 parent 07ba471 commit 2f58418

File tree

243 files changed

+377
-273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+377
-273
lines changed

CHANGES.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,12 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
172172
- Close various logfiles (trace, cache, taskmastertrace, configure)
173173
when done using atexit calls.
174174
- Rebase forked copy of shutil.copytree to Python 3.7 stlib version.
175-
175+
- Significant rework of documentation: API docs are now generated
176+
using Sphinx; manpage and user guide now use more "standard"
177+
markup elements (which could facilitate later conversion to a
178+
different doc format, should that choice be made); significant
179+
rewordings in manpage. Manpage Examples moved to an external
180+
repository / website (scons-cookbook.readthedocs.io).
176181

177182

178183
RELEASE 3.1.2 - Mon, 17 Dec 2019 02:06:27 +0000

SCons/Tool/compilation_db.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ env.CompilationDatabase('my_output.json')
6767
files will not show up in your output file.
6868
</para>
6969
<para>
70-
New in &SCons; 4.0.0
70+
<emphasis>Available since &scons; 4.0.</emphasis>
7171
</para>
7272
</summary>
7373
</builder>

bin/scons_dev_master.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,8 @@
4747
#'tetex-bin',
4848
#'tetex-latex',
4949

50-
# for ubuntu 9.10
51-
# 'texlive-lang-french'
5250
'python3-sphinx',
53-
'sphinx-rtd-theme-common',
51+
'python3-sphinx-rtd-theme',
5452

5553
]
5654

doc/generated/builders.gen

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,39 @@ for the calling syntax and details.
5050
</para>
5151
</listitem>
5252
</varlistentry>
53+
<varlistentry id="b-CompilationDatabase">
54+
<term><function>CompilationDatabase</function>()</term>
55+
<term><replaceable>env</replaceable>.<methodname>CompilationDatabase</methodname>()</term>
56+
<listitem><para>
57+
The <function>CompilationDatabase</function> builder writes a JSON formatted compilation
58+
database according to the
59+
<ulink url="https://clang.llvm.org/docs/JSONCompilationDatabase.html">LLVM specification
60+
</ulink> which is consumed by a number of clang tools, editors, and other tools.
61+
</para>
62+
<para>
63+
If you don't specify any files, the builder will default to <filename>compile_commands.json</filename>.
64+
</para>
65+
<para>
66+
If you specify a single file as below
67+
<programlisting language="python">
68+
env.CompilationDatabase('my_output.json')
69+
</programlisting>
70+
SCons will automatically use that as the target file.
71+
If you specify more than one source, the source list will be ignored.
72+
</para>
73+
<para>
74+
You should not specify source files. The <function>CompilationDatabase</function> builder instruments SCons to collect them from all
75+
the C, C++, assembly source/target pairs.
76+
</para>
77+
<para>
78+
NOTE: You must load the <literal>compilation_db</literal> tool prior to specifying any part of your build or some source/target
79+
files will not show up in your output file.
80+
</para>
81+
<para>
82+
<emphasis>Available since <command>scons</command> 4.0.</emphasis>
83+
</para>
84+
</listitem>
85+
</varlistentry>
5386
<varlistentry id="b-CXXFile">
5487
<term><function>CXXFile</function>()</term>
5588
<term><replaceable>env</replaceable>.<methodname>CXXFile</methodname>()</term>

doc/generated/builders.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
1010

1111
<!ENTITY b-CFile "<function xmlns='http://www.scons.org/dbxsd/v1.0'>CFile</function>">
1212
<!ENTITY b-Command "<function xmlns='http://www.scons.org/dbxsd/v1.0'>Command</function>">
13+
<!ENTITY b-CompilationDatabase "<function xmlns='http://www.scons.org/dbxsd/v1.0'>CompilationDatabase</function>">
1314
<!ENTITY b-CXXFile "<function xmlns='http://www.scons.org/dbxsd/v1.0'>CXXFile</function>">
1415
<!ENTITY b-DocbookEpub "<function xmlns='http://www.scons.org/dbxsd/v1.0'>DocbookEpub</function>">
1516
<!ENTITY b-DocbookHtml "<function xmlns='http://www.scons.org/dbxsd/v1.0'>DocbookHtml</function>">
@@ -66,6 +67,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
6667

6768
<!ENTITY b-env-CFile "<function xmlns='http://www.scons.org/dbxsd/v1.0'>env.CFile</function>">
6869
<!ENTITY b-env-Command "<function xmlns='http://www.scons.org/dbxsd/v1.0'>env.Command</function>">
70+
<!ENTITY b-env-CompilationDatabase "<function xmlns='http://www.scons.org/dbxsd/v1.0'>env.CompilationDatabase</function>">
6971
<!ENTITY b-env-CXXFile "<function xmlns='http://www.scons.org/dbxsd/v1.0'>env.CXXFile</function>">
7072
<!ENTITY b-env-DocbookEpub "<function xmlns='http://www.scons.org/dbxsd/v1.0'>env.DocbookEpub</function>">
7173
<!ENTITY b-env-DocbookHtml "<function xmlns='http://www.scons.org/dbxsd/v1.0'>env.DocbookHtml</function>">
@@ -128,6 +130,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
128130

129131
<!ENTITY b-link-CFile "<link linkend='b-CFile' xmlns='http://www.scons.org/dbxsd/v1.0'><function>CFile</function></link>">
130132
<!ENTITY b-link-Command "<link linkend='b-Command' xmlns='http://www.scons.org/dbxsd/v1.0'><function>Command</function></link>">
133+
<!ENTITY b-link-CompilationDatabase "<link linkend='b-CompilationDatabase' xmlns='http://www.scons.org/dbxsd/v1.0'><function>CompilationDatabase</function></link>">
131134
<!ENTITY b-link-CXXFile "<link linkend='b-CXXFile' xmlns='http://www.scons.org/dbxsd/v1.0'><function>CXXFile</function></link>">
132135
<!ENTITY b-link-DocbookEpub "<link linkend='b-DocbookEpub' xmlns='http://www.scons.org/dbxsd/v1.0'><function>DocbookEpub</function></link>">
133136
<!ENTITY b-link-DocbookHtml "<link linkend='b-DocbookHtml' xmlns='http://www.scons.org/dbxsd/v1.0'><function>DocbookHtml</function></link>">
@@ -184,6 +187,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
184187

185188
<!ENTITY b-link-env-CFile "<link linkend='b-CFile' xmlns='http://www.scons.org/dbxsd/v1.0'><function>env.CFile</function></link>">
186189
<!ENTITY b-link-env-Command "<link linkend='b-Command' xmlns='http://www.scons.org/dbxsd/v1.0'><function>env.Command</function></link>">
190+
<!ENTITY b-link-env-CompilationDatabase "<link linkend='b-CompilationDatabase' xmlns='http://www.scons.org/dbxsd/v1.0'><function>env.CompilationDatabase</function></link>">
187191
<!ENTITY b-link-env-CXXFile "<link linkend='b-CXXFile' xmlns='http://www.scons.org/dbxsd/v1.0'><function>env.CXXFile</function></link>">
188192
<!ENTITY b-link-env-DocbookEpub "<link linkend='b-DocbookEpub' xmlns='http://www.scons.org/dbxsd/v1.0'><function>env.DocbookEpub</function></link>">
189193
<!ENTITY b-link-env-DocbookHtml "<link linkend='b-DocbookHtml' xmlns='http://www.scons.org/dbxsd/v1.0'><function>env.DocbookHtml</function></link>">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=navy foo.o</userinput>
1+
<screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=navy foo.o</userinput>
22
cc -o foo.o -c -DCOLOR="blue" foo.c
33
</screen>

doc/generated/examples/addmethod_ex1_1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q /</userinput>
1+
<screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q /</userinput>
22
cc -o hello.o -c hello.c
33
cc -o hello hello.o
44
Install file: "hello" as "/usr/bin/hello"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
1+
<screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
22
cc -o test_stuff.o -c test_stuff.c
33
cc -o tests/test_stuff test_stuff.o
44
</screen>

doc/generated/examples/addmethod_ex2_2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
1+
<screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
22
rc /nologo /fores.res res.rc
33
cl /Fotest_stuff.obj /c test_stuff.c /nologo
44
link /nologo /OUT:tests\test_stuff.exe test_stuff.obj res.res

doc/generated/examples/alias_ex1_1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install</userinput>
1+
<screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install</userinput>
22
cc -o hello.o -c hello.c
33
cc -o hello hello.o
44
Install file: "hello" as "/usr/bin/hello"

0 commit comments

Comments
 (0)