kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 10:40:12 +02:00
Code Activity

Merge commit 'refs/merge-requests/66' of git://gitorious.org/f-droid/fdroidserver into merge-requests/66

Browse Source
This commit is contained in:
Ciaran Gultnieks 2012-02-18 12:29:31 +00:00
commit 30e6ec1d77
5 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README
View File

@ -160,10 +160,13 @@ configuration to the build. These are:
AndroidManifest.xml. AndroidManifest.xml.
antcommand=xxx - Specify an alternate ant command (target) instead of the antcommand=xxx - Specify an alternate ant command (target) instead of the
default 'release'. default 'release'.
insertversion=x - If specified, the pattern 'x' in the AndroidManifest.xml is forceversion=yes - If specified, the package version in AndroidManifest.xml is
replaced with the version number for the build. replaced with the version number for the build as specified
insertvercode=x - If specified, the pattern 'x' in the AndroidManifest.xml is in recipe. Useful for cases when upstream repo missed to
replaced with the version code for the build. update it for specific tag, or to build an arbitrary revision.
forcevercode=yes - If specified, the package vercode in the AndroidManifest.xml is
replaced with the version code for the build. See also
forceversion.
update=no By default, 'android update project' is used to generate or update=no By default, 'android update project' is used to generate or
update the build.xml file. Specifying update=no bypasses update the build.xml file. Specifying update=no bypasses
that. that.

12
common.py
View File

@ -737,14 +737,14 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
f.close() f.close()
# Insert version code and number into the manifest if necessary... # Insert version code and number into the manifest if necessary...
if build.has_key('insertversion'): if build.has_key('forceversion'):
if subprocess.call(['sed','-i','s/' + build['insertversion'] + if subprocess.call(['sed','-r','-i',
'/' + build['version'] +'/g', 's/android:versionName="[^"]+"/android:versionName="' + build['version'] + '"/g',
'AndroidManifest.xml'], cwd=root_dir) !=0: 'AndroidManifest.xml'], cwd=root_dir) !=0:
raise BuildException("Failed to amend manifest") raise BuildException("Failed to amend manifest")
if build.has_key('insertvercode'): if build.has_key('forcevercode'):
if subprocess.call(['sed','-i','s/' + build['insertvercode'] + if subprocess.call(['sed','-r','-i',
'/' + build['vercode'] +'/g', 's/android:versionCode="[^"]+"/android:versionCode="' + build['vercode'] + '"/g',
'AndroidManifest.xml'], cwd=root_dir) !=0: 'AndroidManifest.xml'], cwd=root_dir) !=0:
raise BuildException("Failed to amend manifest") raise BuildException("Failed to amend manifest")

14
fdroid.texi
View File

@ -364,13 +364,15 @@ the directory that contains AndroidManifest.xml.
Specify an alternate ant command (target) instead of the default Specify an alternate ant command (target) instead of the default
'release'. 'release'.
@item insertversion=x @item forceversion=yes
If specified, the pattern 'x' in the AndroidManifest.xml is replaced If specified, the package version in AndroidManifest.xml is replaced
with the version number for the build. with the version number for the build as specified in recipe. Useful
for cases when upstream repo missed to update it for specific tag,
or to build an arbitrary revision.
@item insertvercode=x @item forcevercode=yes
If specified, the pattern 'x' in the AndroidManifest.xml is replaced If specified, the package vercode in the AndroidManifest.xml is replaced
with the version code for the build. with the version code for the build. See also forceversion.
@item update=no @item update=no
By default, 'android update project' is used to generate or update the By default, 'android update project' is used to generate or update the

2
metadata/com.google.android.diskusage.txt
View File

@ -14,7 +14,7 @@ Repo:http://diskusage.googlecode.com/svn/trunk/
Build Version:2.0.4,2004,61,prebuild=mkdir libs && cp extra/system.jar libs/ Build Version:2.0.4,2004,61,prebuild=mkdir libs && cp extra/system.jar libs/
#Note - version name/code is wrong in the repo - we replace it #Note - version name/code is wrong in the repo - we replace it
Build Version:2.0.5,2005,62,prebuild=mkdir libs && cp extra/system.jar libs/,insertversion=2.0.4,insertvercode=2004 Build Version:2.0.5,2005,62,prebuild=mkdir libs && cp extra/system.jar libs/,forceversion=yes,forcevercode=yes
Build Version:2.1.3,2103,65,prebuild=mkdir libs && cp extra/system.jar libs/ Build Version:2.1.3,2103,65,prebuild=mkdir libs && cp extra/system.jar libs/
Build Version:3.0alpha2,3001,!repo version incorrect,prebuild=mkdir libs && cp extra/system.jar libs/ Build Version:3.0alpha2,3001,!repo version incorrect,prebuild=mkdir libs && cp extra/system.jar libs/
Build Version:3.0alpha3,3005,!no source in repo,prebuild=mkdir libs && cp extra/system.jar libs/ Build Version:3.0alpha3,3005,!no source in repo,prebuild=mkdir libs && cp extra/system.jar libs/

4
metadata/org.helllabs.android.xmp.txt
View File

@ -17,10 +17,10 @@ Repo Type:git
Repo:git://xmp.git.sourceforge.net/gitroot/xmp/xmp Repo:git://xmp.git.sourceforge.net/gitroot/xmp/xmp
# This is one of those projects that put the changelog in the version # This is one of those projects that put the changelog in the version
# number, so fix that with insertversion. # number, so fix that with forceversion.
Build Version:2.1.0,15,639549fda2111cb800fabe468b4a64bf4ae27003,\ Build Version:2.1.0,15,639549fda2111cb800fabe468b4a64bf4ae27003,\
buildjni=yes,subdir=src/android/project,target=android-8,\ buildjni=yes,subdir=src/android/project,target=android-8,\
insertversion=2.1.0[^"]* forceversion=yes
Update Check Mode:Market Update Check Mode:Market
Current Version:2.4.0 Current Version:2.4.0