mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't use proj.prop if not present (fixes tiltmazes)

Browse source
This commit is contained in:
Daniel Martí 2013-11-04 17:03:43 +01:00
parent a81aebb236
commit a8810b809a
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
fdroidserver/common.py
View file

@ -1117,6 +1117,24 @@ def version_name(original, app_dir, flavour):
return string return string
return original return original
def ant_subprojects(root_dir):
subprojects = []
proppath = os.path.join(root_dir, 'project.properties')
if not os.path.isfile(proppath):
return subprojects
with open(proppath) as f:
for line in f.readlines():
if not line.startswith('android.library.reference.'):
continue
path = line.split('=')[1].strip()
relpath = os.path.join(root_dir, path)
if not os.path.isdir(relpath):
continue
if options.verbose:
print "Found subproject %s..." % path
subprojects.append(path)
return subprojects
# Extract some information from the AndroidManifest.xml at the given path. # Extract some information from the AndroidManifest.xml at the given path.
# Returns (version, vercode, package), any or all of which might be None. # Returns (version, vercode, package), any or all of which might be None.
# All values returned are strings. # All values returned are strings.
@ -1390,18 +1408,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
parms.append(build['target']) parms.append(build['target'])
update_dirs = None update_dirs = None
if updatemode == 'auto': if updatemode == 'auto':
update_dirs = ['.'] update_dirs = ['.'] + ant_subprojects(root_dir)
with open(os.path.join(root_dir, 'project.properties')) as f:
for line in f.readlines():
if not line.startswith('android.library.reference.'):
continue
path = line.split('=')[1].strip()
relpath = os.path.join(root_dir, path)
if not os.path.isdir(relpath):
continue
if options.verbose:
print "Found subproject %s..." % path
update_dirs.append(path)
else: else:
update_dirs = [d.strip() for d in updatemode.split(';')] update_dirs = [d.strip() for d in updatemode.split(';')]
# Force build.xml update if necessary... # Force build.xml update if necessary...