Skip to content

Commit 1688423

Browse files
authored
Add handling for per-arch lib folders. (#65)
1 parent c26f0ca commit 1688423

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

  • {{ cookiecutter.format }}/{{ cookiecutter.formal_name }}.xcodeproj

{{ cookiecutter.format }}/{{ cookiecutter.formal_name }}.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
isa = PBXProject;
163163
attributes = {
164164
BuildIndependentTargetsInParallel = YES;
165-
LastUpgradeCheck = 1630;
165+
LastUpgradeCheck = 1640;
166166
ORGANIZATIONNAME = "Russell Keith-Magee";
167167
};
168168
buildConfigurationList = 60796EDD19190F4100A9926B /* Build configuration list for PBXProject "{{ cookiecutter.formal_name }}" */;
@@ -235,7 +235,7 @@
235235
);
236236
runOnlyForDeploymentPostprocessing = 0;
237237
shellPath = /bin/sh;
238-
shellScript = "set -e\n\nmkdir -p \"$CODESIGNING_FOLDER_PATH/python/lib\"\nif [ \"$EFFECTIVE_PLATFORM_NAME\" = \"-iphonesimulator\" ]; then\n echo \"Installing Python modules for iOS Simulator\"\n PYTHON_SLICE=\"$PROJECT_DIR/Support/Python.xcframework/ios-arm64_x86_64-simulator\"\n PACKAGES_PATH=\"$PROJECT_DIR/{{ cookiecutter.class_name }}/app_packages.iphonesimulator\"\nelse\n echo \"Installing Python modules for iOS Device\"\n PYTHON_SLICE=\"$PROJECT_DIR/Support/Python.xcframework/ios-arm64\"\n PACKAGES_PATH=\"$PROJECT_DIR/{{ cookiecutter.class_name }}/app_packages.iphoneos\"\nfi\n\nrsync -au --delete \"$PYTHON_SLICE/lib/\" \"$CODESIGNING_FOLDER_PATH/python/lib/\" \nif [ -e \"$PYTHON_SLICE/Python.dSYM\" ]; then \n rsync -au --delete \"$PYTHON_SLICE/Python.dSYM\" \"$BUILT_PRODUCTS_DIR\"\nfi\nrsync -au --delete \"$PACKAGES_PATH/\" \"$CODESIGNING_FOLDER_PATH/app_packages\"\n";
238+
shellScript = "set -e\n\nmkdir -p \"$CODESIGNING_FOLDER_PATH/python/lib\"\nPYTHON_XCFRAMEWORK_PATH=\"Support/Python.xcframework\"\nif [ \"$EFFECTIVE_PLATFORM_NAME\" = \"-iphonesimulator\" ]; then\n echo \"Installing Python modules for iOS Simulator\"\n SLICE_FOLDER=\"ios-arm64_x86_64-simulator\"\n PACKAGES_PATH=\"{{ cookiecutter.class_name }}/app_packages.iphonesimulator\"\nelse\n echo \"Installing Python modules for iOS Device\"\n SLICE_FOLDER=\"ios-arm64\"\n PACKAGES_PATH=\"{{ cookiecutter.class_name }}/app_packages.iphoneos\"\nfi\n\n# Python3.14+ arch-specific lib folder\necho \"CHECK $PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/lib\" \nif [ -d \"$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/lib\" ]; then\n rsync -au --delete \"$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/lib/\" \"$CODESIGNING_FOLDER_PATH/python/lib/\"\n rsync -au \"$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/$SLICE_FOLDER/lib-$ARCHS/\" \"$CODESIGNING_FOLDER_PATH/python/lib/\"\nelse\n # A single-arch framework will have a libpython symlink; that can't be included at runtime\n rsync -au --delete \"$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/$SLICE_FOLDER/lib/\" \"$CODESIGNING_FOLDER_PATH/python/lib/\" --exclude 'libpython*.dylib'\nfi\n\nif [ -e \"$PYTHON_SLICE/Python.dSYM\" ]; then \n rsync -au --delete \"$PYTHON_SLICE/Python.dSYM\" \"$BUILT_PRODUCTS_DIR\"\nfi\nrsync -au --delete \"$PROJECT_DIR/$PACKAGES_PATH/\" \"$CODESIGNING_FOLDER_PATH/app_packages\"\n";
239239
showEnvVarsInLog = 0;
240240
};
241241
/* End PBXShellScriptBuildPhase section */
@@ -267,6 +267,7 @@
267267
isa = XCBuildConfiguration;
268268
buildSettings = {
269269
ALWAYS_SEARCH_USER_PATHS = NO;
270+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
270271
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
271272
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
272273
CLANG_CXX_LIBRARY = "libc++";
@@ -325,6 +326,7 @@
325326
isa = XCBuildConfiguration;
326327
buildSettings = {
327328
ALWAYS_SEARCH_USER_PATHS = NO;
329+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
328330
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
329331
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
330332
CLANG_CXX_LIBRARY = "libc++";

0 commit comments

Comments
 (0)