autoproj 1.7.7 → 1.7.8

data/History.txt

@@ -1,3 +1,13 @@
+= Version 1.7.8
+ * fix bootstrap and switch-config with VCS options (i.e. setting a branch on
+   the git importer)
+ * amake now accepts options, i.e.
+   amake . --no-deps will only build the current package (without looking at
+   dependencies)
+ * added aup, which is a shortcut for autoproj update
+   as for amake, aup without arguments will update the package in which it is
+   started
+
 = Version 1.7.7
  * quickfix a trivial bug
 

data/Manifest.txt

@@ -2,6 +2,8 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+bin/amake
+bin/aup
 bin/autolocate
 bin/autoproj
 bin/autoproj_bootstrap
@@ -11,9 +13,9 @@ lib/autoproj/autobuild.rb
 lib/autoproj/base.rb
 lib/autoproj/cmdline.rb
 lib/autoproj/default.osdeps
+lib/autoproj/gitorious.rb
 lib/autoproj/manifest.rb
 lib/autoproj/options.rb
-lib/autoproj/gitorious.rb
 lib/autoproj/osdeps.rb
 lib/autoproj/system.rb
 lib/autoproj/version.rb

data/bin/amake

@@ -0,0 +1,8 @@
+#! /usr/bin/env ruby
+
+if ARGV.grep(/^-/).size == ARGV.size
+    ARGV.push '.'
+end
+ARGV.unshift "build"
+load File.expand_path('autoproj', File.dirname(__FILE__))
+

data/bin/aup

@@ -0,0 +1,8 @@
+#! /usr/bin/env ruby
+
+if ARGV.grep(/^-/).size == ARGV.size
+    ARGV.push '.'
+end
+ARGV.unshift "update"
+load File.expand_path('autoproj', File.dirname(__FILE__))
+

data/lib/autoproj/cmdline.rb

@@ -24,6 +24,11 @@ module Autoproj
         console.color(*args)
     end
 
+    # Displays an error message
+    def self.error(message)
+        Autoproj.progress("  ERROR: #{message}", :red, :bold)
+    end
+
     # Displays a warning message
     def self.warn(message)
         Autoproj.progress("  WARN: #{message}", :magenta)
@@ -967,8 +972,15 @@ where 'mode' is one of:
                 # configuration switch code. This is acceptable as long as we
                 # quit just after the switch
                 Dir.chdir(Autoproj.root_dir)
-                switch_config(*remaining_args)
-                exit 0
+                if switch_config(*remaining_args)
+                    Autobuild.do_update = true
+                    Autobuild.do_build  = false
+                    @update_os_dependencies = false
+                    @only_config = true
+                    remaining_args.clear
+                else
+                    exit 0
+                end
 
             when "reconfigure"
                 Autoproj.reconfigure = true
@@ -1174,6 +1186,16 @@ where 'mode' is one of:
             if vcs && (vcs.type == type && vcs.url == url)
                 # Don't need to do much: simply change the options and save the config
                 # file, the VCS handler will take care of the actual switching
+                vcs_def = Autoproj.user_config('manifest_source')
+                options.each do |opt|
+                    opt_name, opt_value = opt.split('=')
+                    vcs_def[opt_name] = opt_value
+                end
+                Autoproj.normalize_vcs_definition(vcs_def)
+                Autoproj.change_option "manifest_source", vcs_def.dup, true
+                Autoproj.save_config
+                true
+
             else
                 # We will have to delete the current autoproj directory. Ask the user.
                 opt = Autoproj::BuildOption.new("delete current config", "boolean",
@@ -1185,6 +1207,7 @@ where 'mode' is one of:
                 Dir.chdir(Autoproj.root_dir) do
                     do_switch_config(true, type, url, *options)
                 end
+                false
             end
         end
 
@@ -1192,8 +1215,8 @@ where 'mode' is one of:
             vcs_def = Hash.new
             vcs_def[:type] = type
             vcs_def[:url]  = VCSDefinition.to_absolute_url(url)
-            while !options.empty?
-                name, value = options.shift.split("=")
+            options.each do |opt|
+                name, value = opt.split("=")
                 vcs_def[name] = value
             end
 
@@ -1240,8 +1263,10 @@ where 'mode' is one of:
             Autoproj.change_option "manifest_source", vcs_def.dup, true
             Autoproj.save_config
 
-        rescue Exception
+        rescue Exception => e
+            Autoproj.error "switching configuration failed: #{e.message}"
             if backup_name
+                Autoproj.error "restoring old configuration"
                 FileUtils.rm_rf config_dir if config_dir
                 FileUtils.mv backup_name, config_dir
             end

data/lib/autoproj/gitorious.rb

@@ -52,7 +52,7 @@ module Autoproj
         # use http when git fails
         if Autobuild::Importer.respond_to?(:fallback) && options[:fallback_to_http]
             Autobuild::Importer.fallback do |package, importer|
-                root_rx = /^(?:http:\/\/git\.|git:\/\/|git@)#{Regexp.quote(base_url)}/
+                root_rx = /^(?:http:\/\/git\.|git:\/\/|git@)#{Regexp.quote(base_url)}:?/
                 if importer.kind_of?(Autobuild::Git) && importer.repository =~ root_rx && importer.repository !~ /^http/
                     Autoproj.warn "import from #{importer.repository} failed, falling back to using http for all packages on #{base_url}"
                     Autobuild::Package.each do |pkg_name, pkg|

data/lib/autoproj/manifest.rb

@@ -1693,13 +1693,12 @@ module Autoproj
 
         def each_package_dependency
             if block_given?
-                xml.xpath('//depend').each do |node|
+                depend_nodes = xml.xpath('//depend').to_a +
+                    xml.xpath('//depend_optional').to_a
+
+                depend_nodes.each do |node|
                     dependency = node['package']
-                    optional   =
-                        if node['optional'].to_s == '1'
-                            true
-                        else false
-                        end
+                    optional = (node['optional'].to_s == '1' || node.name == "depend_optional")
 
                     if dependency
                         yield(dependency, optional)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.7"
+    VERSION = "1.7.8"
 end

data/shell/autoproj_bash

@@ -9,11 +9,3 @@ function acd {
       return 0
     fi
 }
-
-function amake {
-    if test -z "$@"; then
-        autoproj fast-build .
-    else
-        autoproj fast-build "$@"
-    fi
-}

data/shell/autoproj_zsh

@@ -9,12 +9,3 @@ function acd {
       return 0
     fi
 }
-
-function amake {
-    if test -z "$@"; then
-        autoproj fast-build .
-    else
-        autoproj fast-build "$@"
-    fi
-}
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 7
-  - 7
-  version: 1.7.7
+  - 8
+  version: 1.7.8
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +01:00
+date: 2011-03-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,6 +174,8 @@ description: |-
 email: 
 - sylvain.joyeux@dfki.de
 executables: 
+- amake
+- aup
 - autolocate
 - autoproj
 - autoproj_bootstrap
@@ -190,6 +192,8 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- bin/amake
+- bin/aup
 - bin/autolocate
 - bin/autoproj
 - bin/autoproj_bootstrap
@@ -199,9 +203,9 @@ files:
 - lib/autoproj/base.rb
 - lib/autoproj/cmdline.rb
 - lib/autoproj/default.osdeps
+- lib/autoproj/gitorious.rb
 - lib/autoproj/manifest.rb
 - lib/autoproj/options.rb
-- lib/autoproj/gitorious.rb
 - lib/autoproj/osdeps.rb
 - lib/autoproj/system.rb
 - lib/autoproj/version.rb