autoproj 1.3.1 → 1.3.2

data/History.txt

@@ -1,3 +1,6 @@
+= Version 1.3.2
+ * Fix: GEM_HOME/bin was not added to env.sh
+
 = Version 1.3.1
  * quick-fix bootstrapping from a git repository, and the switch-config
    command

data/bin/autoproj

@@ -440,6 +440,7 @@ report(debug) do
     # Set up some important autobuild parameters
     Autoproj.env_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB', 'LD_LIBRARY_PATH'
     Autoproj.env_set 'GEM_HOME', Autoproj.gem_home
+    Autoproj.env_add 'PATH', File.join(Autoproj.gem_home, 'bin')
     Autoproj.env_set 'RUBYOPT', "-rubygems"
     Autobuild.prefix  = Autoproj.build_dir
     Autobuild.srcdir  = root_dir
@@ -471,16 +472,15 @@ report(debug) do
             set << source.vcs.type if !source.local?
         end
 
-    # If we need to install some packages to import our remote sources, do it
-    if !no_os_deps && !source_os_dependencies.empty?
-        STDERR.puts color("autoproj: installing prepackaged dependencies to access the source definitions", :bold)
-        osdeps = manifest.known_os_packages
-        osdeps.install(source_os_dependencies)
-    end
-
     # Update the remote sources if there are any
     if manifest.has_remote_sources?
         STDERR.puts color("autoproj: updating remote definitions of package sets", :bold)
+        # If we need to install some packages to import our remote sources, do it
+        if !no_os_deps
+            osdeps = manifest.known_os_packages
+            osdeps.install(source_os_dependencies)
+        end
+
         manifest.update_remote_sources
         STDERR.puts
     end
@@ -492,7 +492,7 @@ report(debug) do
     end
 
     # Load the required autobuild definitions
-    STDERR.puts color("autoproj: loading build files and configuring build", :bold)
+    STDERR.puts color("autoproj: loading ...", :bold)
     if !Autoproj.reconfigure?
         STDERR.puts color("run 'autoproj --reconfigure' to change configuration values", :bold)
     end
@@ -590,14 +590,6 @@ report(debug) do
     end
     selected_packages = selected_packages.to_set
 
-    # Install prepackaged dependencies needed to import and build the packages
-    if !no_os_deps
-        STDERR.puts
-        STDERR.puts color("autoproj: installing prepackaged dependencies for build system & version control", :bold)
-        osdeps = manifest.known_os_packages
-        osdeps.install(Autoproj.build_system_dependencies - source_os_dependencies)
-    end
-
     # Now starts a different stage of the whole build. Until now, we were
     # working on the whole package set. Starting from now, we need to build the
     # package sets based on the layout file
@@ -632,6 +624,14 @@ report(debug) do
         exit(0)
     end
 
+    STDERR.puts
+    STDERR.puts color("autoproj: importing and loading selected packages", :bold)
+
+    # Install prepackaged dependencies needed to import and build the packages
+    if !no_os_deps
+        osdeps = manifest.known_os_packages
+        osdeps.install(Autoproj.build_system_dependencies - source_os_dependencies)
+    end
 
     # First thing: do the import. We are handling the imports ourselves as it
     # allows us to complete the enabled_packages set with the package
@@ -661,8 +661,6 @@ report(debug) do
         seen |= packages
     end
 
-    STDERR.puts
-    STDERR.puts color("autoproj: importing and loading selected packages", :bold)
     all_packages         = Set.new
     all_enabled_packages = Set.new
     all_sublayouts       = Set.new
@@ -709,31 +707,23 @@ report(debug) do
         Autobuild.do_update = old_update_flag
     end
 
-    if (mode =~ /build/)
-        missing_packages = all_packages.find_all { |pkg_name| !File.directory?(Autobuild::Package[pkg_name].srcdir) }
-        if missing_packages.empty?
-            # Backward compatibility: check if name/env.sh exists, and if it is
-            # the case, simply replace it with a link to the root one. And issue
-            # a warning
-            all_sublayouts.each do |name|
-                env_file = File.join(Autoproj.root_dir, name, "env.sh")
-                if name != '/' && File.file?(env_file)
-                    File.open(env_file, 'w') do |io|
-                        io.puts "source #{Autoproj.root_dir}/env.sh"
-                    end
+    missing_packages = all_packages.find_all { |pkg_name| !File.directory?(Autobuild::Package[pkg_name].srcdir) }
+    if missing_packages.empty?
+        # Backward compatibility: check if name/env.sh exists, and if it is
+        # the case, simply replace it with a link to the root one. And issue
+        # a warning
+        all_sublayouts.each do |name|
+            env_file = File.join(Autoproj.root_dir, name, "env.sh")
+            if name != '/' && File.file?(env_file)
+                File.open(env_file, 'w') do |io|
+                    io.puts "source #{Autoproj.root_dir}/env.sh"
                 end
             end
-            Autoproj.export_env_sh
-        else
-            STDERR.puts color("WARN: #{missing_packages.join(", ")} are not yet imported, #{Autoproj.root_dir}/env.sh might not be up to date", :magenta)
-        end
-    end
-
-    if !no_os_deps
-        if !all_enabled_packages.empty?
-            STDERR.puts color("autoproj: installing prepackaged dependencies", :bold)
-            manifest.install_os_dependencies(all_enabled_packages)
         end
+        Autoproj.export_env_sh
+        STDERR.puts color("autoproj: updated #{Autoproj.root_dir}/env.sh", :green)
+    else
+        STDERR.puts color("autoproj: #{missing_packages.join(", ")} are not yet imported, #{Autoproj.root_dir}/env.sh might not be up to date", :red)
     end
 
     if all_enabled_packages.empty?
@@ -744,6 +734,11 @@ report(debug) do
         else
             STDERR.puts color("autoproj: building and installing packages", :bold)
         end
+
+        if !no_os_deps
+            manifest.install_os_dependencies(all_enabled_packages)
+        end
+
         Autobuild.apply(all_enabled_packages, "autoproj-build")
     end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -90,7 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.4.0
     version: 
 description: |-
   What is Autoproj