autoproj 1.11.0.rc6 → 1.11.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a374debc4b6e9766d50fbbdfa1c3a1d3ab0a956c
-  data.tar.gz: 6be295348b0976330770862336ff7c9d0d6918c1
+  metadata.gz: 14b89ab39afd8458a961c2a6377fb0a9612ed54c
+  data.tar.gz: e0e0b962d21398865dbe0b8c286287b0ee7b0cd8
 SHA512:
-  metadata.gz: 43763fb3e6bc507e528a8cf6b361bbe7f394de94cf4c30e094d65a6167b69c8ad0406f5c534e12de96934d0a826f71d780d3dddbcc980d104bb8df6254f25da3
-  data.tar.gz: 671127d1555c5e1117946ffc5635b57ee0149cd8e4d0afba9f932f44afec718ecd77b168ec842ea89c44710c493156b3ff10b1f79f4777efeb93ae3039f445cb
+  metadata.gz: fb711e7b42acf4104ab041753e53318faf1e9cac5b6b7bf5b12431028e4bd959970cb0d6fadba05961ac16c8014c4d5c5a252885deeac4e5582bf73568b810c5
+  data.tar.gz: a0f4c93397ce1bbe70c11ccf8a45339f91fcaa5e1e991f19d13470742324e525763c02fa3cb18a58b63839cebd74408ad0adc73ec05af2a2f53f477a388ace27

data/Manifest.txt

@@ -35,11 +35,11 @@ lib/autoproj/gitorious.rb
 lib/autoproj/installation_manifest.rb
 lib/autoproj/manifest.rb
 lib/autoproj/metapackage.rb
-lib/autoproj/ops/main_config_switcher.rb
 lib/autoproj/ops/build.rb
 lib/autoproj/ops/cache.rb
 lib/autoproj/ops/configuration.rb
 lib/autoproj/ops/loader.rb
+lib/autoproj/ops/main_config_switcher.rb
 lib/autoproj/ops/tools.rb
 lib/autoproj/options.rb
 lib/autoproj/osdeps.rb
@@ -62,6 +62,7 @@ samples/autoproj/overrides.yml
 samples/manifest.xml
 samples/osdeps.yml
 shell/autoproj_bash
+shell/autoproj_sh
 shell/autoproj_zsh
 test/data/empty_manifest.xml
 test/data/full_manifest.xml

data/bin/autoproj_bootstrap

@@ -2630,17 +2630,10 @@ module Autoproj
            end
 
         shell_dir = File.expand_path(File.join("..", "..", "shell"), File.dirname(__FILE__))
-        if Autoproj.shell_helpers? && shell = ENV['SHELL']
-            shell_kind = File.basename(shell)
-            if shell_kind =~ /^\w+$/
-                shell_file = File.join(shell_dir, "autoproj_#{shell_kind}")
-                if File.exists?(shell_file)
-                    Autoproj.message
-                    Autoproj.message "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
-                    Autoproj.message "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
-                    Autobuild.env_source_after(shell_file)
-                end
-            end
+        if Autoproj.shell_helpers?
+            Autoproj.message "sourcing autoproj shell helpers"
+            Autoproj.message "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
+            Autobuild.env_source_after(File.join(shell_dir, "autoproj_sh"))
         end
 
         File.open(filename, "w") do |io|

data/lib/autoproj/system.rb

@@ -176,17 +176,10 @@ module Autoproj
            end
 
         shell_dir = File.expand_path(File.join("..", "..", "shell"), File.dirname(__FILE__))
-        if Autoproj.shell_helpers? && shell = ENV['SHELL']
-            shell_kind = File.basename(shell)
-            if shell_kind =~ /^\w+$/
-                shell_file = File.join(shell_dir, "autoproj_#{shell_kind}")
-                if File.exists?(shell_file)
-                    Autoproj.message
-                    Autoproj.message "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
-                    Autoproj.message "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
-                    Autobuild.env_source_after(shell_file)
-                end
-            end
+        if Autoproj.shell_helpers?
+            Autoproj.message "sourcing autoproj shell helpers"
+            Autoproj.message "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
+            Autobuild.env_source_after(File.join(shell_dir, "autoproj_sh"))
         end
 
         File.open(filename, "w") do |io|

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.11.0.rc6"
+    VERSION = "1.11.0.rc7"
 end

data/shell/autoproj_sh

@@ -0,0 +1,12 @@
+acd() {
+    local pkg_path
+    pkg_path=$(autoproj locate $1)
+
+    if [ $? != 0 ]; then
+      return 1
+    else
+      pkg_path=$(echo $pkg_path | tail -1)
+      cd $pkg_path
+      return 0
+    fi
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc6
+  version: 1.11.0.rc7
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -178,6 +178,7 @@ files:
 - samples/manifest.xml
 - samples/osdeps.yml
 - shell/autoproj_bash
+- shell/autoproj_sh
 - shell/autoproj_zsh
 - test/data/empty_manifest.xml
 - test/data/full_manifest.xml