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
4980095b
Commit
4980095b
authored
Aug 22, 2012
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[UserProjectIntegrator] Check if the xcconfig files is overridden.
Closes #92.
parent
0a5cd240
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
0 deletions
+27
-0
CHANGELOG.md
CHANGELOG.md
+4
-0
target_installer.rb
lib/cocoapods/installer/target_installer.rb
+2
-0
user_project_integrator.rb
lib/cocoapods/installer/user_project_integrator.rb
+19
-0
podfile.rb
lib/cocoapods/podfile.rb
+2
-0
No files found.
CHANGELOG.md
View file @
4980095b
## Master
[
CocoaPods
](
https://github.com/CocoaPods/CocoaPods/compare/0.12.0...master
)
###### Enhancements
-
Check if any of the build settings defined in the xcconfig files is overridden.
[
#92
](
https://github.com/CocoaPods/CocoaPods/issues/92
)
###### Bug fixes
-
The final project isn’t affected anymore by the
`inhibit_all_warnings!`
option.
...
...
lib/cocoapods/installer/target_installer.rb
View file @
4980095b
...
...
@@ -105,6 +105,8 @@ module Pod
end
puts
"- Generating xcconfig file at `
#{
sandbox
.
root
+
@target_definition
.
xcconfig_name
}
'"
if
config
.
verbose?
xcconfig
.
save_as
(
sandbox
.
root
+
@target_definition
.
xcconfig_name
)
@target_definition
.
xcconfig
=
xcconfig
puts
"- Generating prefix header at `
#{
sandbox
.
root
+
@target_definition
.
prefix_header_name
}
'"
if
config
.
verbose?
save_prefix_header_as
(
sandbox
.
root
+
@target_definition
.
prefix_header_name
,
pods
)
puts
"- Generating copy resources script at `
#{
sandbox
.
root
+
@target_definition
.
copy_resources_script_name
}
'"
if
config
.
verbose?
...
...
lib/cocoapods/installer/user_project_integrator.rb
View file @
4980095b
...
...
@@ -135,9 +135,28 @@ module Pod
def
add_xcconfig_base_configuration
xcconfig
=
user_project
.
files
.
new
(
'path'
=>
@target_definition
.
xcconfig_relative_path
)
targets
.
each
do
|
target
|
config_build_names_by_overriden_key
=
{}
target
.
build_configurations
.
each
do
|
config
|
config_name
=
config
.
attributes
[
"name"
]
if
@target_definition
.
xcconfig
@target_definition
.
xcconfig
.
attributes
.
each
do
|
key
,
value
|
target_value
=
config
.
build_settings
[
key
]
if
target_value
&&
!
target_value
.
include?
(
'$(inherited)'
)
config_build_names_by_overriden_key
[
key
]
||=
[]
config_build_names_by_overriden_key
[
key
]
<<
config_name
end
end
end
config
.
base_configuration
=
xcconfig
end
config_build_names_by_overriden_key
.
each
do
|
key
,
config_build_names
|
name
=
"
#{
target
.
attributes
[
"name"
]
}
[
#{
config_build_names
.
join
(
' - '
)
}
]"
puts
"
\n
[!] The target `
#{
name
}
' overrides the `
#{
key
}
' build setting defined in `
#{
@target_definition
.
xcconfig_relative_path
}
'."
.
yellow
puts
" - Use the `$(inherited)' flag, or"
puts
" - Remove the build settings from the target."
end
end
end
...
...
lib/cocoapods/podfile.rb
View file @
4980095b
...
...
@@ -143,6 +143,8 @@ module Pod
relative_to_srcroot
(
"Pods/
#{
xcconfig_name
}
"
).
to_s
end
attr_accessor
:xcconfig
def
copy_resources_script_name
"
#{
label
}
-resources.sh"
end
...
...
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