autoproj 1.13.2.b4 → 1.13.2
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.
- checksums.yaml +4 -4
- data/Rakefile +3 -3
- data/bin/autoproj_bootstrap +9 -49
- data/lib/autoproj/cmdline.rb +0 -15
- data/lib/autoproj/default.osdeps +4 -15
- data/lib/autoproj/gitorious.rb +1 -1
- data/lib/autoproj/ops/configuration.rb +9 -28
- data/lib/autoproj/osdeps.rb +6 -34
- data/lib/autoproj/version.rb +1 -1
- metadata +24 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0df56aa856088b064dd5018e79767be3ef8f475f
|
4
|
+
data.tar.gz: 4010bbafbf52b45645d306f0901857ce5b9cc7fc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0c999cfbf4b8627b222f4c31e8bc2601d93f19765950ae8b208a57bae3c98dc24d180bccf0125b2176367c8072d0ae24a91e53ec18010c91b0a68dd7b66b1cc2
|
7
|
+
data.tar.gz: 5e55b9559faa7731084c4f598626e8a807258d650626a9a387acb026404ba11e4f3eea1ee7460f3565af5d22eff6bd505f40c415cae22d4d1af964235e4c5032
|
data/Rakefile
CHANGED
@@ -18,9 +18,9 @@ Utilrb::Rake.hoe do
|
|
18
18
|
license 'BSD'
|
19
19
|
|
20
20
|
extra_deps <<
|
21
|
-
['autobuild',
|
22
|
-
['utilrb', '~> 2.0.0'] <<
|
23
|
-
['highline', '>= 1.
|
21
|
+
['autobuild', '~> 1.9', '>= 1.9.0'] <<
|
22
|
+
['utilrb', '~> 2.0', '>= 2.0.0'] <<
|
23
|
+
['highline', '~> 1.7', '>= 1.7.0']
|
24
24
|
end
|
25
25
|
end
|
26
26
|
end
|
data/bin/autoproj_bootstrap
CHANGED
@@ -878,15 +878,6 @@ fi
|
|
878
878
|
"emerge --noreplace '%s'")
|
879
879
|
end
|
880
880
|
end
|
881
|
-
# Package manager interface for systems that use pkg (i.e. FreeBSD) as
|
882
|
-
# their package manager
|
883
|
-
class PkgManager < ShellScriptManager
|
884
|
-
def initialize
|
885
|
-
super(['pkg'], true,
|
886
|
-
"pkg install -y '%s'",
|
887
|
-
"pkg install -y '%s'")
|
888
|
-
end
|
889
|
-
end
|
890
881
|
|
891
882
|
#Package manger for OpenSuse and Suse (untested)
|
892
883
|
class ZypperManager < ShellScriptManager
|
@@ -1500,8 +1491,7 @@ fi
|
|
1500
1491
|
PackageManagers::YumManager,
|
1501
1492
|
PackageManagers::PortManager,
|
1502
1493
|
PackageManagers::ZypperManager,
|
1503
|
-
PackageManagers::PipManager
|
1504
|
-
PackageManagers::PkgManager]
|
1494
|
+
PackageManagers::PipManager]
|
1505
1495
|
|
1506
1496
|
# Mapping from OS name to package manager name
|
1507
1497
|
#
|
@@ -1521,8 +1511,7 @@ fi
|
|
1521
1511
|
'fedora' => 'yum',
|
1522
1512
|
'macos-port' => 'macports',
|
1523
1513
|
'macos-brew' => 'brew',
|
1524
|
-
'opensuse' => 'zypper'
|
1525
|
-
'freebsd' => 'pkg'
|
1514
|
+
'opensuse' => 'zypper'
|
1526
1515
|
}
|
1527
1516
|
|
1528
1517
|
# The information contained in the OSdeps files, as a hash
|
@@ -1729,9 +1718,6 @@ fi
|
|
1729
1718
|
version =~/.*VERSION\s+=\s+([^\s]+)/
|
1730
1719
|
version = $1
|
1731
1720
|
[['opensuse'], [version.strip]]
|
1732
|
-
elsif Autobuild.freebsd?
|
1733
|
-
version = `uname -r`.strip.split("-")[0]
|
1734
|
-
[['freebsd'],[version]]
|
1735
1721
|
end
|
1736
1722
|
end
|
1737
1723
|
|
@@ -1880,20 +1866,6 @@ fi
|
|
1880
1866
|
|
1881
1867
|
class InvalidRecursiveStatement < Autobuild::Exception; end
|
1882
1868
|
|
1883
|
-
# Return the path to the osdeps name for a given package name while
|
1884
|
-
# accounting for package aliases
|
1885
|
-
#
|
1886
|
-
# returns an array contain the path starting with name and
|
1887
|
-
# ending at the resolved name
|
1888
|
-
def self.resolve_name(name)
|
1889
|
-
path = [ name ]
|
1890
|
-
while OSDependencies.aliases.has_key?(name)
|
1891
|
-
name = OSDependencies.aliases[name]
|
1892
|
-
path << name
|
1893
|
-
end
|
1894
|
-
path
|
1895
|
-
end
|
1896
|
-
|
1897
1869
|
# Return the list of packages that should be installed for +name+
|
1898
1870
|
#
|
1899
1871
|
# The following two simple return values are possible:
|
@@ -1912,8 +1884,9 @@ fi
|
|
1912
1884
|
# name and version. The package list might be empty even if status ==
|
1913
1885
|
# FOUND_PACKAGES, for instance if the ignore keyword is used.
|
1914
1886
|
def resolve_package(name)
|
1915
|
-
|
1916
|
-
|
1887
|
+
while OSDependencies.aliases.has_key?(name)
|
1888
|
+
name = OSDependencies.aliases[name]
|
1889
|
+
end
|
1917
1890
|
|
1918
1891
|
os_names, os_versions = OSDependencies.operating_system
|
1919
1892
|
os_names = os_names.dup
|
@@ -2134,8 +2107,7 @@ fi
|
|
2134
2107
|
dependencies.each do |name|
|
2135
2108
|
result = resolve_package(name)
|
2136
2109
|
if !result
|
2137
|
-
|
2138
|
-
raise MissingOSDep.new, "there is no osdeps definition for #{path.last} (search tree: #{path.join("->")})"
|
2110
|
+
raise MissingOSDep.new, "there is no osdeps definition for #{name}"
|
2139
2111
|
end
|
2140
2112
|
|
2141
2113
|
if result.empty?
|
@@ -2965,12 +2937,11 @@ build-essential:
|
|
2965
2937
|
opensuse:
|
2966
2938
|
- "@devel_C_C++"
|
2967
2939
|
- gcc-c++
|
2968
|
-
default: clang
|
2969
2940
|
autobuild:
|
2970
|
-
- gem: autobuild
|
2941
|
+
- gem: autobuild
|
2971
2942
|
- osdep: readline
|
2972
2943
|
autoproj:
|
2973
|
-
- gem: autoproj
|
2944
|
+
- gem: autoproj
|
2974
2945
|
- osdep: readline
|
2975
2946
|
readline:
|
2976
2947
|
debian,ubuntu: libreadline-dev
|
@@ -2987,10 +2958,9 @@ git:
|
|
2987
2958
|
gentoo: dev-vcs/git
|
2988
2959
|
arch: git
|
2989
2960
|
fedora: git
|
2990
|
-
macos-port: git
|
2961
|
+
macos-port: git-core
|
2991
2962
|
macos-brew: git
|
2992
2963
|
opensuse: git
|
2993
|
-
freebsd: git
|
2994
2964
|
hg:
|
2995
2965
|
debian,ubuntu: mercurial
|
2996
2966
|
gentoo: dev-vcs/mercurial
|
@@ -2998,7 +2968,6 @@ hg:
|
|
2998
2968
|
fedora: mercurial
|
2999
2969
|
darwin: mercurial
|
3000
2970
|
opensuse: mercurial
|
3001
|
-
freebsd: mercurial
|
3002
2971
|
svn:
|
3003
2972
|
debian,ubuntu: subversion
|
3004
2973
|
gentoo: dev-util/subversion
|
@@ -3006,7 +2975,6 @@ svn:
|
|
3006
2975
|
fedora: subversion
|
3007
2976
|
darwin: subversion
|
3008
2977
|
opensuse: subversion
|
3009
|
-
freebsd: subversion
|
3010
2978
|
cmake:
|
3011
2979
|
debian,ubuntu: cmake
|
3012
2980
|
gentoo: dev-util/cmake
|
@@ -3014,7 +2982,6 @@ cmake:
|
|
3014
2982
|
fedora: cmake
|
3015
2983
|
darwin: cmake
|
3016
2984
|
opensuse: cmake
|
3017
|
-
freebsd: cmake
|
3018
2985
|
autotools:
|
3019
2986
|
debian,ubuntu:
|
3020
2987
|
- automake
|
@@ -3034,9 +3001,6 @@ autotools:
|
|
3034
3001
|
opensuse:
|
3035
3002
|
- automake
|
3036
3003
|
- autoconf
|
3037
|
-
freebsd:
|
3038
|
-
- automake
|
3039
|
-
- autoconf
|
3040
3004
|
archive:
|
3041
3005
|
debian,ubuntu:
|
3042
3006
|
- tar
|
@@ -3058,22 +3022,18 @@ archive:
|
|
3058
3022
|
opensuse:
|
3059
3023
|
- tar
|
3060
3024
|
- unzip
|
3061
|
-
default: ignore
|
3062
3025
|
cvs:
|
3063
3026
|
debian,ubuntu: cvs
|
3064
3027
|
fedora: cvs
|
3065
3028
|
darwin: cvs
|
3066
3029
|
arch: cvs
|
3067
3030
|
opensuse: cvs
|
3068
|
-
freebsd: cvs
|
3069
3031
|
pip:
|
3070
3032
|
debian,ubuntu: python-pip
|
3071
3033
|
arch: python2-pip
|
3072
3034
|
opensuse: python-pip
|
3073
3035
|
fedora: python-pip
|
3074
|
-
freebsd: pip
|
3075
3036
|
sudo:
|
3076
|
-
macos-brew: ignore
|
3077
3037
|
default: sudo
|
3078
3038
|
|
3079
3039
|
EODEFS
|
data/lib/autoproj/cmdline.rb
CHANGED
@@ -537,16 +537,6 @@ module Autoproj
|
|
537
537
|
# Returns the set of packages that are actually selected based on what
|
538
538
|
# the user gave on the command line
|
539
539
|
def self.resolve_user_selection(selected_packages, options = Hash.new)
|
540
|
-
if all_known_package?
|
541
|
-
result = PackageSelection.new
|
542
|
-
names = manifest.all_packages
|
543
|
-
names.delete_if { |pkg_name| manifest.excluded?(pkg_name) || manifest.ignored?(pkg_name) }
|
544
|
-
names.each do |pkg_name|
|
545
|
-
result.select(pkg_name, pkg_name)
|
546
|
-
end
|
547
|
-
return result
|
548
|
-
#return manifest.metapackages#.collect {|m| m[0] }
|
549
|
-
end
|
550
540
|
if selected_packages.empty?
|
551
541
|
return manifest.default_packages
|
552
542
|
end
|
@@ -840,7 +830,6 @@ module Autoproj
|
|
840
830
|
def self.manifest; Autoproj.manifest end
|
841
831
|
def self.only_status?; !!@only_status end
|
842
832
|
def self.only_local?; !!@only_local end
|
843
|
-
def self.all_known_package?; !!@all_known_package end
|
844
833
|
def self.reset?; !!@reset end
|
845
834
|
def self.check?; !!@check end
|
846
835
|
def self.manifest_update?; !!@manifest_update end
|
@@ -897,7 +886,6 @@ module Autoproj
|
|
897
886
|
def self.parse_arguments(args, with_mode = true, &additional_options)
|
898
887
|
@only_status = false
|
899
888
|
@only_local = false
|
900
|
-
@all_known_package = false
|
901
889
|
@show_osdeps = false
|
902
890
|
@status_exit_code = false
|
903
891
|
@revshow_osdeps = false
|
@@ -1065,9 +1053,6 @@ where 'mode' is one of:
|
|
1065
1053
|
opts.on("--local", "in status and update modes, do not access the network") do
|
1066
1054
|
@only_local = true
|
1067
1055
|
end
|
1068
|
-
opts.on("--all-known-packages", "handle all known packages that are defined by package-sets") do
|
1069
|
-
@all_known_package = true
|
1070
|
-
end
|
1071
1056
|
opts.on("--reset", "in update mode, reset the repositories to the state requested by the VCS configuration") do
|
1072
1057
|
@reset = true
|
1073
1058
|
end
|
data/lib/autoproj/default.osdeps
CHANGED
@@ -87,13 +87,12 @@ build-essential:
|
|
87
87
|
fedora: ["gcc-c++", make, glibc-devel]
|
88
88
|
darwin: ignore
|
89
89
|
opensuse: ["@devel_C_C++", "gcc-c++"]
|
90
|
-
default: clang
|
91
90
|
|
92
91
|
autobuild:
|
93
|
-
- gem: autobuild
|
92
|
+
- gem: autobuild
|
94
93
|
- osdep: readline
|
95
94
|
autoproj:
|
96
|
-
- gem: autoproj
|
95
|
+
- gem: autoproj
|
97
96
|
- osdep: readline
|
98
97
|
|
99
98
|
readline:
|
@@ -113,10 +112,9 @@ git:
|
|
113
112
|
gentoo: dev-vcs/git
|
114
113
|
arch: git
|
115
114
|
fedora: git
|
116
|
-
macos-port: git
|
115
|
+
macos-port: git-core
|
117
116
|
macos-brew: git
|
118
117
|
opensuse: git
|
119
|
-
freebsd: git
|
120
118
|
|
121
119
|
hg:
|
122
120
|
debian,ubuntu: mercurial
|
@@ -125,7 +123,6 @@ hg:
|
|
125
123
|
fedora: mercurial
|
126
124
|
darwin: mercurial
|
127
125
|
opensuse: mercurial
|
128
|
-
freebsd: mercurial
|
129
126
|
|
130
127
|
svn:
|
131
128
|
debian,ubuntu: subversion
|
@@ -134,7 +131,6 @@ svn:
|
|
134
131
|
fedora: subversion
|
135
132
|
darwin: subversion
|
136
133
|
opensuse: subversion
|
137
|
-
freebsd: subversion
|
138
134
|
|
139
135
|
cmake:
|
140
136
|
debian,ubuntu: cmake
|
@@ -143,7 +139,6 @@ cmake:
|
|
143
139
|
fedora: cmake
|
144
140
|
darwin: cmake
|
145
141
|
opensuse: cmake
|
146
|
-
freebsd: cmake
|
147
142
|
|
148
143
|
autotools:
|
149
144
|
debian,ubuntu:
|
@@ -164,9 +159,6 @@ autotools:
|
|
164
159
|
opensuse:
|
165
160
|
- automake
|
166
161
|
- autoconf
|
167
|
-
freebsd:
|
168
|
-
- automake
|
169
|
-
- autoconf
|
170
162
|
|
171
163
|
archive:
|
172
164
|
debian,ubuntu:
|
@@ -189,7 +181,6 @@ archive:
|
|
189
181
|
opensuse:
|
190
182
|
- tar
|
191
183
|
- unzip
|
192
|
-
default: ignore
|
193
184
|
|
194
185
|
cvs:
|
195
186
|
debian,ubuntu: cvs
|
@@ -197,17 +188,15 @@ cvs:
|
|
197
188
|
darwin: cvs
|
198
189
|
arch: cvs
|
199
190
|
opensuse: cvs
|
200
|
-
freebsd: cvs
|
201
191
|
|
202
192
|
pip:
|
203
193
|
debian,ubuntu: python-pip
|
204
194
|
arch: python2-pip
|
205
195
|
opensuse: python-pip
|
206
196
|
fedora: python-pip
|
207
|
-
freebsd: pip
|
208
197
|
|
209
198
|
sudo:
|
210
|
-
macos-brew: ignore
|
211
199
|
default: sudo
|
212
200
|
|
213
201
|
# vim: expandtab
|
202
|
+
|
data/lib/autoproj/gitorious.rb
CHANGED
@@ -52,7 +52,7 @@ module Autoproj
|
|
52
52
|
elsif !access_methods.has_key?(value)
|
53
53
|
raise Autoproj::InputError, "#{value} is not a known access method"
|
54
54
|
elsif disabled_methods.include?(value)
|
55
|
-
raise Autoproj::InputError, "#{
|
55
|
+
raise Autoproj::InputError, "#{method} is disabled on #{base_url}"
|
56
56
|
end
|
57
57
|
|
58
58
|
value
|
@@ -209,9 +209,6 @@ module Autoproj
|
|
209
209
|
by_repository_id = Hash.new
|
210
210
|
by_name = Hash.new
|
211
211
|
|
212
|
-
required_remotes_dirs = Array.new
|
213
|
-
required_user_dirs = Array.new
|
214
|
-
|
215
212
|
queue = queue_auto_imports_if_needed(Array.new, root_pkg_set, root_pkg_set)
|
216
213
|
while !queue.empty?
|
217
214
|
vcs, options, imported_from = queue.shift
|
@@ -230,28 +227,17 @@ module Autoproj
|
|
230
227
|
end
|
231
228
|
by_repository_id[repository_id] = [vcs, imported_from]
|
232
229
|
|
233
|
-
# Make sure the package set has been already checked out to
|
234
|
-
# retrieve the actual name of the package set
|
235
230
|
if !vcs.local?
|
236
231
|
update_remote_package_set(vcs, only_local)
|
237
|
-
|
238
|
-
required_remotes_dirs << raw_local_dir
|
232
|
+
create_remote_set_user_dir(vcs)
|
239
233
|
end
|
240
|
-
name = PackageSet.name_of(manifest, vcs)
|
241
|
-
|
242
|
-
required_user_dirs = by_name.collect { |k,v| k }
|
243
|
-
Autoproj.debug "Trying to load package_set: #{name} from definition #{repository_id}"
|
244
|
-
Autoproj.debug "Already loaded package_sets are: #{required_user_dirs}"
|
245
234
|
|
235
|
+
name = PackageSet.name_of(manifest, vcs)
|
246
236
|
if already_loaded = by_name[name]
|
247
237
|
already_loaded_pkg_set, already_loaded_vcs = *already_loaded
|
248
238
|
if already_loaded_vcs != vcs
|
249
239
|
if imported_from
|
250
|
-
Autoproj.warn "
|
251
|
-
Autoproj.warn " A package set with the same name (#{name}) has already been imported from"
|
252
|
-
Autoproj.warn " #{already_loaded_vcs}"
|
253
|
-
Autoproj.warn " Skipping the following one: "
|
254
|
-
Autoproj.warn " #{vcs}"
|
240
|
+
Autoproj.warn "#{imported_from.name} auto-imports a package set from #{vcs}, but a package set with the same name (#{name}) has already been imported from #{already_loaded_vcs}, I am skipping this one"
|
255
241
|
else
|
256
242
|
Autoproj.warn "the manifest refers to a package set from #{vcs}, but a package set with the same name (#{name}) has already been imported from #{already_loaded_vcs}, I am skipping this one"
|
257
243
|
end
|
@@ -262,8 +248,6 @@ module Autoproj
|
|
262
248
|
imported_from.imports << already_loaded_pkg_set
|
263
249
|
end
|
264
250
|
next
|
265
|
-
else
|
266
|
-
create_remote_set_user_dir(vcs)
|
267
251
|
end
|
268
252
|
|
269
253
|
pkg_set = load_package_set(vcs, options, imported_from)
|
@@ -276,20 +260,18 @@ module Autoproj
|
|
276
260
|
queue_auto_imports_if_needed(queue, pkg_set, root_pkg_set)
|
277
261
|
end
|
278
262
|
|
279
|
-
cleanup_remotes_dir(package_sets
|
280
|
-
cleanup_remotes_user_dir(package_sets
|
263
|
+
cleanup_remotes_dir(package_sets)
|
264
|
+
cleanup_remotes_user_dir(package_sets)
|
281
265
|
package_sets
|
282
266
|
end
|
283
267
|
|
284
268
|
# Removes from {remotes_dir} the directories that do not match a package
|
285
269
|
# set
|
286
|
-
def cleanup_remotes_dir(package_sets = manifest.package_sets
|
270
|
+
def cleanup_remotes_dir(package_sets = manifest.package_sets)
|
287
271
|
# Cleanup the .remotes and remotes_symlinks_dir directories
|
288
272
|
Dir.glob(File.join(remotes_dir, '*')).each do |dir|
|
289
273
|
dir = File.expand_path(dir)
|
290
|
-
|
291
|
-
# keep it -- so that it won't be checked out again
|
292
|
-
if File.directory?(dir) && !required_remotes_dirs.include?(dir)
|
274
|
+
if File.directory?(dir) && !package_sets.find { |pkg| pkg.raw_local_dir == dir }
|
293
275
|
FileUtils.rm_rf dir
|
294
276
|
end
|
295
277
|
end
|
@@ -297,11 +279,10 @@ module Autoproj
|
|
297
279
|
|
298
280
|
# Removes from {remotes_user_dir} the directories that do not match a
|
299
281
|
# package set
|
300
|
-
def cleanup_remotes_user_dir(package_sets = manifest.package_sets
|
282
|
+
def cleanup_remotes_user_dir(package_sets = manifest.package_sets)
|
301
283
|
Dir.glob(File.join(remotes_user_dir, '*')).each do |file|
|
302
284
|
file = File.expand_path(file)
|
303
|
-
|
304
|
-
if File.symlink?(file) && !required_user_dirs.include?(user_dir)
|
285
|
+
if File.symlink?(file) && !package_sets.find { |pkg_set| pkg_set.user_local_dir == file }
|
305
286
|
FileUtils.rm_f file
|
306
287
|
end
|
307
288
|
end
|
data/lib/autoproj/osdeps.rb
CHANGED
@@ -355,15 +355,6 @@ fi
|
|
355
355
|
"emerge --noreplace '%s'")
|
356
356
|
end
|
357
357
|
end
|
358
|
-
# Package manager interface for systems that use pkg (i.e. FreeBSD) as
|
359
|
-
# their package manager
|
360
|
-
class PkgManager < ShellScriptManager
|
361
|
-
def initialize
|
362
|
-
super(['pkg'], true,
|
363
|
-
"pkg install -y '%s'",
|
364
|
-
"pkg install -y '%s'")
|
365
|
-
end
|
366
|
-
end
|
367
358
|
|
368
359
|
#Package manger for OpenSuse and Suse (untested)
|
369
360
|
class ZypperManager < ShellScriptManager
|
@@ -977,8 +968,7 @@ fi
|
|
977
968
|
PackageManagers::YumManager,
|
978
969
|
PackageManagers::PortManager,
|
979
970
|
PackageManagers::ZypperManager,
|
980
|
-
PackageManagers::PipManager
|
981
|
-
PackageManagers::PkgManager]
|
971
|
+
PackageManagers::PipManager]
|
982
972
|
|
983
973
|
# Mapping from OS name to package manager name
|
984
974
|
#
|
@@ -998,8 +988,7 @@ fi
|
|
998
988
|
'fedora' => 'yum',
|
999
989
|
'macos-port' => 'macports',
|
1000
990
|
'macos-brew' => 'brew',
|
1001
|
-
'opensuse' => 'zypper'
|
1002
|
-
'freebsd' => 'pkg'
|
991
|
+
'opensuse' => 'zypper'
|
1003
992
|
}
|
1004
993
|
|
1005
994
|
# The information contained in the OSdeps files, as a hash
|
@@ -1206,9 +1195,6 @@ fi
|
|
1206
1195
|
version =~/.*VERSION\s+=\s+([^\s]+)/
|
1207
1196
|
version = $1
|
1208
1197
|
[['opensuse'], [version.strip]]
|
1209
|
-
elsif Autobuild.freebsd?
|
1210
|
-
version = `uname -r`.strip.split("-")[0]
|
1211
|
-
[['freebsd'],[version]]
|
1212
1198
|
end
|
1213
1199
|
end
|
1214
1200
|
|
@@ -1357,20 +1343,6 @@ fi
|
|
1357
1343
|
|
1358
1344
|
class InvalidRecursiveStatement < Autobuild::Exception; end
|
1359
1345
|
|
1360
|
-
# Return the path to the osdeps name for a given package name while
|
1361
|
-
# accounting for package aliases
|
1362
|
-
#
|
1363
|
-
# returns an array contain the path starting with name and
|
1364
|
-
# ending at the resolved name
|
1365
|
-
def self.resolve_name(name)
|
1366
|
-
path = [ name ]
|
1367
|
-
while OSDependencies.aliases.has_key?(name)
|
1368
|
-
name = OSDependencies.aliases[name]
|
1369
|
-
path << name
|
1370
|
-
end
|
1371
|
-
path
|
1372
|
-
end
|
1373
|
-
|
1374
1346
|
# Return the list of packages that should be installed for +name+
|
1375
1347
|
#
|
1376
1348
|
# The following two simple return values are possible:
|
@@ -1389,8 +1361,9 @@ fi
|
|
1389
1361
|
# name and version. The package list might be empty even if status ==
|
1390
1362
|
# FOUND_PACKAGES, for instance if the ignore keyword is used.
|
1391
1363
|
def resolve_package(name)
|
1392
|
-
|
1393
|
-
|
1364
|
+
while OSDependencies.aliases.has_key?(name)
|
1365
|
+
name = OSDependencies.aliases[name]
|
1366
|
+
end
|
1394
1367
|
|
1395
1368
|
os_names, os_versions = OSDependencies.operating_system
|
1396
1369
|
os_names = os_names.dup
|
@@ -1611,8 +1584,7 @@ fi
|
|
1611
1584
|
dependencies.each do |name|
|
1612
1585
|
result = resolve_package(name)
|
1613
1586
|
if !result
|
1614
|
-
|
1615
|
-
raise MissingOSDep.new, "there is no osdeps definition for #{path.last} (search tree: #{path.join("->")})"
|
1587
|
+
raise MissingOSDep.new, "there is no osdeps definition for #{name}"
|
1616
1588
|
end
|
1617
1589
|
|
1618
1590
|
if result.empty?
|
data/lib/autoproj/version.rb
CHANGED
metadata
CHANGED
@@ -1,20 +1,23 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: autoproj
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.13.2
|
4
|
+
version: 1.13.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rock Core Developers
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-04-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: autobuild
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
|
+
- !ruby/object:Gem::Version
|
19
|
+
version: '1.9'
|
20
|
+
- - ">="
|
18
21
|
- !ruby/object:Gem::Version
|
19
22
|
version: 1.9.0
|
20
23
|
type: :runtime
|
@@ -22,6 +25,9 @@ dependencies:
|
|
22
25
|
version_requirements: !ruby/object:Gem::Requirement
|
23
26
|
requirements:
|
24
27
|
- - "~>"
|
28
|
+
- !ruby/object:Gem::Version
|
29
|
+
version: '1.9'
|
30
|
+
- - ">="
|
25
31
|
- !ruby/object:Gem::Version
|
26
32
|
version: 1.9.0
|
27
33
|
- !ruby/object:Gem::Dependency
|
@@ -29,6 +35,9 @@ dependencies:
|
|
29
35
|
requirement: !ruby/object:Gem::Requirement
|
30
36
|
requirements:
|
31
37
|
- - "~>"
|
38
|
+
- !ruby/object:Gem::Version
|
39
|
+
version: '2.0'
|
40
|
+
- - ">="
|
32
41
|
- !ruby/object:Gem::Version
|
33
42
|
version: 2.0.0
|
34
43
|
type: :runtime
|
@@ -36,22 +45,31 @@ dependencies:
|
|
36
45
|
version_requirements: !ruby/object:Gem::Requirement
|
37
46
|
requirements:
|
38
47
|
- - "~>"
|
48
|
+
- !ruby/object:Gem::Version
|
49
|
+
version: '2.0'
|
50
|
+
- - ">="
|
39
51
|
- !ruby/object:Gem::Version
|
40
52
|
version: 2.0.0
|
41
53
|
- !ruby/object:Gem::Dependency
|
42
54
|
name: highline
|
43
55
|
requirement: !ruby/object:Gem::Requirement
|
44
56
|
requirements:
|
57
|
+
- - "~>"
|
58
|
+
- !ruby/object:Gem::Version
|
59
|
+
version: '1.7'
|
45
60
|
- - ">="
|
46
61
|
- !ruby/object:Gem::Version
|
47
|
-
version: 1.
|
62
|
+
version: 1.7.0
|
48
63
|
type: :runtime
|
49
64
|
prerelease: false
|
50
65
|
version_requirements: !ruby/object:Gem::Requirement
|
51
66
|
requirements:
|
67
|
+
- - "~>"
|
68
|
+
- !ruby/object:Gem::Version
|
69
|
+
version: '1.7'
|
52
70
|
- - ">="
|
53
71
|
- !ruby/object:Gem::Version
|
54
|
-
version: 1.
|
72
|
+
version: 1.7.0
|
55
73
|
- !ruby/object:Gem::Dependency
|
56
74
|
name: rdoc
|
57
75
|
requirement: !ruby/object:Gem::Requirement
|
@@ -235,9 +253,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
235
253
|
version: 1.9.2
|
236
254
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
237
255
|
requirements:
|
238
|
-
- - "
|
256
|
+
- - ">="
|
239
257
|
- !ruby/object:Gem::Version
|
240
|
-
version:
|
258
|
+
version: '0'
|
241
259
|
requirements: []
|
242
260
|
rubyforge_project:
|
243
261
|
rubygems_version: 2.2.2
|