Commit 5d0c4c7a authored by Samuel E. Giddins's avatar Samuel E. Giddins

Merge pull request #5025 from CocoaPods/mr-fix-embed-frameworks-destination

[EmbedFrameworksScript] Rely on TARGET_BUILD_DIR to locate destination
parents 0bea380a 48f76306
......@@ -31,6 +31,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Samuel Giddins](https://github.com/segiddins)
[#4790](https://github.com/CocoaPods/CocoaPods/issues/4790)
* Rely on `TARGET_BUILD_DIR` instead of `CONFIGURATION_BUILD_DIR` in the generated
embed frameworks build phase's script, so that UI test targets can be run.
[Marius Rackwitz](https://github.com/mrackwitz)
[#5022](https://github.com/CocoaPods/CocoaPods/issues/5022)
## 1.0.0.beta.5 (2016-03-08)
......
......@@ -53,7 +53,7 @@ module Pod
local source="$1"
fi
local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
if [ -L "${source}" ]; then
echo "Symlinked..."
......
......@@ -154,7 +154,7 @@ module Pod
end
frameworks_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
frameworks = pod_target.file_accessors.flat_map(&:vendored_dynamic_artifacts).map { |fw| "${PODS_ROOT}/#{fw.relative_path_from(sandbox.root)}" }
frameworks << pod_target.build_product_path if pod_target.should_build? && pod_target.requires_frameworks?
frameworks << pod_target.build_product_path('$BUILT_PRODUCTS_DIR') if pod_target.should_build? && pod_target.requires_frameworks?
frameworks
end
end
......
Subproject commit 2f865615edb0fe42f6257f9838cd3d85a0fbd593
Subproject commit 231c8fc93b5ab52c79f95a211a99059d596a6af2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment