diff options
| author | reduz <reduzio@gmail.com> | 2014-03-12 08:58:00 -0700 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2014-03-12 08:58:00 -0700 |
| commit | 188a892195daec6069b862ca4094de8cac3a2254 (patch) | |
| tree | 51f619e0b90ac5fda853fe8a0b04755422978756 | |
| parent | bb7f586842658d650bab31343f6aab678f653026 (diff) | |
| parent | 141b3135954737ee5be5ad2c7371796d20940719 (diff) | |
Merge pull request #169 from bibby/makedoc
Closes bb-code tags, allowing make_doc.sh to finish
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | doc/base/classes.xml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/make_doc.sh | 18 |
3 files changed, 20 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index dc7b118c79..9cf3ab38b0 100644 --- a/.gitignore +++ b/.gitignore @@ -156,6 +156,9 @@ AutoTest.Net/ # Installshield output folder [Ee]xpress/ +# dumpdoc generated files +doc/html/class_list + # DocProject is a documentation generator add-in DocProject/buildhelp/ DocProject/Help/*.HxT diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 46bc8997ff..25278f2444 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -20966,7 +20966,7 @@ <argument index="0" name="linear_velocity" type="Vector2"> </argument> <description> - Set the body linear velocity. Can be used sporadically, but[b] DONT SET THIS IN EVERY FRAME [b], because physics may be running in another thread and definitely runs at a different granularity. Use [_integrate_forces] as your process loop if you want to have precise control of the body state. + Set the body linear velocity. Can be used sporadically, but[b] DONT SET THIS IN EVERY FRAME [/b], because physics may be running in another thread and definitely runs at a different granularity. Use [_integrate_forces] as your process loop if you want to have precise control of the body state. </description> </method> <method name="get_linear_velocity" qualifiers="const" > @@ -20980,7 +20980,7 @@ <argument index="0" name="angular_velocity" type="real"> </argument> <description> - Set the body angular velocity. Can be used sporadically, but[b] DONT SET THIS IN EVERY FRAME [b], because physics may be running in another thread and definitely runs at a different granularity. Use [_integrate_forces] as your process loop if you want to have precise control of the body state. + Set the body angular velocity. Can be used sporadically, but[b] DONT SET THIS IN EVERY FRAME [/b], because physics may be running in another thread and definitely runs at a different granularity. Use [_integrate_forces] as your process loop if you want to have precise control of the body state. </description> </method> <method name="get_angular_velocity" qualifiers="const" > diff --git a/doc/make_doc.sh b/doc/make_doc.sh index aa9b47cd46..a76f568bfc 100644..100755 --- a/doc/make_doc.sh +++ b/doc/make_doc.sh @@ -1,5 +1,17 @@ #! /bin/bash -cd html/class_list -python ../../../tools/docdump/makehtml.py -multipage ../../base/classes.xml -cd ../.. +here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +godotHome=$(dirname "$here") +docTarget=${here}/html/class_list +toolsRoot=${godotHome}/tools + +throw() { + echo "$@" >&2 + exit 1 +} + +[ -d "$docTarget" ] || mkdir -p "$docTarget" || throw "Could not create doc target $docTarget" + +cd "$docTarget" +python ${toolsRoot}/docdump/makehtml.py -multipage ${here}/base/classes.xml +cd "$here" |