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

Fix buildTools versions that reference variables

Browse source
This commit is contained in:
Daniel Martí 2015-03-31 23:08:32 +02:00
parent c6434476e9
commit 85b48a5c25
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fdroidserver/build.py
View file

@ -428,13 +428,14 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
def adapt_gradle(build_dir): def adapt_gradle(build_dir):
filename = 'build.gradle'
for root, dirs, files in os.walk(build_dir): for root, dirs, files in os.walk(build_dir):
if 'build.gradle' in files: if filename in files:
path = os.path.join(root, 'build.gradle') path = os.path.join(root, filename)
logging.debug("Adapting build.gradle at %s" % path) logging.debug("Adapting %s at %s" % (filename, path))
FDroidPopen(['sed', '-i', FDroidPopen(['sed', '-i',
r's@buildToolsVersion\([ =]*\)["\'][0-9\.]*["\']@buildToolsVersion\1"' r's@buildToolsVersion\([ =]\+\).*@buildToolsVersion\1"'
+ config['build_tools'] + '"@g', path]) + config['build_tools'] + '"@g', path])