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 24, 2021
1 parent 651461b commit 0333d79
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
freetype-*
build/*
dist/*
.eggs/*
kivy_ios.egg-info/*
src/SDL/Xcode-iPhoneOS/SDL/build/
src/SDL/Xcode-iOS/SDL/build/
tmp/*
Expand Down
9 changes: 6 additions & 3 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):
# list all the compiled recipes
ctx = Context()
pbx_libraries = []
Expand All @@ -1197,7 +1197,8 @@ def update_pbxproj(filename, pbx_frameworks=None):
frameworks = []
libraries = []
sources = []
for recipe in Recipe.list_recipes():
recipes = custom_recipes + Recipe.list_recipes()
for recipe in recipes:
key = "{}.build_all".format(recipe)
if key not in ctx.state:
continue
Expand Down Expand Up @@ -1458,6 +1459,8 @@ def update(self):
description="Update an existing xcode project")
parser.add_argument("filename", help="Path to your project or xcodeproj")
parser.add_argument("--add-framework", action="append", help="Additional Frameworks to include with this project")
parser.add_argument("--add-custom-recipe", action="append", default=[],
help="Name of custom recipe to include in this project (the recipe must already have been built with the 'build' command)")
args = parser.parse_args(sys.argv[2:])

filename = self.find_xcodeproj(args.filename)
Expand All @@ -1466,7 +1469,7 @@ 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=add_custom_recipe)
print("--")
print("Project {} updated".format(filename))

Expand Down

0 comments on commit 0333d79

Please sign in to comment.