Skip to content

C
cocoapods
Commit 6d53f280 authored by Fabio Pelosin's avatar Fabio Pelosin
Browse files
Options

Merge branch 'master' into pods-project-edit-feature 

* master:
  [README] Use proper wording for ‘sponsors’.
  [Bundle] Update with Xcodeproj 0.11.1
  Release 0.25.0
  [Bundle] Bump Xcodeproj to 0.11.0
  [CHANGELOG] Add link to Xcode 5 PR.
  [CHANGELOG] Update for 0.25.0
  [Examples] Set ONLY_ACTIVE_ARCH to NO for iOS builds
  [Examples] Update to Xcode 5 default project settings to fix CI build.
  [Project] Make all Xcode 5 project validations green.
  [Analyzer] Do not warn about multiple `ARCHS` if there are none at all.
  Update integration spec fixtures.
  Update CHANGELOG for #1364
  Ensure resource bundles are copied to installation location on install actions. Fixes #1364
  [Generator::Xcconfig] Add support for XCTest
  [TargetInstaller] Set the architecture according to the value of the user targets
  Add support for Xcode 5
  [Xcodeproj] Update
  Fix specs
  Rework resource bundle target creation so that a single common resource bundle target is shared by all targets. fixes #1338

Conflicts:
	Gemfile.lock
	lib/cocoapods/installer.rb
	lib/cocoapods/installer/analyzer.rb
	lib/cocoapods/installer/target_installer.rb
	lib/cocoapods/installer/target_installer/pod_target_installer.rb
	lib/cocoapods/target.rb
	spec/cocoapods-integration-specs
	spec/unit/installer/target_installer_spec.rb
	spec/unit/installer_spec.rb
parents 59564007 9163bedc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 158 additions and 44 deletions
CHANGELOG.md
View file @ 6d53f280
......@@ -2,28 +2,71 @@
To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
## Master
## 0.25.0
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.24.0...0.25.0)
• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.24.0...0.25.0)
• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.10.1...0.11.0)
###### Enhancements
* Added support for Xcode 5.
The generated Pods Xcode project is now compatible with `arm64` projects and
is updated to use Xcode 5’s default settings removing all warnings.
**NOTE to Xcode 4 users:**
1. This means that the Pods Xcode project now sets the `ONLY_ACTIVE_ARCH`
build setting to `YES` in the `Debug` configuration. You’ll have to set the
same on your project/target, otherwise the build _will_ fail.
2. When building a **iOS** project from the command-line with the `xcodebuild`
tool you’ll need to completely disable this setting by appending to your
build command: `ONLY_ACTIVE_ARCH=NO`.
[#1352](https://github.com/CocoaPods/CocoaPods/pull/1352)
* Speed up project generation in `pod install` and `pod update`.
* The pre and post install hooks that have been deprecated now include the name
and version of the spec that’s using them.
###### Bug Fixes
* Only create a single resource bundle for all targets. Prior to this change a
resource bundle included into multiple targets within the project would create
duplicately named targets in the Pods Xcode project, causing duplicately named
Schemes to be created on each invocation of `pod install`. All targets that
reference a given resource bundle now have dependencies on a single common
target.
[Blake Watters](https://github.com/blakewatters)
[#1338](https://github.com/CocoaPods/CocoaPods/issues/1338)
* Solved outstanding issues with CocoaPods resource bundles and Archive builds:
1. The rsync task copies symlinks into the App Bundle, producing an invalid app. This change add `--copy-links`
to the rsync invocation to ensure the target files are copied rather than the symlink.
2. The Copy Resources script uses `TARGET_BUILD_DIR` which points to the App Archiving folder during an Archive action.
Switching to `BUILT_PRODUCTS_DIR` instead ensures that the path is correct for all actions and configurations.
1. The rsync task copies symlinks into the App Bundle, producing an invalid
app. This change add `--copy-links` to the rsync invocation to ensure the
target files are copied rather than the symlink.
2. The Copy Resources script uses `TARGET_BUILD_DIR` which points to the App
Archiving folder during an Archive action. Switching to
`BUILT_PRODUCTS_DIR` instead ensures that the path is correct for all
actions and configurations.
[Blake Watters](https://github.com/blakewatters)
[#1309](https://github.com/CocoaPods/CocoaPods/issues/1309)
[#1329](https://github.com/CocoaPods/CocoaPods/issues/1329)
## 0.24.0
* Ensure resource bundles are copied to installation location on install actions
[Chris Gummer](https://github.com/chrisgummer)
[#1364](https://github.com/CocoaPods/CocoaPods/issues/1364)
###### Enhancements
* Various bugfixes in Xcodeproj, refer to its [CHANGELOG](https://github.com/CocoaPods/Xcodeproj/blob/0.11.0/CHANGELOG.md)
for details.
## 0.24.0
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.3...0.23.0.rc1)
• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.3...0.23.0.rc1)
• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.8.1...0.9.0)
• [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader/compare/0.1.1...0.1.2)
• [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader/compare/0.1.1...0.2.0)
###### Enhancements
......@@ -32,7 +75,6 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
stored in the `~/.cocoapods/templates` folder. Two templates are supported:
- the `Podfile.default` template for regular targets.
- and the `Podfile.test` template for test targets.
[Ian Ynda-Hummel](https://github.com/ianyh)
[#1106](https://github.com/CocoaPods/CocoaPods/issues/1106)
[#1045](https://github.com/CocoaPods/CocoaPods/issues/1045)
......@@ -87,13 +129,13 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
## 0.23.0.rc1
###### Enhancements
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.3...0.23.0.rc1)
• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.3...0.23.0.rc1)
• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.8.1...0.9.0)
• [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader/compare/0.1.1...0.1.2)
###### Enhancements
* Added `prepare_command` attribute to Specification DSL. The prepare command
will replace the `pre_install` hook. The `post_install` hook has also been
deprecated.
......
Gemfile.lock
View file @ 6d53f280
......@@ -7,20 +7,20 @@ GIT
GIT
remote: https://github.com/CocoaPods/Core.git
revision: d7d34813894b7b08c8e19f137a3b04cd6fcc92b0
revision: 1a7b59ccd0dd2d6593a991005b75f71d0e5b5bdf
branch: master
specs:
cocoapods-core (0.24.0)
cocoapods-core (0.25.0)
activesupport (~> 3.0)
json (~> 1.8)
nap (~> 0.5)
GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision: d7bacd932526540b6d447dcb4358cec2822a68f9
revision: d6927a91a486d51d71f90618c5bf3c20a82ab48b
branch: master
specs:
xcodeproj (0.10.1)
xcodeproj (0.11.1)
activesupport (~> 3.0)
colored (~> 1.2)
......@@ -49,9 +49,9 @@ GIT
GIT
remote: https://github.com/lemurheavy/coveralls-ruby.git
revision: 2a7d3f86f1353a97734cc7df476b898e92d89708
revision: b1a5dcc23a4a9cb02a6a1560c63861d102530cd9
specs:
coveralls (0.6.7)
coveralls (0.7.0)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
......@@ -61,16 +61,16 @@ GIT
PATH
remote: .
specs:
cocoapods (0.24.0)
cocoapods (0.25.0)
activesupport (~> 3.0)
claide (~> 0.3.2)
cocoapods-core (= 0.24.0)
cocoapods-core (= 0.25.0)
cocoapods-downloader (~> 0.2.0)
colored (~> 1.2)
escape (~> 0.0.4)
json (~> 1.8)
open4 (~> 1.3)
xcodeproj (~> 0.10.0)
xcodeproj (~> 0.11.0)
GEM
remote: http://rubygems.org/
......@@ -112,7 +112,7 @@ GEM
yajl-ruby (~> 1.1.0)
rake (10.1.0)
rb-fsevent (0.9.3)
rb-inotify (0.9.1)
rb-inotify (0.9.2)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
ffi (>= 0.5.0)
......@@ -128,9 +128,9 @@ GEM
term-ansicolor (1.2.2)
tins (~> 0.8)
thor (0.18.1)
tins (0.9.0)
tins (0.10.0)
yajl-ruby (1.1.0)
yard (0.8.7)
yard (0.8.7.2)
PLATFORMS
ruby
......
README.md
View file @ 6d53f280
......@@ -53,14 +53,14 @@ CocoaPods is composed by the following projects:
All CocoaPods development happens on GitHub, contributions make good karma and
we welcome with joy new contributors.
# Donations
# Sponsors
- [@fngtps](http://twitter.com/fngtps) is donating time to work on the design
of the forthcoming cocoapods.org website and donated the money to hire [Max
Steenbergen](http://twitter.com/maxsteenbergen) to design [an
icon](http://drbl.in/cpmL) for it.
- [@sauspiel](http://twitter.com/Sauspiel) uses CocoaPods for their games and
have hired me to add features and specs they needed. These are Nimbus,
have hired @alloy to add features and specs they needed. These are Nimbus,
QuincyKit, and HockeyKit. For the [Nimbus
spec](https://github.com/CocoaPods/Specs/blob/master/Nimbus/0.9.0/Nimbus.podspec),
the ‘subspecs’ feature was added.
......
Rakefile
View file @ 6d53f280
......@@ -331,6 +331,8 @@ namespace :examples do
command << " -sdk "
command << Dir.glob("#{`xcode-select -print-path`.chomp}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator*.sdk").last
end
command << " ONLY_ACTIVE_ARCH=NO"
end
execute_command(command)
end
......
cocoapods.gemspec
View file @ 6d53f280
......@@ -30,7 +30,7 @@ s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHA
s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}"
s.add_runtime_dependency 'claide', '~> 0.3.2'
s.add_runtime_dependency 'cocoapods-downloader', '~> 0.2.0'
s.add_runtime_dependency 'xcodeproj', '~> 0.10.0'
s.add_runtime_dependency 'xcodeproj', '~> 0.11.0'
s.add_runtime_dependency 'colored', '~> 1.2'
s.add_runtime_dependency 'escape', '~> 0.0.4'
......
examples/AFNetworking Mac Example/AFNetworking Mac Example.xcodeproj/xcshareddata/xcschemes/AFNetworking Mac Example.xcscheme
View file @ 6d53f280
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
......@@ -22,7 +23,7 @@
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
......@@ -39,11 +40,12 @@
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
......
examples/AFNetworking iOS Example/AFNetworking iOS Example.xcodeproj/project.pbxproj
View file @ 6d53f280
......@@ -204,7 +204,7 @@
F8E469571395739C00DB05C8 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0420;
LastUpgradeCheck = 0500;
ORGANIZATIONNAME = Gowalla;
};
buildConfigurationList = F8E4695A1395739C00DB05C8 /* Build configuration list for PBXProject "AFNetworking iOS Example" */;
......@@ -287,7 +287,6 @@
F8E4697F1395739D00DB05C8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0;
......@@ -297,6 +296,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
};
name = Debug;
......@@ -304,7 +304,6 @@
F8E469801395739D00DB05C8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvmgcc42;
......
examples/AFNetworking iOS Example/AFNetworking iOS Example.xcodeproj/xcshareddata/xcschemes/AFNetworking iOS Example.xcscheme
View file @ 6d53f280
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
......@@ -22,7 +23,7 @@
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
......@@ -39,11 +40,12 @@
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
......
examples/TargetTest/TargetTest.xcodeproj/project.pbxproj
View file @ 6d53f280
......@@ -14,7 +14,6 @@
51887BC7147465E00005EA71 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 51887BC6147465E00005EA71 /* main.m */; };
51887BCB147465E00005EA71 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 51887BCA147465E00005EA71 /* AppDelegate.m */; };
51887BDA1474663A0005EA71 /* libPods-test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 51887BD91474663A0005EA71 /* libPods-test.a */; };
51887BDC1474664E0005EA71 /* Pods-test.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 51887BDB1474664E0005EA71 /* Pods-test.xcconfig */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -124,7 +123,7 @@
51887BAD147465E00005EA71 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0420;
LastUpgradeCheck = 0500;
};
buildConfigurationList = 51887BB0147465E00005EA71 /* Build configuration list for PBXProject "TargetTest" */;
compatibilityVersion = "Xcode 3.2";
......@@ -149,7 +148,6 @@
buildActionMask = 2147483647;
files = (
51887BC5147465E00005EA71 /* InfoPlist.strings in Resources */,
51887BDC1474664E0005EA71 /* Pods-test.xcconfig in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -200,7 +198,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
......@@ -212,10 +215,15 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
......@@ -225,13 +233,22 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
......
examples/TargetTest/TargetTest.xcodeproj/xcshareddata/xcschemes/TargetTest.xcscheme
View file @ 6d53f280
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
......@@ -22,7 +23,7 @@
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
......@@ -39,11 +40,12 @@
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
......
lib/cocoapods.rb
View file @ 6d53f280
......@@ -13,6 +13,7 @@ module Pod
#
class Informative < PlainInformative
def message
puts "CALL"
"[!] #{super}".red
end
end
......
lib/cocoapods/gem_version.rb
View file @ 6d53f280
module Pod
# The version of the cocoapods command line tool.
#
VERSION = '0.24.0' unless defined? Pod::VERSION
VERSION = '0.25.0' unless defined? Pod::VERSION
end
lib/cocoapods/generator/copy_resources_script.rb
View file @ 6d53f280
......@@ -125,6 +125,9 @@ EOS
RSYNC_CALL = <<EOS
rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
if [[ "${ACTION}" == "install" ]]; then
rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
fi
rm -f "$RESOURCES_TO_COPY"
EOS
......
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
View file @ 6d53f280
......@@ -121,7 +121,8 @@ module Pod
# @return [void]
#
def self.add_developers_frameworks_if_needed(xcconfig)
if xcconfig.frameworks.include?('SenTestingKit')
matched_frameworks = xcconfig.frameworks & ['XCTest', 'SenTestingKit']
unless matched_frameworks.empty?
search_paths = xcconfig.attributes['FRAMEWORK_SEARCH_PATHS'] ||= ''
DEVELOPER_FRAMEWORKS_SEARCH_PATHS.each do |search_path|
unless search_paths.include?(search_path)
......
lib/cocoapods/installer/analyzer.rb
View file @ 6d53f280
......@@ -35,6 +35,7 @@ module Pod
@update_mode = false
@allow_pre_downloads = true
@archs_by_target_def = {}
end
# Performs the analysis.
......@@ -186,6 +187,7 @@ module Pod
target.user_project_path = project_path
target.user_target_uuids = native_targets.map(&:uuid)
target.user_build_configurations = compute_user_build_configurations(target_definition, native_targets)
target.archs = @archs_by_target_def[target_definition]
else
target.user_target_uuids = []
target.user_build_configurations = {}
......@@ -206,6 +208,7 @@ module Pod
pod_target.private_headers_store = Sandbox::HeadersStore.new(sandbox, "BuildHeaders")
pod_target.public_headers_store = sandbox.public_headers
pod_target.inhibits_warnings = target_definition.inhibits_warnings_for_pod?(pod_name)
pod_target.archs = @archs_by_target_def[target_definition]
end
end
end
......@@ -455,6 +458,31 @@ module Pod
Platform.new(name, deployment_target)
end
# @return [Platform] The platform for the library.
#
# @note This resolves to the lowest deployment target across the user
# targets.
#
# @todo Is assigning the platform to the target definition the best way
# to go?
#
def compute_archs_for_target_definition(target_definition, user_targets)
archs = []
user_targets.each do |target|
target.build_configurations.each do |configuration|
archs << configuration.build_settings['ARCHS']
end
end
archs = archs.compact.uniq.sort
if archs.count > 1
UI.warn "Found multiple values (`#{archs.join('`, `')}`) for the " \
"architectures (`ARCHS`) build setting for the " \
"`#{target_definition}` target definition. Using the first."
end
archs.first
end
# Precompute the platforms for each target_definition in the Podfile
#
# @note The platforms are computed and added to each target_definition
......@@ -470,6 +498,8 @@ module Pod
user_project = Xcodeproj::Project.open(project_path)
targets = compute_user_project_targets(target_definition, user_project)
platform = compute_platform_for_target_definition(target_definition, targets)
archs = compute_archs_for_target_definition(target_definition, targets)
@archs_by_target_def[target_definition] = archs
else
unless target_definition.platform
raise Informative, "It is necessary to specify the platform in the Podfile if not integrating."
......
lib/cocoapods/target.rb
View file @ 6d53f280
......@@ -188,6 +188,10 @@ module Pod
attr_accessor :generate_bridge_support
alias :generate_bridge_support? :generate_bridge_support
# @return [String] The value for the ARCHS build setting.
#
attr_accessor :archs
public
......
cocoapods-integration-specs @ 47c921f0
Subproject commit a7ff74e4d9bf72e594a11451e23112752ad8ea57
Subproject commit 47c921f09fe5c1f0079922c6e10be0de21513a4a
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
View file @ 6d53f280
......@@ -167,6 +167,15 @@ module Pod
frameworks_search_paths.should.include?('"$(SDKROOT)/Developer/Library/Frameworks"')
frameworks_search_paths.should.include?('"$(DEVELOPER_LIBRARY_DIR)/Frameworks"')
end
it "adds the developer frameworks search paths to the xcconfig if XCTest has been detected" do
xcconfig = Xcodeproj::Config.new({'OTHER_LDFLAGS' => '-framework XCTest'})
@sut.add_developers_frameworks_if_needed(xcconfig)
frameworks_search_paths = xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS']
frameworks_search_paths.should.include?('$(inherited)')
frameworks_search_paths.should.include?('"$(SDKROOT)/Developer/Library/Frameworks"')
frameworks_search_paths.should.include?('"$(DEVELOPER_LIBRARY_DIR)/Frameworks"')
end
end
#---------------------------------------------------------------------#
......
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