0
@@ -1,3 +1,13 @@
0
+2008-03-29  Eric Hodel  <drbrain@segment7.net>
0
+
0
+	* gemspecs/:  Removed.
0
+	* examples/:  Removed.
0
+	* doc/design/:  Removed.
0
+	* doc/rdoc_templates/:  Removed.
0
+	* Rakefile:  Package doc/release_notes/.
0
+	* setup.rb:  Use full path to release_notes, ensure RDoc can be
0
+	both removed and installed.
0
+
0
 2008-03-28  Eric Hodel  <drbrain@segment7.net>
0
 
0
   * bin/gem, Rakefile:  RubyGems now requires Ruby > 1.8.3.

0
@@ -32,10 +32,8 @@ For more details and other options, see:
0
 
0
 [./bin/...]       binary commands (gem, gem_server, etc)
0
 [./lib/...]       the RubyGems library
0
-[./packages/...]  default RubyGems packages (currently only 'sources')
0
+[./pkgs/...]  default RubyGems packages (currently only 'sources')
0
 [./test/...]      unit and functional tests
0
-[./examples/...]  example library w/gemspec for generating and installing gems
0
-[./gemspecs/...]  example gemspecs
0
 
0
 == Credits
0
 

0
@@ -214,14 +214,13 @@ end
0
 # Create a task to build the RDOC documentation tree.
0
 
0
 desc "Create the RDOC html files"
0
-rd = Rake::RDocTask.new("rdoc") { |rdoc|
0
+Rake::RDocTask.new("rdoc") { |rdoc|
0
   rdoc.rdoc_dir = 'html'
0
   rdoc.title    = "RubyGems"
0
   rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
0
   rdoc.rdoc_files.include('README', 'TODO', 'LICENSE.txt', 'GPL.txt')
0
   rdoc.rdoc_files.include('lib/**/*.rb')
0
   rdoc.rdoc_files.include('doc/**/*.rdoc')
0
-#  rdoc.rdoc_files.include('test/**/*.rb')
0
 }
0
 
0
 desc "Publish the RDOCs on RubyForge"
0
@@ -261,19 +260,20 @@ end
0
 # Package tasks
0
 
0
 PKG_FILES = FileList[
0
-  "Rakefile", "ChangeLog", "TODO", "README", "LICENSE.txt",
0
+  ".document",
0
+  "ChangeLog",
0
   "GPL.txt",
0
-  "setup.rb",
0
+  "LICENSE.txt",
0
+  "README",
0
+  "Rakefile",
0
+  "TODO",
0
   "bin/*",
0
-  "doc/*.css", "doc/*.rb",
0
-  "examples/**/*",
0
-  "gemspecs/**/*",
0
+  "doc/release_notes/*",
0
   "lib/**/*.rb",
0
   "pkgs/**/*",
0
-  "redist/*.gem",
0
   "scripts/*.rb",
0
-  "test/**/*",
0
-  ".document"
0
+  "setup.rb",
0
+  "test/**/*"
0
 ]
0
 PKG_FILES.exclude(%r(^test/temp(/|$)))
0
 

0
@@ -200,8 +200,12 @@ rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
0
 # install RDoc
0
 
0
 gem_doc_dir = File.join Gem.dir, 'doc'
0
+rubygems_name = "rubygems-#{Gem::RubyGemsVersion}"
0
+rubygems_doc_dir = File.join gem_doc_dir, rubygems_name
0
 
0
-if File.writable? gem_doc_dir then
0
+if File.writable? gem_doc_dir and
0
+   (not File.exist? rubygems_doc_dir or
0
+    File.writable? rubygems_doc_dir) then
0
   puts "Removing old RubyGems RDoc and ri"
0
   Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
0
     rm_rf dir
0
@@ -216,18 +220,14 @@ if File.writable? gem_doc_dir then
0
     r.document args
0
   end
0
 
0
-  rubygems_name = "rubygems-#{Gem::RubyGemsVersion}"
0
-
0
-  doc_dir = File.join Gem.dir, 'doc', rubygems_name
0
-
0
   unless ARGV.include? '--no-ri' then
0
-    ri_dir = File.join doc_dir, 'ri'
0
+    ri_dir = File.join rubygems_doc_dir, 'ri'
0
     puts "Installing #{rubygems_name} ri into #{ri_dir}"
0
     run_rdoc '--ri', '--op', ri_dir
0
   end
0
 
0
   unless ARGV.include? '--no-rdoc' then
0
-    rdoc_dir = File.join(doc_dir, 'rdoc')
0
+    rdoc_dir = File.join rubygems_doc_dir, 'rdoc'
0
     puts "Installing #{rubygems_name} rdoc into #{rdoc_dir}"
0
     run_rdoc '--op', rdoc_dir
0
   end
0
@@ -284,7 +284,7 @@ puts
0
 puts "-" * 78
0
 puts
0
 
0
-release_notes = File.join 'doc', 'release_notes',
0
+release_notes = File.join File.dirname(__FILE__), 'doc', 'release_notes',
0
                           "rel_#{Gem::RubyGemsVersion.gsub '.', '_'}.rdoc"
0
 
0
 if File.exist? release_notes then