1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 18:50:11 +02:00

Merge branch 'vars' into 'master'

Update documentation to cover COMMIT, VERSION and VERCODE vars

See merge request !50
This commit is contained in:
Daniel Martí 2015-05-10 13:42:07 +00:00
commit bd3303c43d

View File

@ -829,7 +829,9 @@ As for 'prebuild', but runs on the source code BEFORE any other processing
takes place. takes place.
You can use $$SDK$$, $$NDK$$ and $$MVN3$$ to substitute the paths to the You can use $$SDK$$, $$NDK$$ and $$MVN3$$ to substitute the paths to the
android SDK and NDK directories, and maven 3 executable respectively. android SDK and NDK directories, and maven 3 executable respectively. The
following per-build variables are available likewise: $$VERSION$$,
$$VERCODE$$ and $$COMMIT$$.
@item oldsdkloc=yes @item oldsdkloc=yes
The sdk location in the repo is in an old format, or the build.xml is The sdk location in the repo is in an old format, or the build.xml is
@ -943,7 +945,9 @@ the @code{srclib} directory for details of this.
You can use $$SDK$$, $$NDK$$ and $$MVN3$$ to substitute the paths to the You can use $$SDK$$, $$NDK$$ and $$MVN3$$ to substitute the paths to the
android SDK and NDK directories, and Maven 3 executable respectively e.g. android SDK and NDK directories, and Maven 3 executable respectively e.g.
for when you need to run @code{android update project} explicitly. for when you need to run @code{android update project} explicitly. The
following per-build variables are available likewise: $$VERSION$$, $$VERCODE$$
and $$COMMIT$$.
@item scanignore=<path1>[,<path2>,...] @item scanignore=<path1>[,<path2>,...]
Enables one or more files/paths to be excluded from the scan process. Enables one or more files/paths to be excluded from the scan process.
@ -967,7 +971,9 @@ mvn or gradle will be executed to clean the build environment right before
build= (or the final build) is run. build= (or the final build) is run.
You can use $$SDK$$, $$NDK$$ and $$MVN3$$ to substitute the paths to the You can use $$SDK$$, $$NDK$$ and $$MVN3$$ to substitute the paths to the
android SDK and NDK directories, and Maven 3 executable respectively. android SDK and NDK directories, and maven 3 executable respectively. The
following per-build variables are available likewise: $$VERSION$$,
$$VERCODE$$ and $$COMMIT$$.
@item buildjni=[yes|no|<dir list>] @item buildjni=[yes|no|<dir list>]
Enables building of native code via the ndk-build script before doing Enables building of native code via the ndk-build script before doing