autoproj 1.8.2.b24 → 1.8.2.b25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/autoproj/autobuild.rb +1 -1
- data/lib/autoproj/cmdline.rb +7 -3
- data/lib/autoproj/version.rb +1 -1
- metadata +11 -11
data/lib/autoproj/autobuild.rb
CHANGED
@@ -289,7 +289,7 @@ module Autoproj
|
|
289
289
|
# Tries to find a handler automatically for 'full_path'
|
290
290
|
def self.package_handler_for(full_path)
|
291
291
|
if !Dir.enum_for(:glob, File.join(full_path, "*.orogen")).to_a.empty?
|
292
|
-
"orogen_package"
|
292
|
+
return "orogen_package", full_path
|
293
293
|
elsif File.file?(File.join(full_path, "CMakeLists.txt"))
|
294
294
|
dir = find_topmost_directory_containing(full_path) do |dir|
|
295
295
|
cmakelists = File.join(dir, 'CMakeLists.txt')
|
data/lib/autoproj/cmdline.rb
CHANGED
@@ -603,9 +603,6 @@ module Autoproj
|
|
603
603
|
block.call(pkg)
|
604
604
|
end
|
605
605
|
|
606
|
-
pkg.prepare
|
607
|
-
Rake::Task["#{pkg.name}-prepare"].instance_variable_set(:@already_invoked, true)
|
608
|
-
|
609
606
|
# Verify that its dependencies are there, and add
|
610
607
|
# them to the selected_packages set so that they get
|
611
608
|
# imported as well
|
@@ -642,6 +639,10 @@ module Autoproj
|
|
642
639
|
|
643
640
|
pkg = Autobuild::Package[pkg_name]
|
644
641
|
pkg.resolve_optional_dependencies
|
642
|
+
|
643
|
+
pkg.prepare
|
644
|
+
Rake::Task["#{pkg.name}-prepare"].instance_variable_set(:@already_invoked, true)
|
645
|
+
|
645
646
|
package_queue.concat(pkg.dependencies)
|
646
647
|
end
|
647
648
|
|
@@ -1072,6 +1073,9 @@ where 'mode' is one of:
|
|
1072
1073
|
@update_os_dependencies = true
|
1073
1074
|
when "snapshot"
|
1074
1075
|
@snapshot_dir = remaining_args.shift
|
1076
|
+
if !snapshot_dir
|
1077
|
+
raise ConfigError.new, "target directory missing\nusage: autoproj snapshot target_dir"
|
1078
|
+
end
|
1075
1079
|
Autobuild.do_update = false
|
1076
1080
|
Autobuild.do_build = false
|
1077
1081
|
@update_os_dependencies = false
|
data/lib/autoproj/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: autoproj
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.8.2.
|
4
|
+
version: 1.8.2.b25
|
5
5
|
prerelease: 6
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ date: 2012-10-13 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: autobuild
|
16
|
-
requirement: &
|
16
|
+
requirement: &7939040 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 1.6.0.rc1
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *7939040
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: utilrb
|
27
|
-
requirement: &
|
27
|
+
requirement: &7937940 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 1.6.0
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *7937940
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: highline
|
38
|
-
requirement: &
|
38
|
+
requirement: &7937260 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 1.5.0
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *7937260
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: rdoc
|
49
|
-
requirement: &
|
49
|
+
requirement: &7936480 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '3.10'
|
55
55
|
type: :development
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *7936480
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: hoe
|
60
|
-
requirement: &
|
60
|
+
requirement: &7935100 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ~>
|
@@ -65,7 +65,7 @@ dependencies:
|
|
65
65
|
version: '3.1'
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *7935100
|
69
69
|
description: autoproj is a manager for sets of software packages. It allows the user
|
70
70
|
to import and build packages from source, still using the underlying distribution's
|
71
71
|
native package manager for software that is available on it.
|