1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-13 02:30:11 +01:00

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

This commit is contained in:
Ciaran Gultnieks 2012-09-17 22:06:22 +01:00
commit 897e29c28f

View File

@ -979,7 +979,7 @@ def getsrclib(spec, extlib_dir, sdk_path):
raise BuildException("Maven build failed for BitcoinJWallet srclib")
return sdir
if name == 'Android-Color-Picker':
if name == 'Color-Picker':
sdir = os.path.join(extlib_dir, 'Color-Picker')
vcs = getvcs('git',
'https://github.com/brk3/android-color-picker.git', sdir, sdk_path)
@ -990,6 +990,28 @@ def getsrclib(spec, extlib_dir, sdk_path):
raise BuildException('Error updating Color-Picker project')
return sdir
if name == 'Processing-Multitouch':
sdir = os.path.join(extlib_dir, 'Processing-Multitouch')
vcs = getvcs('git',
'https://github.com/rjmarsan/AndroidProcessingMultitouch.git', sdir, sdk_path)
vcs.gotorevision(ref)
if subprocess.call([os.path.join(sdk_path, 'tools', 'android'),
'update', 'project', '-p',
sdir]) != 0:
raise BuildException('Error updating Multitouch project')
return sdir
if name == 'NewQuickAction3D':
sdir = os.path.join(extlib_dir, 'NewQuickAction3D')
vcs = getvcs('git',
'https://github.com/alt236/NewQuickAction3D.git', sdir, sdk_path)
vcs.gotorevision(ref)
if subprocess.call([os.path.join(sdk_path, 'tools', 'android'),
'update', 'project', '-p',
sdir]) != 0:
raise BuildException('Error updating NewQuickAction3D project')
return sdir
raise BuildException('Unknown srclib ' + name)