Various documentation updates

This commit is contained in:
Ciaran Gultnieks 2012-04-08 13:00:57 +01:00
parent 20450eaaaf
commit 4bec91d24c

View file

@ -445,21 +445,31 @@ Common values:
@item @item
@samp{GPLv2} @samp{GPLv2}
GNU GPL version 2
@item @item
@samp{GPLv2+} @samp{GPLv2+}
GNU GPL version 2 or later
@item @item
@samp{GPLv3} @samp{GPLv3}
GNU GPL version 3
@item
@samp{GPLv3}
GNU GPL version 3 or later
@item @item
@samp{Apache2} @samp{Apache2}
Apache 2
@item @item
@samp{MIT} @samp{MIT}
MIT X11 license
@item @item
@samp{BSD} @samp{BSD}
BSD license. Some disambiguation is needed here, regarding original versions modfied versions of this license.
@end itemize @end itemize
@ -540,6 +550,8 @@ values are:
@samp{hg} @samp{hg}
@item @item
@samp{bzr} @samp{bzr}
@item
@samp{srclib}
@end itemize @end itemize
@node Repo @node Repo
@section Repo @section Repo
@ -683,10 +695,19 @@ insert literal commas, or as the last character on a line to join that
line with the next. It has no special meaning in other contexts; in line with the next. It has no special meaning in other contexts; in
particular, literal backslashes should not be escaped. particular, literal backslashes should not be escaped.
You can use $$name$$ to substitute the path to a referenced srclib - see
the @code{srclib} directory for details of this.
You can use $$SDK$$ and $$NDK$$ to substitute the paths to the android
SDK and NDK directories respectively.
@item init=xxxx @item init=xxxx
As for 'prebuild', but runs on the source code BEFORE any other processing As for 'prebuild', but runs on the source code BEFORE any other processing
takes place. takes place.
You can use $$SDK$$ and $$NDK$$ to substitute the paths to the android
SDK and NDK directories respectively.
@item novcheck=yes @item novcheck=yes
Don't check that the version name and code in the resulting apk are Don't check that the version name and code in the resulting apk are
correct by looking at the build output - assume the metadata is correct by looking at the build output - assume the metadata is