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
4e7b0c9e
Commit
4e7b0c9e
authored
Apr 03, 2014
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2004 from pietbrauer/use_configure_file
Use configure file
parents
86dce91c
83d79ac3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
3 deletions
+12
-3
CHANGELOG.md
CHANGELOG.md
+4
-0
Gemfile.lock
Gemfile.lock
+1
-1
lib.rb
lib/cocoapods/command/lib.rb
+5
-1
lib_spec.rb
spec/functional/command/lib_spec.rb
+2
-1
No files found.
CHANGELOG.md
View file @
4e7b0c9e
...
@@ -16,6 +16,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
...
@@ -16,6 +16,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
*
`pod update`
falls back to
`pod install`
if no Lockfile is present.
*
`pod update`
falls back to
`pod install`
if no Lockfile is present.
[
Marius Rackwitz
](
https://github.com/mrackwitz
)
[
Marius Rackwitz
](
https://github.com/mrackwitz
)
*
`pod lib create`
is now using the
`configure`
file instead of the
`_CONFIGURE.rb`
file.
[
Piet Brauer
](
https://github.com/pietbrauer
)
[
Orta Therox
](
https://github.com/orta
)
## 0.31.1
## 0.31.1
[
CocoaPods
](
https://github.com/CocoaPods/CocoaPods/compare/0.31.1...0.31.0
)
[
CocoaPods
](
https://github.com/CocoaPods/CocoaPods/compare/0.31.1...0.31.0
)
•
[
CocoaPods-Core
](
https://github.com/CocoaPods/Core/compare/0.31.1...0.31.0
)
•
[
CocoaPods-Core
](
https://github.com/CocoaPods/Core/compare/0.31.1...0.31.0
)
...
...
Gemfile.lock
View file @
4e7b0c9e
...
@@ -7,7 +7,7 @@ GIT
...
@@ -7,7 +7,7 @@ GIT
GIT
GIT
remote: https://github.com/CocoaPods/Core.git
remote: https://github.com/CocoaPods/Core.git
revision:
c90bffd8b6ceb52ba54f8dfe9ea23386d7e72131
revision:
57e0ae3c4be6c9198e4333fc67eb08b5f7f369d6
branch: master
branch: master
specs:
specs:
cocoapods-core (0.31.1)
cocoapods-core (0.31.1)
...
...
lib/cocoapods/command/lib.rb
View file @
4e7b0c9e
...
@@ -66,7 +66,11 @@ module Pod
...
@@ -66,7 +66,11 @@ module Pod
def
configure_template
def
configure_template
UI
.
section
(
"Configuring template"
)
do
UI
.
section
(
"Configuring template"
)
do
Dir
.
chdir
(
@name
)
do
Dir
.
chdir
(
@name
)
do
ruby!
"_CONFIGURE.rb
#{
@name
}
"
if
File
.
exists?
"configure"
system
"./configure
#{
@name
}
"
else
UI
.
warn
"Template does not have a configure file."
end
end
end
end
end
end
end
...
...
spec/functional/command/lib_spec.rb
View file @
4e7b0c9e
...
@@ -27,7 +27,8 @@ module Pod
...
@@ -27,7 +27,8 @@ module Pod
@sut
.
any_instance
.
stubs
(
:clone_template
)
@sut
.
any_instance
.
stubs
(
:clone_template
)
dir
=
SpecHelper
.
temporary_directory
+
'TestPod'
dir
=
SpecHelper
.
temporary_directory
+
'TestPod'
dir
.
mkpath
dir
.
mkpath
@sut
.
any_instance
.
expects
(
:ruby!
).
with
(
"_CONFIGURE.rb TestPod"
).
once
File
.
stubs
(
:exists?
).
with
(
"configure"
).
returns
(
true
)
@sut
.
any_instance
.
expects
(
:system
).
with
(
"./configure TestPod"
).
once
run_command
(
'lib'
,
'create'
,
'TestPod'
)
run_command
(
'lib'
,
'create'
,
'TestPod'
)
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