mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

Browse source
This commit is contained in:
David Black 2012-09-20 14:22:17 +01:00
commit 0b1c9ee570
5 changed files with 79 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
fdroidserver/common.py
View file

@ -426,6 +426,7 @@ def parse_metadata(metafile, **kw):
thisinfo['Disabled'] = None
thisinfo['AntiFeatures'] = None
thisinfo['Update Check Mode'] = 'Market'
thisinfo['Auto Update Mode'] = 'None'
thisinfo['Current Version'] = ''
thisinfo['Current Version Code'] = '0'
thisinfo['Repo Type'] = ''
@ -594,6 +595,7 @@ def write_metadata(dest, app):
mf.write('\n')
if len(app['builds']) > 0:
mf.write('\n')
writefield('Auto Update Mode')
writefield('Update Check Mode')
if len(app['Current Version']) > 0:
writefield('Current Version')
@ -843,10 +845,12 @@ class MetaDataException(Exception):
# Get the specified source library.
# Returns the path to it.
# Returns the path to it. Normally this is the path to be used when referencing
# it, which may be a subdirectory of the actual project. If you want the base
# directory of the project, pass 'basepath=True'.
# TODO: These are currently just hard-coded in this method. It will be a
# metadata-driven system eventually, but not yet.
def getsrclib(spec, extlib_dir, sdk_path):
def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
name, ref = spec.split('@')
if name == 'GreenDroid':
@ -866,6 +870,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p',
libdir]) != 0:
raise BuildException('Error updating ActionBarSherlock project')
if basepath:
return sdir
return libdir
if name == 'Amazing-ListView':
@ -878,6 +884,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p',
libdir]) != 0:
raise BuildException('Error updating Amazing-ListView project')
if basepath:
return sdir
return libdir
if name == 'ViewPagerIndicator':
@ -890,6 +898,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p',
libdir]) != 0:
raise BuildException('Error updating Android-ViewPagerIndicator project')
if basepath:
return sdir
return libdir
if name == 'UITableView':
@ -902,6 +912,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p',
libdir]) != 0:
raise BuildException('Error updating UITableView project')
if basepath:
return sdir
return libdir
if name == 'ViewPagerTabs':
@ -929,6 +941,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p',
libdir]) != 0:
raise BuildException('Error updating ActionBar project')
if basepath:
return sdir
return libdir
if name == 'ActionBarNW':
@ -941,6 +955,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p',
libdir]) != 0:
raise BuildException('Error updating ActionBarNW project')
if basepath:
return sdir
return libdir
if name == 'FacebookSDK':
@ -953,6 +969,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p',
libdir]) != 0:
raise BuildException('Error updating FacebookSDK project')
if basepath:
return sdir
return libdir
if name == 'OI':