Rakefile in ruby-vpi-18.0.2 vs Rakefile in ruby-vpi-19.0.0

@@ -24,11 +24,11 @@
 # load project information
   include RubyVPI
   PROJECT_SSH_URL  = "[e-mail]:/var/www/gforge-projects/#{PROJECT_ID}"
 
   load 'doc/history.rb'
-  head             = @history.first
+  head = @history.first
   PROJECT_VERSION  = head['Version']
   PROJECT_BIRTHDAY = head['Date']
 
 
 # utility
@@ -145,27 +145,20 @@
   end
 
 
 # distribution
 
-  desc "Prepare for distribution."
-  task :dist => ['ext', 'ref', :doc] do |t|
-    cd 'ext' do
-      sh 'rake swig'
-    end
-  end
-
   desc 'Publish documentation to website.'
-  task :web => [:web_ref, :web_doc]
+  task :web => ['ref/web', 'doc/web']
 
   desc "Publish reference documentation."
-  task :web_ref => 'ref' do |t|
+  task 'ref/web' => 'ref' do |t|
     upload PROJECT_SSH_URL, *t.prerequisites
   end
 
   desc "Publish user documentation."
-  task :web_doc => 'doc' do |t|
+  task 'doc/web' => 'doc' do |t|
     upload PROJECT_SSH_URL, *t.prerequisites
   end
 
   desc 'Connect to website FTP.'
   task :ftp do
@@ -195,11 +188,11 @@
 
 
 # packaging
 
   desc "Generate release packages."
-  task :release => [:clobber, :dist] do
+  task :release => [:ref, :doc] do
     sh 'rake package'
   end
 
   spec = Gem::Specification.new do |s|
     s.name              = PROJECT_ID
@@ -212,10 +205,11 @@
     s.add_dependency 'rake',       '>= 0.7.0'
     s.add_dependency 'rspec',      '>= 1.0.0'
     s.add_dependency 'rcov',       '>= 0.7.0'
     s.add_dependency 'xx'           # needed by rcov
     s.add_dependency 'ruby-debug', '>= 0.5.2'
+    s.add_dependency 'ruby-prof'
 
     s.requirements << "POSIX threads library"
     s.requirements << "C language compiler"
 
     s.files       = FileList['**/*'].exclude('_darcs')
@@ -232,27 +226,29 @@
 # installation
 
   desc "Configures the gem during installation."
   task :gem_config_inst do |t|
     # make documentation available to gem_server
-      gemDir  = File.dirname(__FILE__)
-      gemName = File.basename(gemDir)
-      docDir  = File.join('..', '..', 'doc', gemName)
+    gemDir  = File.dirname(__FILE__)
+    gemName = File.basename(gemDir)
+    docDir  = File.join('..', '..', 'doc', gemName)
 
-      mkdir_p docDir
-      ln_s gemDir, File.join(docDir, 'rdoc')
+    mkdir_p docDir
+    ln_s gemDir, File.join(docDir, 'rdoc')
   end
 
 
 # testing
 
   desc "Ensure that examples work with $SIMULATOR"
   task :test => :build do
     # ensures that current sources are tested instead of the installed gem
     ENV['RUBYLIB'] = PROJECT_LIBS
 
-    FileList['samp/**/*.rake'].each do |runner|
+    sim = ENV['SIMULATOR'] || 'cver'
+
+    FileList['examples/**/*.rake'].each do |runner|
       cd File.dirname(runner) do
-        sh 'rake', '-f', File.basename(runner), ENV['SIMULATOR'] || 'cver'
+        sh 'rake', '-f', File.basename(runner), sim
       end
     end
   end