autoproj 1.3.0 → 1.3.1
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/History.txt +4 -0
- data/bin/autoproj +1 -1
- data/doc/guide/src/autoproj_bootstrap +10 -6
- data/lib/autoproj/osdeps.rb +5 -5
- data/lib/autoproj/version.rb +1 -1
- metadata +3 -3
data/History.txt
CHANGED
data/bin/autoproj
CHANGED
@@ -268,7 +268,7 @@ def do_switch_config(*args)
|
|
268
268
|
# Install the OS dependencies required for this VCS
|
269
269
|
osdeps = Autoproj::OSDependencies.load_default
|
270
270
|
osdeps.install([vcs.type])
|
271
|
-
Autoproj::Manifest.update_source(vcs, "autoproj main configuration", File.join(Dir.pwd, "autoproj"))
|
271
|
+
Autoproj::Manifest.update_source(vcs, "autoproj main configuration", 'autoproj_config', File.join(Dir.pwd, "autoproj"))
|
272
272
|
|
273
273
|
# Now write it in the config file
|
274
274
|
File.open(File.join(Autoproj.config_dir, "config.yml"), "a") do |io|
|
@@ -86,10 +86,10 @@ module Autoproj
|
|
86
86
|
# Need to do some heuristics unfortunately
|
87
87
|
@operating_system =
|
88
88
|
if File.exists?('/etc/debian_version')
|
89
|
-
codename = File.read('/etc/debian_version').
|
89
|
+
codename = File.read('/etc/debian_version').strip
|
90
90
|
['debian', [codename]]
|
91
91
|
elsif File.exists?('/etc/gentoo-release')
|
92
|
-
release_string = File.read('/etc/gentoo-release').
|
92
|
+
release_string = File.read('/etc/gentoo-release').strip
|
93
93
|
release_string =~ /^.*([^\s]+)$/
|
94
94
|
version = $1
|
95
95
|
['gentoo', [version]]
|
@@ -109,9 +109,9 @@ module Autoproj
|
|
109
109
|
return unless $?.success?
|
110
110
|
|
111
111
|
distributor = `lsb_release -i -s`
|
112
|
-
distributor = distributor.
|
113
|
-
codename = `lsb_release -c -s`.
|
114
|
-
version = `lsb_release -r -s`.
|
112
|
+
distributor = distributor.strip.downcase
|
113
|
+
codename = `lsb_release -c -s`.strip.downcase
|
114
|
+
version = `lsb_release -r -s`.strip.downcase
|
115
115
|
|
116
116
|
return [distributor, [codename, version]]
|
117
117
|
end
|
@@ -242,7 +242,7 @@ module Autoproj
|
|
242
242
|
end
|
243
243
|
Autobuild.progress "installing/updating OS dependencies: #{osdeps.join(", ")}"
|
244
244
|
begin
|
245
|
-
Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', '
|
245
|
+
Autobuild::Subprocess.run 'autoproj', 'osdeps', '/bin/bash', File.expand_path('osdeps.sh')
|
246
246
|
ensure
|
247
247
|
FileUtils.rm_f 'osdeps.sh'
|
248
248
|
end
|
@@ -332,6 +332,10 @@ lsb_release:
|
|
332
332
|
debian,ubuntu: lsb-release
|
333
333
|
gentoo: sys-apps/lsb-release
|
334
334
|
|
335
|
+
archive:
|
336
|
+
debian,ubuntu: [tar, unzip]
|
337
|
+
gentoo: [app-arch/tar, app-arch/unzip]
|
338
|
+
|
335
339
|
# vim: expandtab
|
336
340
|
|
337
341
|
|
data/lib/autoproj/osdeps.rb
CHANGED
@@ -40,10 +40,10 @@ module Autoproj
|
|
40
40
|
# Need to do some heuristics unfortunately
|
41
41
|
@operating_system =
|
42
42
|
if File.exists?('/etc/debian_version')
|
43
|
-
codename = File.read('/etc/debian_version').
|
43
|
+
codename = File.read('/etc/debian_version').strip
|
44
44
|
['debian', [codename]]
|
45
45
|
elsif File.exists?('/etc/gentoo-release')
|
46
|
-
release_string = File.read('/etc/gentoo-release').
|
46
|
+
release_string = File.read('/etc/gentoo-release').strip
|
47
47
|
release_string =~ /^.*([^\s]+)$/
|
48
48
|
version = $1
|
49
49
|
['gentoo', [version]]
|
@@ -63,9 +63,9 @@ module Autoproj
|
|
63
63
|
return unless $?.success?
|
64
64
|
|
65
65
|
distributor = `lsb_release -i -s`
|
66
|
-
distributor = distributor.
|
67
|
-
codename = `lsb_release -c -s`.
|
68
|
-
version = `lsb_release -r -s`.
|
66
|
+
distributor = distributor.strip.downcase
|
67
|
+
codename = `lsb_release -c -s`.strip.downcase
|
68
|
+
version = `lsb_release -r -s`.strip.downcase
|
69
69
|
|
70
70
|
return [distributor, [codename, version]]
|
71
71
|
end
|
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.3.
|
4
|
+
version: 1.3.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sylvain Joyeux
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2009-12-
|
12
|
+
date: 2009-12-24 00:00:00 +01:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
@@ -90,7 +90,7 @@ dependencies:
|
|
90
90
|
requirements:
|
91
91
|
- - ">="
|
92
92
|
- !ruby/object:Gem::Version
|
93
|
-
version: 2.
|
93
|
+
version: 2.3.3
|
94
94
|
version:
|
95
95
|
description: |-
|
96
96
|
What is Autoproj
|