LBRYCommunity/kivy-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #486 from AndreMiras/feature/find_xcodeproj_helper

Browse source 
DRY via the find_xcodeproj() helper method
This commit is contained in:
Andre Miras 2020-05-06 21:14:19 +02:00 committed by GitHub
commit efd47e60bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
kivy_ios/toolchain.py
View file

@ -26,14 +26,9 @@ from datetime import datetime
from pprint import pformat from pprint import pformat
import logging import logging
from urllib.request import FancyURLopener, urlcleanup from urllib.request import FancyURLopener, urlcleanup
from pbxproj import XcodeProject
from pbxproj.pbxextensions.ProjectFiles import FileOptions
try:
from pbxproj import XcodeProject
from pbxproj.pbxextensions.ProjectFiles import FileOptions
except ImportError:
print("ERROR: Python requirements are missing")
print("To install: pip install -r requirements.txt")
sys.exit(1)
curdir = dirname(__file__) curdir = dirname(__file__)
@ -1241,6 +1236,18 @@ pip Install a pip dependency into the distribution
exit(1) exit(1)
getattr(self, args.command)() getattr(self, args.command)()
@staticmethod
def find_xcodeproj(filename):
if not filename.endswith(".xcodeproj"):
# try to find the xcodeproj
from glob import glob
xcodeproj = glob(join(filename, "*.xcodeproj"))
if not xcodeproj:
logger.error("Unable to find a xcodeproj in {}".format(filename))
sys.exit(1)
filename = xcodeproj[0]
return filename
def build(self): def build(self):
ctx = Context() ctx = Context()
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
@ -1385,16 +1392,7 @@ pip Install a pip dependency into the distribution
parser.add_argument("--add-framework", action="append", help="Additional Frameworks to include with this project") parser.add_argument("--add-framework", action="append", help="Additional Frameworks to include with this project")
args = parser.parse_args(sys.argv[2:]) args = parser.parse_args(sys.argv[2:])
filename = args.filename filename = self.find_xcodeproj(args.filename)
if not filename.endswith(".xcodeproj"):
# try to find the xcodeproj
from glob import glob
xcodeproj = glob(join(filename, "*.xcodeproj"))
if not xcodeproj:
logger.error("Unable to find a xcodeproj in {}".format(filename))
sys.exit(1)
filename = xcodeproj[0]
filename = join(filename, "project.pbxproj") filename = join(filename, "project.pbxproj")
if not exists(filename): if not exists(filename):
logger.error("{} not found".format(filename)) logger.error("{} not found".format(filename))
@ -1468,15 +1466,7 @@ pip Install a pip dependency into the distribution
parser = argparse.ArgumentParser(description="Open the xcode project") parser = argparse.ArgumentParser(description="Open the xcode project")
parser.add_argument("filename", help="Path to your project or xcodeproj") parser.add_argument("filename", help="Path to your project or xcodeproj")
args = parser.parse_args(sys.argv[2:]) args = parser.parse_args(sys.argv[2:])
filename = args.filename filename = self.find_xcodeproj(args.filename)
if not filename.endswith(".xcodeproj"):
# try to find the xcodeproj
from glob import glob
xcodeproj = glob(join(filename, "*.xcodeproj"))
if not xcodeproj:
logger.error("Unable to find a xcodeproj in {}".format(filename))
sys.exit(1)
filename = xcodeproj[0]
sh.open(filename) sh.open(filename)
def _xcassets(self, title, command): def _xcassets(self, title, command):
@ -1490,16 +1480,7 @@ pip Install a pip dependency into the distribution
logger.error("image path does not exists.") logger.error("image path does not exists.")
return return
filename = args.filename filename = self.find_xcodeproj(args.filename)
if not filename.endswith(".xcodeproj"):
# try to find the xcodeproj
from glob import glob
xcodeproj = glob(join(filename, "*.xcodeproj"))
if not xcodeproj:
logger.error("Unable to find a xcodeproj in {}".format(filename))
sys.exit(1)
filename = xcodeproj[0]
project_name = filename.split("/")[-1].replace(".xcodeproj", "") project_name = filename.split("/")[-1].replace(".xcodeproj", "")
images_xcassets = realpath(join(filename, "..", project_name, images_xcassets = realpath(join(filename, "..", project_name,
"Images.xcassets")) "Images.xcassets"))