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

Support gradle variables without an equals sign

Browse source
This commit is contained in:
Daniel Martí 2014-04-12 01:00:59 +02:00
parent 67054c7c6f
commit 5f2c348b40
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fdroidserver/common.py
View file

@ -766,9 +766,9 @@ def parse_androidmanifests(paths):
vnsearch = re.compile(r'.*:versionName="([^"]+?)".*').search vnsearch = re.compile(r'.*:versionName="([^"]+?)".*').search
psearch = re.compile(r'.*package="([^"]+)".*').search psearch = re.compile(r'.*package="([^"]+)".*').search
vcsearch_g = re.compile(r'.*versionCode[ ]*[=]*[ ]*["\']*([0-9]+)["\']*').search vcsearch_g = re.compile(r'.*versionCode *=* *["\']*([0-9]+)["\']*').search
vnsearch_g = re.compile(r'.*versionName[ ]*[=]*[ ]*(["\'])((?:(?=(\\?))\3.)*?)\1.*').search vnsearch_g = re.compile(r'.*versionName *=* *(["\'])((?:(?=(\\?))\3.)*?)\1.*').search
psearch_g = re.compile(r'.*packageName[ ]*[=]*[ ]*["\']([^"]+)["\'].*').search psearch_g = re.compile(r'.*packageName *=* *["\']([^"]+)["\'].*').search
max_version = None max_version = None
max_vercode = None max_vercode = None
@ -1043,13 +1043,13 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
if 'target' in build: if 'target' in build:
n = build["target"].split('-')[1] n = build["target"].split('-')[1]
FDroidPopen(['sed', '-i', FDroidPopen(['sed', '-i',
's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+n+'@g', 's@compileSdkVersion *[0-9]*@compileSdkVersion '+n+'@g',
'build.gradle'], cwd=root_dir) 'build.gradle'], cwd=root_dir)
if '@' in build['gradle']: if '@' in build['gradle']:
gradle_dir = os.path.join(root_dir, build['gradle'].split('@',1)[1]) gradle_dir = os.path.join(root_dir, build['gradle'].split('@',1)[1])
gradle_dir = os.path.normpath(gradle_dir) gradle_dir = os.path.normpath(gradle_dir)
FDroidPopen(['sed', '-i', FDroidPopen(['sed', '-i',
's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+n+'@g', 's@compileSdkVersion *[0-9]*@compileSdkVersion '+n+'@g',
'build.gradle'], cwd=gradle_dir) 'build.gradle'], cwd=gradle_dir)
# Remove forced debuggable flags # Remove forced debuggable flags
@ -1069,7 +1069,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
raise BuildException("Failed to amend manifest") raise BuildException("Failed to amend manifest")
elif has_extension(path, 'gradle'): elif has_extension(path, 'gradle'):
p = SilentPopen(['sed', '-i', p = SilentPopen(['sed', '-i',
's/versionName[ ]*=[ ]*"[^"]*"/versionName = "' + build['version'] + '"/g', 's/versionName *=* *"[^"]*"/versionName = "' + build['version'] + '"/g',
path]) path])
if p.returncode != 0: if p.returncode != 0:
raise BuildException("Failed to amend build.gradle") raise BuildException("Failed to amend build.gradle")
@ -1086,7 +1086,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
raise BuildException("Failed to amend manifest") raise BuildException("Failed to amend manifest")
elif has_extension(path, 'gradle'): elif has_extension(path, 'gradle'):
p = SilentPopen(['sed', '-i', p = SilentPopen(['sed', '-i',
's/versionCode[ ]*=[ ]*[0-9]*/versionCode = ' + build['vercode'] + '/g', 's/versionCode *=* *[0-9]*/versionCode = ' + build['vercode'] + '/g',
path]) path])
if p.returncode != 0: if p.returncode != 0:
raise BuildException("Failed to amend build.gradle") raise BuildException("Failed to amend build.gradle")