aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2017-05-19 14:50:38 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2017-05-19 17:01:43 +0100
commit5c7f9797c3e883ab771f4ee776eacf2a6395f5f6 (patch)
tree78a548da38e2a4bcc34f53fd04435def89587c7c
parent5ec6151e56140a19ef185052ffb02bd1ff957bd7 (diff)
downloadmeson-5c7f9797c3e883ab771f4ee776eacf2a6395f5f6.zip
meson-5c7f9797c3e883ab771f4ee776eacf2a6395f5f6.tar.gz
meson-5c7f9797c3e883ab771f4ee776eacf2a6395f5f6.tar.bz2
docs: Move "build target object" from "build-in objects" to "returned objects"
Also move "run result" object so objects are sorted alphabetically
-rw-r--r--docs/markdown/Reference-manual.md35
1 files changed, 17 insertions, 18 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index 62c0fb3..fd0eadd 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -737,18 +737,6 @@ When all compilation is 'native', all the methods return the same values as `bui
Note that while cross-compiling, it simply returns the values defined in the cross-info file. If `target_machine` values are not defined in the cross-info file, `host_machine` values are returned instead.
-### `build target` object
-
-A build target is either an [executable](#executable), [shared](#shared_library) or [static library](#static_library).
-
-- `extract_objects()` returns an opaque value representing the generated object files of arguments, usually used to take single object files and link them to unit tests or to compile some source files with custom flags. To use the object file(s) in another build target, use the `objects:` keyword argument.
-
-- `extract_all_objects()` is same as above but returns all object files generated by this target
-
-- `private_dir_include()` returns a opaque value that works like `include_directories` but points to the private directory of this target, usually only needed if an another target needs to access some generated internal headers of this target
-
-- `full_path()` returns a full path pointing to the result target file
-
### `compiler` object
This object is returned by [`meson.get_compiler(lang)`](#meson-object). It represents a compiler for a given language and allows you to query its properties. It has the following methods:
@@ -833,14 +821,17 @@ You can also iterate over arrays with the [`foreach` statement](https://github.c
These are objects returned by the [functions listed above](#functions).
-### `run result` object
+### `build target` object
-This object encapsulates the result of trying to compile and run a sample piece of code with [`compiler.run()`](#compiler-object) or [`run_command()`](#run_command). It has the following methods:
+A build target is either an [executable](#executable), [shared](#shared_library) or [static library](#static_library).
-- `compiled()` if true, the compilation succeeded, if false it did not and the other methods return unspecified data
-- `returncode()` the return code of executing the compiled binary
-- `stdout()` the standard out produced when the binary was run
-- `stderr()` the standard error produced when the binary was run
+- `extract_objects()` returns an opaque value representing the generated object files of arguments, usually used to take single object files and link them to unit tests or to compile some source files with custom flags. To use the object file(s) in another build target, use the `objects:` keyword argument.
+
+- `extract_all_objects()` is same as above but returns all object files generated by this target
+
+- `private_dir_include()` returns a opaque value that works like `include_directories` but points to the private directory of this target, usually only needed if an another target needs to access some generated internal headers of this target
+
+- `full_path()` returns a full path pointing to the result target file
### `configuration` data object
@@ -906,3 +897,11 @@ This object is returned by [`subproject()`](#subproject) and is an opaque object
subproject. This is useful to, for instance, get a [declared
dependency](#declare_dependency) from the subproject.
+### `run result` object
+
+This object encapsulates the result of trying to compile and run a sample piece of code with [`compiler.run()`](#compiler-object) or [`run_command()`](#run_command). It has the following methods:
+
+- `compiled()` if true, the compilation succeeded, if false it did not and the other methods return unspecified data
+- `returncode()` the return code of executing the compiled binary
+- `stdout()` the standard out produced when the binary was run
+- `stderr()` the standard error produced when the binary was run