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
186c43dd
Commit
186c43dd
authored
Feb 08, 2016
by
Marius Rackwitz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PodTarget] Use label to scope build dir
parent
170ba7dc
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
pod_target.rb
lib/cocoapods/target/pod_target.rb
+1
-1
aggregate_xcconfig_spec.rb
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
+2
-2
pod_target_spec.rb
spec/unit/target/pod_target_spec.rb
+2
-2
No files found.
lib/cocoapods/target/pod_target.rb
View file @
186c43dd
...
@@ -257,7 +257,7 @@ module Pod
...
@@ -257,7 +257,7 @@ module Pod
# @return [String] The absolute path to the configuration build dir
# @return [String] The absolute path to the configuration build dir
#
#
def
configuration_build_dir
(
dir
=
'$CONFIGURATION_BUILD_DIR'
)
def
configuration_build_dir
(
dir
=
'$CONFIGURATION_BUILD_DIR'
)
"
#{
dir
}
/
#{
pod_name
}#{
scoped?
?
"/
#{
scope_suffix
}
"
:
''
}
"
"
#{
dir
}
/
#{
label
}
"
end
end
private
private
...
...
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
View file @
186c43dd
...
@@ -205,11 +205,11 @@ module Pod
...
@@ -205,11 +205,11 @@ module Pod
end
end
it
'adds the framework build path to the xcconfig, with quotes, as framework search paths'
do
it
'adds the framework build path to the xcconfig, with quotes, as framework search paths'
do
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
==
'$(inherited) "$CONFIGURATION_BUILD_DIR/BananaLib
/iOS" "$CONFIGURATION_BUILD_DIR/OrangeFramework/
iOS"'
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
==
'$(inherited) "$CONFIGURATION_BUILD_DIR/BananaLib
-iOS" "$CONFIGURATION_BUILD_DIR/OrangeFramework-
iOS"'
end
end
it
'adds the framework header paths to the xcconfig, with quotes, as local headers'
do
it
'adds the framework header paths to the xcconfig, with quotes, as local headers'
do
expected
=
'$(inherited) -iquote "$CONFIGURATION_BUILD_DIR/BananaLib
/iOS/BananaLib.framework/Headers" -iquote "$CONFIGURATION_BUILD_DIR/OrangeFramework/
iOS/OrangeFramework.framework/Headers"'
expected
=
'$(inherited) -iquote "$CONFIGURATION_BUILD_DIR/BananaLib
-iOS/BananaLib.framework/Headers" -iquote "$CONFIGURATION_BUILD_DIR/OrangeFramework-
iOS/OrangeFramework.framework/Headers"'
@xcconfig
.
to_hash
[
'OTHER_CFLAGS'
].
should
==
expected
@xcconfig
.
to_hash
[
'OTHER_CFLAGS'
].
should
==
expected
end
end
end
end
...
...
spec/unit/target/pod_target_spec.rb
View file @
186c43dd
...
@@ -163,9 +163,9 @@ module Pod
...
@@ -163,9 +163,9 @@ module Pod
it
'returns the path for the CONFIGURATION_BUILD_DIR build setting'
do
it
'returns the path for the CONFIGURATION_BUILD_DIR build setting'
do
@pod_target
.
configuration_build_dir
.
should
==
'$CONFIGURATION_BUILD_DIR/BananaLib'
@pod_target
.
configuration_build_dir
.
should
==
'$CONFIGURATION_BUILD_DIR/BananaLib'
@pod_target
.
scoped
.
first
.
configuration_build_dir
.
should
==
'$CONFIGURATION_BUILD_DIR/BananaLib
/
Pods'
@pod_target
.
scoped
.
first
.
configuration_build_dir
.
should
==
'$CONFIGURATION_BUILD_DIR/BananaLib
-
Pods'
@pod_target
.
configuration_build_dir
(
'$PODS_SHARED_BUILD_DIR'
).
should
==
'$PODS_SHARED_BUILD_DIR/BananaLib'
@pod_target
.
configuration_build_dir
(
'$PODS_SHARED_BUILD_DIR'
).
should
==
'$PODS_SHARED_BUILD_DIR/BananaLib'
@pod_target
.
scoped
.
first
.
configuration_build_dir
(
'$PODS_SHARED_BUILD_DIR'
).
should
==
'$PODS_SHARED_BUILD_DIR/BananaLib
/
Pods'
@pod_target
.
scoped
.
first
.
configuration_build_dir
(
'$PODS_SHARED_BUILD_DIR'
).
should
==
'$PODS_SHARED_BUILD_DIR/BananaLib
-
Pods'
end
end
end
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