From d2b85073d7f88f211a76b73281512783ded21339 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 22 Dec 2020 16:20:35 +0000 Subject: [PATCH] create metadata for com.manuelvargastapia.libgen add fastlane structure --- .gitlab-ci.yml | 2 +- tools/fdroid_fetchsrclibs.py | 42 ------------------------------------ 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 tools/fdroid_fetchsrclibs.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe8503f5af..0b813d8f2d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -183,7 +183,7 @@ fdroid build: - curl --silent https://gitlab.com/fdroid/fdroidserver/repository/master/archive.tar.gz | tar -xz --directory=fdroidserver --strip-components=1 - export PATH="`pwd`/fdroidserver:$PATH" - - export PYTHONPATH="`pwd`/fdroidserver:$CI_PROJECT_DIR/tools" + - export PYTHONPATH="$CI_PROJECT_DIR/fdroidserver:$CI_PROJECT_DIR/fdroidserver/examples" - export PYTHONUNBUFFERED=true - bash fdroidserver/buildserver/setup-env-vars $ANDROID_HOME diff --git a/tools/fdroid_fetchsrclibs.py b/tools/fdroid_fetchsrclibs.py deleted file mode 100644 index 0ff4327b91..0000000000 --- a/tools/fdroid_fetchsrclibs.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env python3 -# -# an fdroid plugin for setting up srclibs -# -# The 'fdroid build' gitlab-ci job uses --on-server, which does not -# set up the srclibs. This plugin does the missing setup. - -import argparse -import os -import pprint -from fdroidserver import _, common, metadata - -fdroid_summary = 'prepare the srclibs for `fdroid build --on-server`' - - -def main(): - common.config = { - 'accepted_formats': 'yml', - 'sdk_path': os.getenv('ANDROID_HOME'), - } - common.fill_config_defaults(common.config) - parser = argparse.ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]") - common.setup_global_opts(parser) - parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]")) - metadata.add_metadata_arguments(parser) - options = parser.parse_args() - common.options = options - pkgs = common.read_pkg_args(options.appid, True) - allapps = metadata.read_metadata(pkgs) - apps = common.read_app_args(options.appid, allapps, True) - srclib_dir = os.path.join('build', 'srclib') - os.makedirs(srclib_dir, exist_ok=True) - srclibpaths = [] - for appid, app in apps.items(): - for build in app.get('Builds', []): - for lib in build.srclibs: - srclibpaths.append(common.getsrclib(lib, srclib_dir, build=build)) - print('Set up srclibs:') - pprint.pprint(srclibpaths) - -if __name__ == "__main__": - main()