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

fixes requirements, remove mod_pbxproj and use up to date mod_pbxproj to handle tbd files

Browse source
This commit is contained in:
Mathieu Virbel 2018-10-28 22:07:10 +01:00
parent 8e1960f28c
commit 5311f0c098
3 changed files with 27 additions and 1594 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
toolchain.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python2 #!/usr/bin/env python3
""" """
Tool for compiling iOS toolchain Tool for compiling iOS toolchain
================================ ================================
@ -22,7 +22,13 @@ try:
from urllib.request import FancyURLopener, urlcleanup from urllib.request import FancyURLopener, urlcleanup
except ImportError: except ImportError:
from urllib import FancyURLopener, urlcleanup from urllib import FancyURLopener, urlcleanup
try:
from pbxproj import XcodeProject
from pbxproj.pbxextensions.ProjectFiles import FileOptions
except ImportError:
print("ERROR: pbxproj requirements is missing")
print("To install: pip install -r requirements.txt")
sys.exit(0)
curdir = dirname(__file__) curdir = dirname(__file__)
sys.path.insert(0, join(curdir, "tools", "external")) sys.path.insert(0, join(curdir, "tools", "external"))
@ -1062,39 +1068,42 @@ def update_pbxproj(filename):
print("-" * 70) print("-" * 70)
print("Analysis of {}".format(filename)) print("Analysis of {}".format(filename))
from mod_pbxproj import XcodeProject project = XcodeProject.load(filename)
project = XcodeProject.Load(filename)
sysroot = sh.xcrun("--sdk", "iphonesimulator", "--show-sdk-path").strip() sysroot = sh.xcrun("--sdk", "iphonesimulator", "--show-sdk-path").strip()
group = project.get_or_create_group("Frameworks") group = project.get_or_create_group("Frameworks")
g_classes = project.get_or_create_group("Classes") g_classes = project.get_or_create_group("Classes")
file_options = FileOptions(embed_framework=False, code_sign_on_copy=True)
for framework in pbx_frameworks: for framework in pbx_frameworks:
framework_name = "{}.framework".format(framework) framework_name = "{}.framework".format(framework)
if framework_name in frameworks: if framework_name in frameworks:
print("Ensure {} is in the project (local)".format(framework)) print("Ensure {} is in the project (pbx_frameworks, local)".format(framework))
f_path = join(ctx.dist_dir, "frameworks", framework_name) f_path = join(ctx.dist_dir, "frameworks", framework_name)
else: else:
print("Ensure {} is in the project (system)".format(framework)) print("Ensure {} is in the project (pbx_frameworks, system)".format(framework))
f_path = join(sysroot, "System", "Library", "Frameworks", f_path = join(sysroot, "System", "Library", "Frameworks",
"{}.framework".format(framework)) "{}.framework".format(framework))
project.add_file_if_doesnt_exist(f_path, parent=group, tree="DEVELOPER_DIR") project.add_file(f_path, parent=group, tree="DEVELOPER_DIR",
force=False, file_options=file_options)
for library in pbx_libraries: for library in pbx_libraries:
print("Ensure {} is in the project".format(library)) print("Ensure {} is in the project (pbx_libraries, dylib+tbd)".format(library))
f_path = join(sysroot, "usr", "lib", f_path = join(sysroot, "usr", "lib",
"{}.dylib".format(library)) "{}.dylib".format(library))
project.add_file_if_doesnt_exist(f_path, parent=group, tree="DEVELOPER_DIR") project.add_file(f_path, parent=group, tree="DEVELOPER_DIR", force=False)
f_path = join(sysroot, "usr", "lib",
"{}.tbd".format(library))
project.add_file(f_path, parent=group, tree="DEVELOPER_DIR", force=False)
for library in libraries: for library in libraries:
print("Ensure {} is in the project".format(library)) print("Ensure {} is in the project (libraries)".format(library))
project.add_file_if_doesnt_exist(library, parent=group) project.add_file(library, parent=group, force=False)
for name in sources: for name in sources:
print("Ensure {} sources are used".format(name)) print("Ensure {} sources are used".format(name))
fn = join(ctx.dist_dir, "sources", name) fn = join(ctx.dist_dir, "sources", name)
project.add_folder(fn, parent=g_classes) project.add_folder(fn, parent=g_classes)
if project.modified: project.backup()
project.backup() project.save()
project.save()
if __name__ == "__main__": if __name__ == "__main__":

1578
tools/external/mod_pbxproj.py vendored
View file

File diff suppressed because it is too large Load diff

6
tools/templates/{{ cookiecutter.project_name }}-ios/{{ cookiecutter.project_name }}.xcodeproj/project.pbxproj
View file

@ -290,7 +290,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.1; IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"{{ cookiecutter.dist_dir }}/lib" "{{ cookiecutter.dist_dir }}/lib",
); );
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-all_load"; OTHER_LDFLAGS = "-all_load";
@ -325,7 +325,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.1; IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"\"$(PROJECT_DIR)/../build/lib\"" "\"$(PROJECT_DIR)/../build/lib\"",
); );
OTHER_LDFLAGS = "-all_load"; OTHER_LDFLAGS = "-all_load";
PRODUCT_NAME = {{ cookiecutter.project_name }}; PRODUCT_NAME = {{ cookiecutter.project_name }};
@ -344,6 +344,7 @@
buildSettings = { buildSettings = {
DEAD_CODE_STRIPPING = NO; DEAD_CODE_STRIPPING = NO;
USER_HEADER_SEARCH_PATHS = {{ cookiecutter.dist_dir }}/root/include/; USER_HEADER_SEARCH_PATHS = {{ cookiecutter.dist_dir }}/root/include/;
VALID_ARCHS = x86_64;
}; };
name = Debug; name = Debug;
}; };
@ -353,6 +354,7 @@
DEAD_CODE_STRIPPING = NO; DEAD_CODE_STRIPPING = NO;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
USER_HEADER_SEARCH_PATHS = {{ cookiecutter.dist_dir }}/root/include/; USER_HEADER_SEARCH_PATHS = {{ cookiecutter.dist_dir }}/root/include/;
VALID_ARCHS = x86_64;
}; };
name = Release; name = Release;
}; };