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
0843a5ce
Commit
0843a5ce
authored
Sep 28, 2017
by
Dimitris Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure `SYMROOT` is properly set for all user configurations
parent
690c7f5e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
2 deletions
+14
-2
CHANGELOG.md
CHANGELOG.md
+3
-0
pods_project_generator.rb
lib/cocoapods/installer/xcode/pods_project_generator.rb
+2
-0
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
pods_project_generator_spec.rb
spec/unit/installer/xcode/pods_project_generator_spec.rb
+8
-1
No files found.
CHANGELOG.md
View file @
0843a5ce
...
@@ -16,6 +16,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -16,6 +16,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Paul Beusterien
](
https://github.com/paulb777
)
[
Paul Beusterien
](
https://github.com/paulb777
)
[
#7058
](
https://github.com/CocoaPods/CocoaPods/pull/7058
)
[
#7058
](
https://github.com/CocoaPods/CocoaPods/pull/7058
)
*
Ensure
`SYMROOT`
is properly set for all user configurations
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#7081
](
https://github.com/CocoaPods/CocoaPods/issues/7081
)
## 1.4.0.beta.1 (2017-09-24)
## 1.4.0.beta.1 (2017-09-24)
...
...
lib/cocoapods/installer/xcode/pods_project_generator.rb
View file @
0843a5ce
...
@@ -124,6 +124,8 @@ module Pod
...
@@ -124,6 +124,8 @@ module Pod
analysis_result
.
all_user_build_configurations
.
each
do
|
name
,
type
|
analysis_result
.
all_user_build_configurations
.
each
do
|
name
,
type
|
@project
.
add_build_configuration
(
name
,
type
)
@project
.
add_build_configuration
(
name
,
type
)
end
end
# Reset symroot just in case the user has added a new build configuration other than 'Debug' or 'Release'.
@project
.
symroot
=
Pod
::
Project
::
LEGACY_BUILD_ROOT
pod_names
=
pod_targets
.
map
(
&
:pod_name
).
uniq
pod_names
=
pod_targets
.
map
(
&
:pod_name
).
uniq
pod_names
.
each
do
|
pod_name
|
pod_names
.
each
do
|
pod_name
|
...
...
cocoapods-integration-specs
@
70e3f73d
Subproject commit
bf175988c4c3f2ee733674384fc6849e3d845da0
Subproject commit
70e3f73d93e62c964c0ef96c340d4a35e63907c5
spec/unit/installer/xcode/pods_project_generator_spec.rb
View file @
0843a5ce
...
@@ -55,7 +55,7 @@ module Pod
...
@@ -55,7 +55,7 @@ module Pod
@generator
=
@installer
.
send
(
:create_generator
)
@generator
=
@installer
.
send
(
:create_generator
)
end
end
describe
'
Preparing
'
do
describe
'
#prepare
'
do
before
do
before
do
@generator
.
send
(
:prepare
)
@generator
.
send
(
:prepare
)
end
end
...
@@ -71,6 +71,13 @@ module Pod
...
@@ -71,6 +71,13 @@ module Pod
@generator
.
project
.
build_settings
(
'App Store'
)[
'STRIP_INSTALLED_PRODUCT'
].
should
==
'NO'
@generator
.
project
.
build_settings
(
'App Store'
)[
'STRIP_INSTALLED_PRODUCT'
].
should
==
'NO'
end
end
it
'sets the SYMROOT to the default value for all configurations for the whole project'
do
@generator
.
project
.
build_settings
(
'Debug'
)[
'SYMROOT'
].
should
==
Pod
::
Project
::
LEGACY_BUILD_ROOT
@generator
.
project
.
build_settings
(
'Test'
)[
'SYMROOT'
].
should
==
Pod
::
Project
::
LEGACY_BUILD_ROOT
@generator
.
project
.
build_settings
(
'Release'
)[
'SYMROOT'
].
should
==
Pod
::
Project
::
LEGACY_BUILD_ROOT
@generator
.
project
.
build_settings
(
'App Store'
)[
'SYMROOT'
].
should
==
Pod
::
Project
::
LEGACY_BUILD_ROOT
end
it
'creates the Pods project'
do
it
'creates the Pods project'
do
@generator
.
send
(
:prepare
)
@generator
.
send
(
:prepare
)
@generator
.
project
.
class
.
should
==
Pod
::
Project
@generator
.
project
.
class
.
should
==
Pod
::
Project
...
...
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