mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
Don't update srclibs on their own if using them already
This commit is contained in:
parent
48afe5399a
commit
1e216f7f46
@ -779,7 +779,7 @@ class VCSException(Exception):
|
|||||||
# it, which may be a subdirectory of the actual project. If you want the base
|
# it, which may be a subdirectory of the actual project. If you want the base
|
||||||
# directory of the project, pass 'basepath=True'.
|
# directory of the project, pass 'basepath=True'.
|
||||||
def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None, target=None,
|
def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None, target=None,
|
||||||
basepath=False, raw=False, prepare=True, preponly=False):
|
basepath=False, raw=False, prepare=True, preponly=False, autoupdate=True):
|
||||||
|
|
||||||
number = None
|
number = None
|
||||||
subdir = None
|
subdir = None
|
||||||
@ -848,7 +848,7 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None, target=None,
|
|||||||
raise BuildException("Error running prepare command for srclib %s"
|
raise BuildException("Error running prepare command for srclib %s"
|
||||||
% name, p.stdout)
|
% name, p.stdout)
|
||||||
|
|
||||||
if srclib["Update Project"] == "Yes":
|
if srclib["Update Project"] == "Yes" and autoupdate and not number:
|
||||||
print "Updating srclib %s at path %s" % (name, libdir)
|
print "Updating srclib %s at path %s" % (name, libdir)
|
||||||
cmd = [os.path.join(config['sdk_path'], 'tools', 'android'),
|
cmd = [os.path.join(config['sdk_path'], 'tools', 'android'),
|
||||||
'update', 'project', '-p', libdir]
|
'update', 'project', '-p', libdir]
|
||||||
@ -930,12 +930,13 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
|
|||||||
|
|
||||||
# Get required source libraries...
|
# Get required source libraries...
|
||||||
srclibpaths = []
|
srclibpaths = []
|
||||||
|
updatemode = build.get('update', 'auto')
|
||||||
if 'srclibs' in build:
|
if 'srclibs' in build:
|
||||||
target=build['target'] if 'target' in build else None
|
target=build['target'] if 'target' in build else None
|
||||||
print "Collecting source libraries..."
|
print "Collecting source libraries..."
|
||||||
for lib in build['srclibs'].split(';'):
|
for lib in build['srclibs'].split(';'):
|
||||||
srclibpaths.append(getsrclib(lib, srclib_dir, srclibpaths,
|
srclibpaths.append(getsrclib(lib, srclib_dir, srclibpaths,
|
||||||
target=target, preponly=onserver))
|
target=target, preponly=onserver, autoupdate=(updatemode=='auto')))
|
||||||
|
|
||||||
for name, number, libpath in srclibpaths:
|
for name, number, libpath in srclibpaths:
|
||||||
place_srclib(root_dir, int(number) if number else None, libpath)
|
place_srclib(root_dir, int(number) if number else None, libpath)
|
||||||
@ -947,7 +948,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
|
|||||||
|
|
||||||
|
|
||||||
# Generate (or update) the ant build file, build.xml...
|
# Generate (or update) the ant build file, build.xml...
|
||||||
updatemode = build.get('update', 'auto')
|
|
||||||
if (updatemode != 'no' and build['type'] == 'ant'):
|
if (updatemode != 'no' and build['type'] == 'ant'):
|
||||||
parms = [os.path.join(config['sdk_path'], 'tools', 'android'),
|
parms = [os.path.join(config['sdk_path'], 'tools', 'android'),
|
||||||
'update', 'project']
|
'update', 'project']
|
||||||
|
Loading…
Reference in New Issue
Block a user