mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-02 09:10:11 +02:00
import: get build dir from settings.gradle
Most projects set a single build dir in settings.gradle, so its worth trying here.
This commit is contained in:
parent
64938d9104
commit
559adb207b
@ -32,6 +32,9 @@ from . import metadata
|
|||||||
from .exception import FDroidException
|
from .exception import FDroidException
|
||||||
|
|
||||||
|
|
||||||
|
SETTINGS_GRADLE = re.compile('''include\s+['"]:([^'"]*)['"]''')
|
||||||
|
|
||||||
|
|
||||||
# Get the repo type and address from the given web page. The page is scanned
|
# Get the repo type and address from the given web page. The page is scanned
|
||||||
# in a rather naive manner for 'git clone xxxx', 'hg clone xxxx', etc, and
|
# in a rather naive manner for 'git clone xxxx', 'hg clone xxxx', etc, and
|
||||||
# when one of these is found it's assumed that's the information we want.
|
# when one of these is found it's assumed that's the information we want.
|
||||||
@ -180,6 +183,13 @@ def get_subdir(build_dir):
|
|||||||
if options.subdir:
|
if options.subdir:
|
||||||
return os.path.join(build_dir, options.subdir)
|
return os.path.join(build_dir, options.subdir)
|
||||||
|
|
||||||
|
settings_gradle = os.path.join(build_dir, 'settings.gradle')
|
||||||
|
if os.path.exists(settings_gradle):
|
||||||
|
with open(settings_gradle) as fp:
|
||||||
|
m = SETTINGS_GRADLE.search(fp.read())
|
||||||
|
if m:
|
||||||
|
return os.path.join(build_dir, m.group(1))
|
||||||
|
|
||||||
return build_dir
|
return build_dir
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user