Skip to content

Commit

Permalink
Adds --add-custom-recipe to the update command
Browse files Browse the repository at this point in the history
Custom recipes were built but not added to the XCode project.
See: kivy#642
  • Loading branch information
meow464 committed Sep 25, 2021
1 parent 651461b commit 56e01c0
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions kivy_ios/toolchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,7 @@ def _hostpython_pip(args):
shprint(pip_cmd, *args)


def update_pbxproj(filename, pbx_frameworks=None):
def update_pbxproj(filename, pbx_frameworks=None, custom_recipes=None, custom_recipes_paths=None):
# list all the compiled recipes
ctx = Context()
pbx_libraries = []
Expand All @@ -1197,7 +1197,17 @@ def update_pbxproj(filename, pbx_frameworks=None):
frameworks = []
libraries = []
sources = []

if custom_recipes and custom_recipes_paths:
recipes = custom_recipes
ctx.custom_recipes_paths = custom_recipes_paths
else:
recipes = []

for recipe in Recipe.list_recipes():
recipes.append(recipe)

for recipe in recipes:
key = "{}.build_all".format(recipe)
if key not in ctx.state:
continue
Expand Down Expand Up @@ -1457,6 +1467,9 @@ def update(self):
parser = argparse.ArgumentParser(
description="Update an existing xcode project")
parser.add_argument("filename", help="Path to your project or xcodeproj")
parser.add_argument("recipes", nargs="+", help="Recipes to update")
parser.add_argument("--add-custom-recipe", action="append", default=[],
help="Path to custom recipe (the recipe must already have been built with the 'build' command)")
parser.add_argument("--add-framework", action="append", help="Additional Frameworks to include with this project")
args = parser.parse_args(sys.argv[2:])

Expand All @@ -1466,7 +1479,8 @@ def update(self):
logger.error("{} not found".format(filename))
sys.exit(1)

update_pbxproj(filename, pbx_frameworks=args.add_framework)
update_pbxproj(filename, pbx_frameworks=args.add_framework,
custom_recipes=args.recipes, custom_recipes_paths=args.add_custom_recipe)
print("--")
print("Project {} updated".format(filename))

Expand Down

0 comments on commit 56e01c0

Please sign in to comment.