From eaa9b0a75a90a9f001592f9b28bcdfca8cd197db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 7 Dec 2023 23:45:07 +0100 Subject: [PATCH 1/2] Fix BUILD_LIBRARY_FOR_DISTRIBUTION in Makefile The variable is called `BUILD_LIBRARY_FOR_DISTRIBUTION` (singular) not `BUILD_LIBRARIES_FOR_DISTRIBUTION` (plural: https://developer.apple.com/documentation/xcode/build-settings-reference#Build-Libraries-for-Distribution This seems to be a common typo that is unfortunately spread across various blog posts. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1b4b2c95439..d004282f681 100644 --- a/Makefile +++ b/Makefile @@ -79,8 +79,8 @@ watchOSLibPath = ./Samples/watchOS-Swift/libs build-for-watchos: @echo "--> Building Sentry as a XCFramework that can be used with watchOS" rm -rf ${watchOSLibPath} - xcodebuild archive -scheme Sentry -destination="watchOS" -archivePath ${watchOSLibPath}/watchos.xcarchive -sdk watchos SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES - xcodebuild archive -scheme Sentry -destination="watch Simulator" -archivePath ${watchOSLibPath}//watchsimulator.xcarchive -sdk watchsimulator SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES + xcodebuild archive -scheme Sentry -destination="watchOS" -archivePath ${watchOSLibPath}/watchos.xcarchive -sdk watchos SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES + xcodebuild archive -scheme Sentry -destination="watch Simulator" -archivePath ${watchOSLibPath}//watchsimulator.xcarchive -sdk watchsimulator SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES xcodebuild -create-xcframework -allow-internal-distribution -framework ${watchOSLibPath}/watchos.xcarchive/Products/Library/Frameworks/Sentry.framework -framework ${watchOSLibPath}/watchsimulator.xcarchive/Products/Library/Frameworks/Sentry.framework -output ${watchOSLibPath}//Sentry.xcframework # call this like `make bump-version TO=5.0.0-rc.0` From bcc82b007eee8bfd29e8f5a2a46547d480ec5f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Sat, 9 Dec 2023 09:22:34 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5398bf41268..54325aa9e71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## Fixes + +- Fix typo in BUILD_LIBRARY_FOR_DISTRIBUTION variable in Makefile (#3488) + ## Features - Add slow and frozen frames to spans (#3450, #3478)