Commit 6419aec5 authored by Luke Redpath's avatar Luke Redpath

Merge branch 'master' into refactor-podroot

Conflicts:
	Rakefile
parents e0e487bd 72e9416e
......@@ -12,7 +12,7 @@ You specify the dependencies for your project in one easy text file. CocoaPods r
Ultimately, the goal is to improve discoverability of, and engagement in, third party open-source libraries, by creating a more centralized ecosystem.
See [the wiki](https://github.com/CocoaPods/CocoaPods/wiki) for more in depth information on several topics.
See the [NSScreencast episode about CocoaPods](http://nsscreencast.com/episodes/5-cocoapods) for a quick overview on how to get started, or [the wiki](https://github.com/CocoaPods/CocoaPods/wiki) for more in depth information on several topics.
## Installation
......@@ -26,6 +26,10 @@ CocoaPods runs on [Ruby](http://www.ruby-lang.org/en/). To install it run the fo
Now that you've got CocoaPods installed you can easily add it to your project.
NOTE 1: If you're using a fresh out of the box Mac with Lion using Xcode from the Mac App Store, you will need to install the Command Line Tools for Xcode first: [here](https://developer.apple.com/downloads/index.action)
NOTE 2: CocoaPods re-uses some of the RubyGems 1.3.6 classes. If you have an older version (pre OS X 10.7), you will have to update RubyGems: `$ gem update --system`.
## Adding it to your project
......
......@@ -72,7 +72,7 @@ namespace :spec do
end
task :all => "ext:cleanbuild" do
sh "bacon spec/**/*_spec.rb"
sh "bacon #{FileList['spec/**/*_spec.rb'].join(' ')}"
end
desc "Run all specs and build all examples"
......@@ -83,7 +83,9 @@ namespace :spec do
# For now we don't run the intgration spec, but it should be cleaned up so it can run on Travis.
desc "Run the travis CI specs"
task :travis => [:unpack_fixture_tarballs, :all]
task :travis => "ext:cleanbuild" do
sh "bacon #{FileList['spec/{functional,unit}/**/*_spec.rb'].join(' ')}"
end
desc "Rebuild all the fixture tarballs"
task :rebuild_fixture_tarballs do
......
#!/usr/bin/env ruby
Encoding.default_external = Encoding::UTF_8 if RUBY_VERSION > '1.8.7'
if $0 == __FILE__
$:.unshift File.expand_path('../../external/Xcodeproj/ext', __FILE__)
$:.unshift File.expand_path('../../external/Xcodeproj/lib', __FILE__)
......
Subproject commit 7a771d9cba7eeea0515ebeac84a9155a3d7c4988
Subproject commit 07cf34ba82c250093fd1bba5dd37d6298bcdfeeb
......@@ -9,7 +9,7 @@ install_resource()
case $1 in
*\.xib)
echo "ibtool --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xib`.nib ${SRCROOT}/Pods/$1 --sdk ${SDKROOT}"
ibtool --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xib`.nib ${SRCROOT}/Pods/$1 --sdk ${SDKROOT}
ibtool --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xib`.nib" "${SRCROOT}/Pods/$1" --sdk "${SDKROOT}"
;;
*)
echo "cp -R ${SRCROOT}/Pods/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
......
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