mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-19 03:30:12 +02:00
Clean gradle signing configs all at once
This commit is contained in:
parent
0f375dba43
commit
a546013756
@ -336,8 +336,6 @@ def adapt_gradle(path, verbose):
|
|||||||
subprocess.call(['sed', '-i',
|
subprocess.call(['sed', '-i',
|
||||||
's@com.android.tools.build:gradle:[0-9\.\+]*@com.android.tools.build:gradle:'+gradle_plugin+'@g', path])
|
's@com.android.tools.build:gradle:[0-9\.\+]*@com.android.tools.build:gradle:'+gradle_plugin+'@g', path])
|
||||||
|
|
||||||
subprocess.call(['sed', '-i', '/signingConfig /d', path])
|
|
||||||
|
|
||||||
|
|
||||||
def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_dir, tmp_dir, install, force, verbose, onserver):
|
def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_dir, tmp_dir, install, force, verbose, onserver):
|
||||||
"""Do a build locally."""
|
"""Do a build locally."""
|
||||||
|
@ -1290,6 +1290,12 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
|
|||||||
else:
|
else:
|
||||||
root_dir = build_dir
|
root_dir = build_dir
|
||||||
|
|
||||||
|
if 'gradle' in build:
|
||||||
|
if '@' in build['gradle']:
|
||||||
|
gradle_dir = os.path.join(root_dir, build['gradle'].split('@')[1])
|
||||||
|
else:
|
||||||
|
gradle_dir = root_dir
|
||||||
|
|
||||||
# Get a working copy of the right revision...
|
# Get a working copy of the right revision...
|
||||||
print "Getting source for revision " + build['commit']
|
print "Getting source for revision " + build['commit']
|
||||||
vcs.gotorevision(build['commit'])
|
vcs.gotorevision(build['commit'])
|
||||||
@ -1379,6 +1385,11 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
|
|||||||
if subprocess.call(['sed','-i','s/^key.store/#/',
|
if subprocess.call(['sed','-i','s/^key.store/#/',
|
||||||
propfile], cwd=root_dir) !=0:
|
propfile], cwd=root_dir) !=0:
|
||||||
raise BuildException("Failed to amend %s" % propfile)
|
raise BuildException("Failed to amend %s" % propfile)
|
||||||
|
for root, dirs, files in os.walk(gradle_dir):
|
||||||
|
for f in files:
|
||||||
|
if f == 'build.gradle':
|
||||||
|
clean_gradle_keys(os.path.join(root, f), verbose)
|
||||||
|
break
|
||||||
|
|
||||||
# Update the local.properties file...
|
# Update the local.properties file...
|
||||||
locprops = os.path.join(root_dir, 'local.properties')
|
locprops = os.path.join(root_dir, 'local.properties')
|
||||||
@ -1898,3 +1909,25 @@ def FDroidPopen(commands, cwd,
|
|||||||
p.communicate()
|
p.communicate()
|
||||||
result.returncode = p.returncode
|
result.returncode = p.returncode
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
def clean_gradle_keys(path, verbose):
|
||||||
|
if verbose:
|
||||||
|
print "Cleaning build.gradle of keysigning configs at %s" % path
|
||||||
|
|
||||||
|
lines = None
|
||||||
|
with open(path, "r") as o:
|
||||||
|
lines = o.readlines()
|
||||||
|
|
||||||
|
opened = 0
|
||||||
|
with open(path, "w") as o:
|
||||||
|
for line in lines:
|
||||||
|
if 'signingConfigs ' in line:
|
||||||
|
opened = 1
|
||||||
|
elif opened > 0:
|
||||||
|
if '{' in line:
|
||||||
|
opened += 1
|
||||||
|
elif '}' in line:
|
||||||
|
opened -=1
|
||||||
|
elif 'signingConfig' not in line:
|
||||||
|
o.write(line)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user