Skip to content

Commit

Permalink
Revert 2236, version gets set at release time.
Browse files Browse the repository at this point in the history
Revert 2235, rubygems/rubygems_version.rb is not necessary.

Revert 2234 and 2233, replace with built-in rake task from Hoe.



git-svn-id: svn+ssh://rubyforge.org/var/svn/rubygems/trunk@2237 3d4018f9-ac1a-0410-99e9-8a154d859a19
  • Loading branch information
drbrain committed Jun 19, 2009
1 parent 2f6b581 commit a146200
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 25 deletions.
8 changes: 0 additions & 8 deletions ChangeLog
@@ -1,13 +1,5 @@
# -*- coding: utf-8 -*-

2009-06-14 Chad Woolley <thewoolleyman@gmail.com>

* Add install_build_dependencies.rb to ease installation of required
build dependencies.
* Update cruise_config.rb to invoke install_build_dependencies.rb
before running rake, to ensure dependencies are installed on
on Continuous Integration environments.

2009-06-04 Eric Hodel <drbrain@segment7.net>

* util/gem_prelude.rb.template: Backports from 1.9.
Expand Down
2 changes: 0 additions & 2 deletions Manifest.txt
Expand Up @@ -9,7 +9,6 @@ Rakefile
bin/gem
bin/update_rubygems
cruise_config.rb
install_build_dependencies.rb
lib/gauntlet_rubygems.rb
lib/rbconfig/datadir.rb
lib/rubygems.rb
Expand Down Expand Up @@ -79,7 +78,6 @@ lib/rubygems/platform.rb
lib/rubygems/remote_fetcher.rb
lib/rubygems/require_paths_builder.rb
lib/rubygems/requirement.rb
lib/rubygems/rubygems_version.rb
lib/rubygems/security.rb
lib/rubygems/server.rb
lib/rubygems/source_index.rb
Expand Down
3 changes: 2 additions & 1 deletion Rakefile
Expand Up @@ -29,7 +29,8 @@ hoe = Hoe.spec 'rubygems-update' do
'pkgs/sources/sources*.gem',
'scripts/*.hieraki')

extra_dev_deps << 'builder' << 'session'
extra_dev_deps << 'builder' << 'session' << 'hoe-seattlerb'
extra_dev_deps << ['minitest', '~> 1.4']
end

desc "Run just the functional tests"
Expand Down
4 changes: 2 additions & 2 deletions cruise_config.rb
Expand Up @@ -14,9 +14,9 @@
# Build the project by invoking shell script "build_my_app.sh". Keep in mind that when the script is invoked,
# current working directory is <em>[cruise&nbsp;data]</em>/projects/your_project/work, so if you do not keep build_my_app.sh
# in version control, it should be '../build_my_app.sh' instead
project.build_command = 'ruby install_build_dependencies.rb && rake'
project.build_command = 'rake check_extra_deps default'

# Ping Subversion for new revisions every 5 minutes (default: 30 seconds)
project.scheduler.polling_interval = 5.minutes

end
end
8 changes: 0 additions & 8 deletions install_build_dependencies.rb

This file was deleted.

3 changes: 2 additions & 1 deletion lib/rubygems.rb
Expand Up @@ -5,13 +5,14 @@
# See LICENSE.txt for permissions.
#++

require 'rubygems/rubygems_version'
require 'rubygems/defaults'
require 'thread'
require 'etc'

module Gem

RubyGemsVersion = VERSION = '1.3.4'

##
# Raised when RubyGems is unable to load or activate a gem. Contains the
# name and version requirements of the gem that either conflicts with
Expand Down
3 changes: 0 additions & 3 deletions lib/rubygems/rubygems_version.rb

This file was deleted.

0 comments on commit a146200

Please sign in to comment.