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
bf195d74
Commit
bf195d74
authored
Mar 04, 2012
by
Eloy Duran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Xcodeproj and fix changes needed and a few specs.
parent
8e182444
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
14 deletions
+13
-14
Xcodeproj
external/Xcodeproj
+1
-1
project.rb
lib/cocoapods/project.rb
+4
-7
project_integration.rb
lib/cocoapods/project_integration.rb
+2
-2
project_integration_spec.rb
spec/functional/project_integration_spec.rb
+2
-2
spec_helper.rb
spec/spec_helper.rb
+4
-2
No files found.
Xcodeproj
@
f44b042c
Subproject commit
0c238db95a890b9a07546a6c54ce9b84ab39dbf7
Subproject commit
f44b042cdcd4e4d314f15b146adb1970fc634ae4
lib/cocoapods/project.rb
View file @
bf195d74
...
@@ -41,25 +41,22 @@ module Pod
...
@@ -41,25 +41,22 @@ module Pod
framework
=
project
.
add_system_framework
(
platform
==
:ios
?
'Foundation'
:
'Cocoa'
)
framework
=
project
.
add_system_framework
(
platform
==
:ios
?
'Foundation'
:
'Cocoa'
)
framework
.
group
=
project
.
groups
.
new
({
'name'
=>
'Frameworks'
})
framework
.
group
=
project
.
groups
.
new
({
'name'
=>
'Frameworks'
})
project
.
main_group
<<
framework
.
group
project
.
main_group
<<
framework
.
group
products
=
project
.
groups
.
new
({
'name'
=>
'Products'
})
project
.
main_group
<<
products
project
.
root_object
.
products
=
products
configuration_list
=
project
.
objects
.
add
(
Xcodeproj
::
Project
::
Object
::
XCConfigurationList
,
{
configuration_list
=
project
.
objects
.
add
(
Xcodeproj
::
Project
::
Object
::
XCConfigurationList
,
{
'defaultConfigurationIsVisible'
=>
'0'
,
'defaultConfigurationIsVisible'
=>
'0'
,
'defaultConfigurationName'
=>
'Release'
,
'defaultConfigurationName'
=>
'Release'
,
})
})
config
=
config
uration_list
.
build_configurations
.
new
(
configuration_list
.
build_configurations
.
new
(
'name'
=>
'Debug'
,
'name'
=>
'Debug'
,
'buildSettings'
=>
build_settings
(
platform
,
:debug
)
'buildSettings'
=>
build_settings
(
platform
,
:debug
)
)
)
configuration_list
.
build_configurations
.
new
(
configuration_list
.
build_configurations
.
new
(
'name'
=>
'Release'
,
'name'
=>
'Release'
,
'buildSettings'
=>
build_settings
(
platform
,
:release
)
'buildSettings'
=>
build_settings
(
platform
,
:release
)
)
)
project
.
root_object
.
attributes
[
'buildConfigurationList'
]
=
configuration_list
.
uuid
project
.
root_object
.
attributes
[
'buildConfigurationList'
]
=
configuration_list
.
uuid
end
end
end
end
...
...
lib/cocoapods/project_integration.rb
View file @
bf195d74
...
@@ -68,7 +68,7 @@ module Pod
...
@@ -68,7 +68,7 @@ module Pod
def
base_project_configurations_on_xcconfig
(
project
,
xcconfig_file
)
def
base_project_configurations_on_xcconfig
(
project
,
xcconfig_file
)
project
.
targets
.
each
do
|
target
|
project
.
targets
.
each
do
|
target
|
target
.
build_configurations
.
each
do
|
config
|
target
.
build_configurations
.
each
do
|
config
|
config
.
base
C
onfiguration
=
xcconfig_file
config
.
base
_c
onfiguration
=
xcconfig_file
end
end
end
end
end
end
...
@@ -76,7 +76,7 @@ module Pod
...
@@ -76,7 +76,7 @@ module Pod
def
add_pods_library_to_each_target_in_project
(
project
,
pods_library
)
def
add_pods_library_to_each_target_in_project
(
project
,
pods_library
)
project
.
targets
.
each
do
|
target
|
project
.
targets
.
each
do
|
target
|
target
.
frameworks_build_phases
.
each
do
|
build_phase
|
target
.
frameworks_build_phases
.
each
do
|
build_phase
|
build_phase
.
files
<<
pods_library
.
build
F
iles
.
new
build_phase
.
files
<<
pods_library
.
build
_f
iles
.
new
end
end
end
end
end
end
...
...
spec/functional/project_integration_spec.rb
View file @
bf195d74
...
@@ -32,7 +32,7 @@ describe Pod::ProjectIntegration do
...
@@ -32,7 +32,7 @@ describe Pod::ProjectIntegration do
@sample_project
.
targets
.
each
do
|
target
|
@sample_project
.
targets
.
each
do
|
target
|
target
.
build_configurations
.
each
do
|
config
|
target
.
build_configurations
.
each
do
|
config
|
config
.
base
C
onfiguration
.
should
==
xcconfig_file
config
.
base
_c
onfiguration
.
should
==
xcconfig_file
end
end
end
end
end
end
...
@@ -52,7 +52,7 @@ describe Pod::ProjectIntegration do
...
@@ -52,7 +52,7 @@ describe Pod::ProjectIntegration do
it
'adds a Copy Pods Resources build phase to each target'
do
it
'adds a Copy Pods Resources build phase to each target'
do
@sample_project
.
targets
.
each
do
|
target
|
@sample_project
.
targets
.
each
do
|
target
|
expected_phase
=
target
.
shell_script_build_phases
.
where
(
:name
=>
"Copy Pods Resources"
)
expected_phase
=
target
.
shell_script_build_phases
.
where
(
:name
=>
"Copy Pods Resources"
)
expected_phase
.
shell
S
cript
.
strip
.
should
==
"
\"
${SRCROOT}/Pods/Pods-resources.sh
\"
"
.
strip
expected_phase
.
shell
_s
cript
.
strip
.
should
==
"
\"
${SRCROOT}/Pods/Pods-resources.sh
\"
"
.
strip
end
end
end
end
end
end
...
...
spec/spec_helper.rb
View file @
bf195d74
...
@@ -56,4 +56,7 @@ end
...
@@ -56,4 +56,7 @@ end
def
copy_fixture_to_pod
(
name
,
pod
)
def
copy_fixture_to_pod
(
name
,
pod
)
path
=
SpecHelper
::
Fixture
.
fixture
(
name
)
path
=
SpecHelper
::
Fixture
.
fixture
(
name
)
FileUtils
.
cp_r
(
path
,
pod
.
root
)
FileUtils
.
cp_r
(
path
,
pod
.
root
)
end
end
\ No newline at end of file
SpecHelper
::
Fixture
.
fixture
(
'banana-lib'
)
# ensure it exists
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