kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-08 00:10:12 +01:00
Code Activity

Handle split path srclibs properly on buildserver

Browse Source
This commit is contained in:
Ciaran Gultnieks 2012-09-20 14:16:08 +01:00
parent 8983aaf2f9
commit ea8d90040e
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdroidserver/build.py
View File

@ -179,14 +179,16 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path):
if thisbuild.has_key('srclibs'): if thisbuild.has_key('srclibs'):
for lib in thisbuild['srclibs'].split(';'): for lib in thisbuild['srclibs'].split(';'):
name, _ = lib.split('@') name, _ = lib.split('@')
srclibpaths.append((name, common.getsrclib(lib, 'build/extlib', sdk_path))) srclibpaths.append((name, common.getsrclib(lib, 'build/extlib', sdk_path, basepath=True)))
# If one was used for the main source, add that too. # If one was used for the main source, add that too.
basesrclib = vcs.getsrclib() basesrclib = vcs.getsrclib()
if basesrclib: if basesrclib:
srclibpaths.append(basesrclib) srclibpaths.append(basesrclib)
print "Sending srclibs:"
for _, lib in srclibpaths: for _, lib in srclibpaths:
print "Sending srclib '" + lib + "'"
ftp.chdir('/home/vagrant/build/extlib') ftp.chdir('/home/vagrant/build/extlib')
if not os.path.exists(lib):
raise BuildException("Missing srclib directory '" + lib + "'")
send_dir(lib) send_dir(lib)
# Execute the build script... # Execute the build script...

20
fdroidserver/common.py
View File

@ -843,10 +843,12 @@ class MetaDataException(Exception):
# Get the specified source library. # 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 # TODO: These are currently just hard-coded in this method. It will be a
# metadata-driven system eventually, but not yet. # 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('@') name, ref = spec.split('@')
if name == 'GreenDroid': if name == 'GreenDroid':
@ -866,6 +868,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p', 'update', 'project', '-p',
libdir]) != 0: libdir]) != 0:
raise BuildException('Error updating ActionBarSherlock project') raise BuildException('Error updating ActionBarSherlock project')
if basepath:
return sdir
return libdir return libdir
if name == 'Amazing-ListView': if name == 'Amazing-ListView':
@ -878,6 +882,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p', 'update', 'project', '-p',
libdir]) != 0: libdir]) != 0:
raise BuildException('Error updating Amazing-ListView project') raise BuildException('Error updating Amazing-ListView project')
if basepath:
return sdir
return libdir return libdir
if name == 'ViewPagerIndicator': if name == 'ViewPagerIndicator':
@ -890,6 +896,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p', 'update', 'project', '-p',
libdir]) != 0: libdir]) != 0:
raise BuildException('Error updating Android-ViewPagerIndicator project') raise BuildException('Error updating Android-ViewPagerIndicator project')
if basepath:
return sdir
return libdir return libdir
if name == 'UITableView': if name == 'UITableView':
@ -902,6 +910,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p', 'update', 'project', '-p',
libdir]) != 0: libdir]) != 0:
raise BuildException('Error updating UITableView project') raise BuildException('Error updating UITableView project')
if basepath:
return sdir
return libdir return libdir
if name == 'ViewPagerTabs': if name == 'ViewPagerTabs':
@ -929,6 +939,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p', 'update', 'project', '-p',
libdir]) != 0: libdir]) != 0:
raise BuildException('Error updating ActionBar project') raise BuildException('Error updating ActionBar project')
if basepath:
return sdir
return libdir return libdir
if name == 'ActionBarNW': if name == 'ActionBarNW':
@ -941,6 +953,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p', 'update', 'project', '-p',
libdir]) != 0: libdir]) != 0:
raise BuildException('Error updating ActionBarNW project') raise BuildException('Error updating ActionBarNW project')
if basepath:
return sdir
return libdir return libdir
if name == 'FacebookSDK': if name == 'FacebookSDK':
@ -953,6 +967,8 @@ def getsrclib(spec, extlib_dir, sdk_path):
'update', 'project', '-p', 'update', 'project', '-p',
libdir]) != 0: libdir]) != 0:
raise BuildException('Error updating FacebookSDK project') raise BuildException('Error updating FacebookSDK project')
if basepath:
return sdir
return libdir return libdir
if name == 'OI': if name == 'OI':