autoproj 1.4.0 → 1.4.1

data/History.txt

@@ -1,3 +1,9 @@
+= Version 1.4.1
+ * add the envsh build mode: only update env.sh
+ * rebuild <package> and force-build <package> only apply by default on the
+   selected packages, not on their dependencies
+ * fix rebuild for Ruby packages
+
 = Version 1.4.0
  * ruby 1.9 compatible
  * fixes w.r.t. running autoproj under a Ruby interpreter that is not called

data/bin/autoproj

@@ -28,6 +28,7 @@ mail_config = Hash.new
 only_update_sources = false
 only_do_status      = false
 no_os_deps = false
+force_re_build_with_depends = false
 debug = false
 
 # Parse the configuration options
@@ -35,32 +36,42 @@ parser = OptionParser.new do |opts|
     opts.banner = <<-EOBANNER
 autoproj mode [options]
 where 'mode' is one of:
+
+-- Build
   build:  import, build and install all packages that need it. A package or package
     set name can be given, in which case only this package and its dependencies
     will be taken into account. Example:
 
     autoproj build drivers/hokuyo
       
-  force-build: triggers all build commands, i.e. don't be lazy like in "build"
   fast-build: builds without updating and without considering OS dependencies
-  rebuild: clean and then rebuild
+  force-build: triggers all build commands, i.e. don't be lazy like in "build".
+           If packages are selected on the command line, only those packages
+           will be affected unless the --with-depends option is used.
+  rebuild: clean and then rebuild. If packages are selected on the command line,
+           only those packages will be affected unless the --with-depends option
+           is used.
   doc:    generate and install documentation for packages that have some
-  update: only import/update packages, do not build them
+
+-- Status & Update
+  envsh: update the env.sh script
   status: displays the state of the packages w.r.t. their source VCS
+  list-sets:   list all available package sets
+  update: only import/update packages, do not build them
+  update-sets: update the package sets definitions, but not the packages themselves
+
+-- Autoproj Configuration
   bootstrap: starts a new autoproj installation. Usage:
     autoproj bootstrap [manifest_url|source_vcs source_url opt1=value1 opt2=value2 ...]
-  
-  list-sets:   list all available package sets
-  update-sets: update the package sets definitions
   switch-config: change where the configuration should be taken from. Syntax:
     autoproj switch-config source_vcs source_url opt1=value1 opt2=value2 ...
 
     For example:
     autoproj switch-config git git://github.com/doudou/rubim-all.git branch=all
 
-Additional options:
+-- Additional options:
     EOBANNER
-    opts.on("--reconfigure", "re-ask all configuration options (build mode only)") do
+    opts.on("--reconfigure", "re-ask all configuration options (build modes only)") do
         Autoproj.reconfigure = true
     end
     opts.on("--no-update", "do not update already checked-out packages (build mode only)") do
@@ -70,6 +81,9 @@ Additional options:
     opts.on("--no-osdeps", "do not install prepackaged dependencies") do
         no_os_deps = true
     end
+    opts.on("--with-depends", "apply rebuild and force-build to both packages selected on the command line and their dependencies") do
+        force_re_build_with_depends = true
+    end
 
     opts.on("--verbose", "verbose output") do
         Autoproj.verbose  = true
@@ -410,6 +424,10 @@ report(debug) do
         only_do_status      = true
         Autobuild.do_update = false
         no_os_deps = true
+    when "envsh"
+        Autobuild.do_build  = false
+        Autobuild.do_update = false
+        no_os_deps = true
     when "update-sets"
         only_update_sources = true
     when "list-sets"
@@ -767,6 +785,20 @@ report(debug) do
             manifest.install_os_dependencies(all_enabled_packages)
         end
 
+        if !selected_packages.empty? && !force_re_build_with_depends
+            if Autobuild.do_rebuild
+                selected_packages.each do |pkg_name|
+                    Autobuild::Package[pkg_name].prepare_for_rebuild
+                end
+                Autobuild.do_rebuild = false
+            elsif Autobuild.do_forced_build
+                selected_packages.each do |pkg_name|
+                    Autobuild::Package[pkg_name].prepare_for_forced_build
+                end
+                Autobuild.do_forced_build = false
+            end
+        end
+
         Autobuild.apply(all_enabled_packages, "autoproj-build")
     elsif !no_os_deps
         manifest.install_os_dependencies(all_enabled_packages)

data/doc/guide/src/autoproj_bootstrap

@@ -238,7 +238,10 @@ module Autoproj
         # call-seq:
         #   partition_packages(package_names) => os_packages, gem_packages
         def partition_packages(package_set, package_osdeps = Hash.new)
-            package_set = package_set.map { |name| OSDependencies.aliases[name] || name }.to_set
+            package_set = package_set.
+                map { |name| OSDependencies.aliases[name] || name }.
+                to_set
+
             osdeps, gems = [], []
             package_set.to_set.each do |name|
                 pkg_def = definitions[name]

data/lib/autoproj/autobuild.rb

@@ -181,13 +181,14 @@ def ruby_common(pkg) # :nodoc:
         extdir = File.join(srcdir, 'ext')
         if File.directory?(extdir)
             Find.find(extdir) do |file|
-                if file =~ /Makefile/
-                    Autobuild::Subprocess.run self, 'build', Autobuild.tool("make"), "-C", File.dirname(file), "clean"
+                if File.directory?(file) && File.basename(file) == "build"
+                    FileUtils.rm_rf file
+                    Find.prune
                 end
             end
             Find.find(extdir) do |file|
-                if File.directory?(file) && file == "build"
-                    FileUtils.rm_rf file
+                if File.basename(file) == "Makefile"
+                    Autobuild::Subprocess.run self, 'build', Autobuild.tool("make"), "-C", File.dirname(file), "clean"
                 end
             end
         end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.4.0"
+    VERSION = "1.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 +01:00
+date: 2010-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency