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

Fix gradle build_tools patching

Browse source
This commit is contained in:
Daniel Martí 2014-01-11 13:05:02 +01:00
parent b6788f4547
commit 00d8e5c19a
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fdroidserver/build.py
View file

@ -377,17 +377,16 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
print "Suspending build server" print "Suspending build server"
subprocess.call(['vagrant', 'suspend'], cwd='builder') subprocess.call(['vagrant', 'suspend'], cwd='builder')
def adapt_gradle(path): def adapt_gradle(build_dir):
for root, dirs, files in os.walk(path): for root, dirs, files in os.walk(build_dir):
for f in files: if 'build.gradle' in files:
if f == 'build.gradle': path = os.path.join(root, 'build.gradle')
if options.verbose: if options.verbose:
print "Adapting build.gradle at %s" % path print "Adapting build.gradle at %s" % path
subprocess.call(['sed', '-i', subprocess.call(['sed', '-i',
's@buildToolsVersion[ ]*["\\\'][0-9\.]*["\\\']@buildToolsVersion "' 's@buildToolsVersion[ ]*["\\\'][0-9\.]*["\\\']@buildToolsVersion "'
+ config['build_tools'] + '"@g', path]) + config['build_tools'] + '"@g', path])
break
def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_dir, tmp_dir, force, onserver): def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_dir, tmp_dir, force, onserver):