lib/autoproj/autobuild.rb in autoproj-1.9.5.rc3 vs lib/autoproj/autobuild.rb in autoproj-1.9.5.rc4

@@ -364,11 +364,11 @@
         package_definition.add_setup_block(block)
     end
 end
 
 # Common setup for packages
-def package_common(package_type, spec, &block) # :nodoc:
+def package_common(package_type, spec, &block)
     package_name = Autoproj.package_name_from_options(spec)
 
     if Autobuild::Package[package_name]
         current_file = Autoproj.current_file[1]
         old_file     = Autoproj.manifest.definition_file(package_name)
@@ -505,10 +505,11 @@
     package_common(:import, options) do |pkg|
         pkg.exclude << /\.so$/
         pkg.exclude << /Makefile$/
         pkg.exclude << /mkmf.log$/
         pkg.exclude << /\.o$/
+        pkg.exclude << /doc$/
 
         pkg.extend Autoproj::RubyPackage
         pkg.rake_setup_task = "default"
         pkg.rake_doc_task   = "redocs"
 
@@ -656,10 +657,10 @@
     def snapshot(package, target_dir)
         archive_dir = File.join(target_dir, 'archives')
         FileUtils.mkdir_p archive_dir
         FileUtils.cp @cachefile, archive_dir
 
-        { 'url' =>  File.join('$AUTOPROJ_SOURCE_DIR', File.basename(@cachefile)) }
+        { 'url' =>  "file://$AUTOPROJ_SOURCE_DIR/archives/#{File.basename(@cachefile)}" }
     end
 end
 
 def package(name)
     Autobuild::Package[name]