mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 23:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

More wiki update stuff

Browse source
This commit is contained in:
Ciaran Gultnieks 2012-08-26 11:58:18 +01:00
parent 452c1861e1
commit 50eff15950
2 changed files with 45 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/common.py
View file

@ -822,7 +822,8 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
raise BuildException("Error running init command")
# Generate (or update) the ant build file, build.xml...
if (build.get('update', '.') != 'no' and
updatemode = build.get('update', '.')
if (updatemode != 'no' and
not build.has_key('maven')):
parms = [os.path.join(sdk_path, 'tools', 'android'),
'update', 'project', '-p', '.']
@ -830,10 +831,11 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
if build.has_key('target'):
parms.append('-t')
parms.append(build['target'])
update_dirs = build.get('update', '.').split(';')
update_dirs = updatemode.split(';')
# Force build.xml update if necessary...
if build.get('update', '.') == 'force' or build.has_key('target'):
update_dirs = ['.']
if updatemode == 'force' or build.has_key('target'):
if updatemode == 'force':
update_dirs = ['.']
buildxml = os.path.join(root_dir, 'build.xml')
if os.path.exists(buildxml):
print 'Force-removing old build.xml'