Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restructure MacOS framework package to fix malformed Framework errors #21536

Merged
merged 7 commits into from
Aug 4, 2024
Merged

Restructure MacOS framework package to fix malformed Framework errors #21536

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a2b433b
Refactor build_apple_framework.py to support macOS framework structure
vraspar Jul 28, 2024
633ae76
Update zip command to store symbolic links
vraspar Jul 29, 2024
2e790c6
symlink correctly
vraspar Jul 29, 2024
e8e6b31
Refactor build_and_assemble_apple_pods.py for debugging
vraspar Aug 1, 2024
3f2632e
add symlinks before zipping the files and cleanup
vraspar Aug 2, 2024
27b2006
remove changes for assemble pods and set symlinks for macabi
vraspar Aug 2, 2024
9b27f00
Add comments
vraspar Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add comments
  • Loading branch information
@vraspar
vraspar committed Aug 2, 2024
commit 9b27f009a8805a8e11922da34959d9a7bbf4949a
5 changes: 4 additions & 1 deletion tools/ci_build/github/apple/assemble_apple_packaging_artifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ ORT_POD_VERSION=${4:?${USAGE_TEXT}}
POD_ARCHIVE_BASENAME="pod-archive-${POD_NAME}-${ORT_POD_VERSION}.zip"
PODSPEC_BASENAME="${POD_NAME}.podspec"

# Check for directories starting with "macos" and create symlinks if necessary

# Macos requires a different structure for the framework
# This will create the necessary symlinks for the macos framework before packaging
# Adding the symlinks here rather than in the build script ensures that symlinks are not lost
vraspar marked this conversation as resolved.
Show resolved Hide resolved
for MACOS_DIR in "${BINARIES_STAGING_DIR}/${POD_NAME}/onnxruntime.xcframework/macos"*; do
if [ -d "${MACOS_DIR}" ]; then
echo "Creating symlinks for ${MACOS_DIR}"
Expand Down
1 change: 0 additions & 1 deletion tools/ci_build/github/apple/build_apple_framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ def _build_package(args):
public_headers_path = os.path.join(os.path.dirname(framework_dir), "onnxruntime.framework", "Headers")

# create the folder for xcframework and copy the LICENSE and framework_info.json file
# changes here
xcframework_dir = os.path.join(build_dir, "framework_out")
pathlib.Path(xcframework_dir).mkdir(parents=True, exist_ok=True)
shutil.copy(os.path.join(REPO_DIR, "LICENSE"), xcframework_dir)
Expand Down
Loading