diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-14 03:34:05 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-14 03:34:05 +0000 |
commit | 49ecbb73cc188b7eadac6cd1a459b3649a3262dc (patch) | |
tree | 347720b09a9bb0f08d442141b51ed074ce43e6b9 /bin | |
parent | 933da53cb15c52b34a4b4b3def7282f4b5fc9631 (diff) | |
download | ruby-49ecbb73cc188b7eadac6cd1a459b3649a3262dc.tar.gz ruby-49ecbb73cc188b7eadac6cd1a459b3649a3262dc.tar.xz ruby-49ecbb73cc188b7eadac6cd1a459b3649a3262dc.zip |
Renamespace lib/rdoc/markup from SM::SimpleMarkup to RDoc::Markup.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bin')
-rw-r--r-- | bin/rdoc | 51 |
1 files changed, 3 insertions, 48 deletions
@@ -8,59 +8,14 @@ # # $Revision$ -## Transitional Hack #### -# -# RDoc was initially distributed independently, and installed -# itself into <prefix>/lib/ruby/site_ruby/<ver>/rdoc... -# -# Now that RDoc is part of the distribution, it's installed into -# <prefix>/lib/ruby/<ver>, which unfortunately appears later in the -# search path. This means that if you have previously installed RDoc, -# and then install from ruby-lang, you'll pick up the old one by -# default. This hack checks for the condition, and readjusts the -# search path if necessary. - -def adjust_for_existing_rdoc(path) - - $stderr.puts %{ - It seems as if you have a previously-installed RDoc in - the directory #{path}. - - Because this is now out-of-date, you might want to consider - removing the directories: - - #{File.join(path, "rdoc")} - - and - - #{File.join(path, "markup")} - - } - - # Move all the site_ruby directories to the end - p $: - $:.replace($:.partition {|path| /site_ruby/ !~ path}.flatten) - p $: -end - -$:.each do |path| - if /site_ruby/ =~ path - rdoc_path = File.join(path, 'rdoc', 'rdoc.rb') - if File.exist?(rdoc_path) - adjust_for_existing_rdoc(path) - break - end - end -end - -## End of Transitional Hack ## - - require 'rdoc/rdoc' begin r = RDoc::RDoc.new r.document ARGV +rescue Interrupt + $stderr.puts + $stderr.puts "Interrupted" rescue RDoc::Error => e $stderr.puts e.message exit 1 |