Commit 4e7b0c9e authored by Fabio Pelosin's avatar Fabio Pelosin

Merge pull request #2004 from pietbrauer/use_configure_file

Use configure file
parents 86dce91c 83d79ac3
...@@ -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)
......
...@@ -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)
......
...@@ -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
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment