Commit 5855a0da authored by Samuel E. Giddins's avatar Samuel E. Giddins

Merge pull request #3188 from mrackwitz/mr-skip-install

Set SKIP_INSTALL=YES for all generated targets
parents c2e5a87b 0d5532c8
...@@ -72,6 +72,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -72,6 +72,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes ##### Bug Fixes
* Set `SKIP_INSTALL=YES` for all generated targets to avoid producing
*Generic Xcode Archives* on Archive.
[Marius Rackwitz](https://github.com/mrackwitz)
[#3188](https://github.com/CocoaPods/CocoaPods/issues/3188)
* Added support for .tpp C++ header files in specs (previously were getting * Added support for .tpp C++ header files in specs (previously were getting
filtered out and symlinks wouldn't get created in the Pods/Headers folder.) filtered out and symlinks wouldn't get created in the Pods/Headers folder.)
[Honza Dvorsky](https://github.com/czechboy0) [Honza Dvorsky](https://github.com/czechboy0)
......
...@@ -54,6 +54,7 @@ module Pod ...@@ -54,6 +54,7 @@ module Pod
'PODS_ROOT' => '${SRCROOT}', 'PODS_ROOT' => '${SRCROOT}',
'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths), 'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths),
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1', 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
'SKIP_INSTALL' => 'YES',
# 'USE_HEADERMAP' => 'NO' # 'USE_HEADERMAP' => 'NO'
} }
......
...@@ -41,6 +41,7 @@ module Pod ...@@ -41,6 +41,7 @@ module Pod
'OTHER_LDFLAGS' => '', 'OTHER_LDFLAGS' => '',
'OTHER_LIBTOOLFLAGS' => '', 'OTHER_LIBTOOLFLAGS' => '',
'PODS_ROOT' => '$(SRCROOT)', 'PODS_ROOT' => '$(SRCROOT)',
'SKIP_INSTALL' => 'YES',
} }
super.merge(settings) super.merge(settings)
end end
......
Subproject commit a6942711758a69d253874cc04791094d91ad6014 Subproject commit 69d2b2cd4ac25861fcaa552818d0178258d82b2b
...@@ -62,6 +62,10 @@ module Pod ...@@ -62,6 +62,10 @@ module Pod
@xcconfig.to_hash['PODS_ROOT'].should == '${SRCROOT}' @xcconfig.to_hash['PODS_ROOT'].should == '${SRCROOT}'
end end
it 'will be skipped when installing' do
@xcconfig.to_hash['SKIP_INSTALL'].should == 'YES'
end
it 'saves the xcconfig' do it 'saves the xcconfig' do
path = temporary_directory + 'sample.xcconfig' path = temporary_directory + 'sample.xcconfig'
@generator.save_as(path) @generator.save_as(path)
......
...@@ -101,6 +101,13 @@ module Pod ...@@ -101,6 +101,13 @@ module Pod
end end
end end
it 'will be skipped when installing' do
@installer.install!
@installer.target.native_target.build_configurations.each do |config|
config.build_settings['SKIP_INSTALL'].should == 'YES'
end
end
#--------------------------------------# #--------------------------------------#
it 'creates the xcconfig file' do it 'creates the xcconfig file' do
......
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