Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
5855a0da
Commit
5855a0da
authored
Feb 25, 2015
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3188 from mrackwitz/mr-skip-install
Set SKIP_INSTALL=YES for all generated targets
parents
c2e5a87b
0d5532c8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
1 deletion
+19
-1
CHANGELOG.md
CHANGELOG.md
+5
-0
private_pod_xcconfig.rb
lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb
+1
-0
aggregate_target_installer.rb
.../installer/target_installer/aggregate_target_installer.rb
+1
-0
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
private_pod_xcconfig_spec.rb
spec/unit/generator/xcconfig/private_pod_xcconfig_spec.rb
+4
-0
aggregate_target_installer_spec.rb
...aller/target_installer/aggregate_target_installer_spec.rb
+7
-0
No files found.
CHANGELOG.md
View file @
5855a0da
...
@@ -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
)
...
...
lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb
View file @
5855a0da
...
@@ -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'
}
}
...
...
lib/cocoapods/installer/target_installer/aggregate_target_installer.rb
View file @
5855a0da
...
@@ -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
...
...
cocoapods-integration-specs
@
69d2b2cd
Subproject commit
a6942711758a69d253874cc04791094d91ad6014
Subproject commit
69d2b2cd4ac25861fcaa552818d0178258d82b2b
spec/unit/generator/xcconfig/private_pod_xcconfig_spec.rb
View file @
5855a0da
...
@@ -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
)
...
...
spec/unit/installer/target_installer/aggregate_target_installer_spec.rb
View file @
5855a0da
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment