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

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

Browse source
This commit is contained in:
Ciaran Gultnieks 2012-10-20 21:50:24 +01:00
commit 5c9f3754c6
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
fdroidserver/common.py
View file

@ -1140,14 +1140,7 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
vcs = getvcs('git', vcs = getvcs('git',
'https://github.com/chrisbanes/Android-PullToRefresh.git', sdir, sdk_path) 'https://github.com/chrisbanes/Android-PullToRefresh.git', sdir, sdk_path)
vcs.gotorevision(ref) vcs.gotorevision(ref)
libdir = os.path.join(sdir, 'library') return sdir
if subprocess.call([os.path.join(sdk_path, 'tools', 'android'),
'update', 'project', '-p',
libdir]) != 0:
raise BuildException('Error updating PullToRefresh project')
if basepath:
return sdir
return libdir
if name == 'TessTwo': if name == 'TessTwo':
sdir = os.path.join(extlib_dir, 'TessTwo') sdir = os.path.join(extlib_dir, 'TessTwo')
@ -1177,6 +1170,24 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
vcs.gotorevision(ref) vcs.gotorevision(ref)
return sdir return sdir
if name == 'MobAdMob':
sdir = os.path.join(extlib_dir, 'MobAdMob')
vcs = getvcs('git',
'https://github.com/mar-v-in/MobAdMob.git', sdir, sdk_path)
vcs.gotorevision(ref)
libdir = os.path.join(sdir, 'MobAdMob')
pp = open(os.path.join(libdir, 'project.properties'), 'w')
pp.write('android.library=true\n')
pp.write('target=android-16\n')
pp.close()
if subprocess.call([os.path.join(sdk_path, 'tools', 'android'),
'update', 'project', '-p',
libdir]) != 0:
raise BuildException('Error updating MobAdMob project')
if basepath:
return sdir
return libdir
raise BuildException('Unknown srclib ' + name) raise BuildException('Unknown srclib ' + name)