autobuild 1.5.26 → 1.5.27
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/Changes.txt +3 -0
- data/lib/autobuild/configurable.rb +3 -1
- data/lib/autobuild/import/git.rb +14 -1
- data/lib/autobuild/package.rb +1 -1
- data/lib/autobuild/packages/orogen.rb +15 -0
- data/lib/autobuild/subcommand.rb +1 -1
- data/lib/autobuild/version.rb +1 -1
- metadata +4 -4
data/Changes.txt
CHANGED
data/lib/autobuild/import/git.rb
CHANGED
@@ -69,7 +69,11 @@ module Autobuild
|
|
69
69
|
# a push URL for people that have commit rights
|
70
70
|
#
|
71
71
|
# #repository is always used for read-only operations
|
72
|
-
|
72
|
+
attr_accessor :push_to
|
73
|
+
|
74
|
+
# If set, git will be configured so that a "git push" pushes by default
|
75
|
+
# to the specified branch, instead of using #branch
|
76
|
+
attr_accessor :push_to_branch
|
73
77
|
|
74
78
|
# The branch this importer is tracking
|
75
79
|
#
|
@@ -126,6 +130,15 @@ module Autobuild
|
|
126
130
|
end
|
127
131
|
Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
|
128
132
|
"--replace-all", "remote.autobuild.fetch", "+refs/heads/*:refs/remotes/autobuild/*")
|
133
|
+
|
134
|
+
if push_to_branch
|
135
|
+
Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
|
136
|
+
"--replace-all", "remote.autobuild.push", "refs/heads/#{local_branch || branch}:refs/heads/#{push_to_branch}")
|
137
|
+
else
|
138
|
+
Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
|
139
|
+
"--replace-all", "remote.autobuild.push", "refs/heads/*:refs/heads/*")
|
140
|
+
end
|
141
|
+
|
129
142
|
if local_branch
|
130
143
|
Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
|
131
144
|
"--replace-all", "branch.#{local_branch}.remote", "autobuild")
|
data/lib/autobuild/package.rb
CHANGED
@@ -324,7 +324,7 @@ module Autobuild
|
|
324
324
|
# In general, specific package types define a meaningful #with_doc
|
325
325
|
# method which calls this method internally.
|
326
326
|
def doc_task
|
327
|
-
task "#{name}-doc"
|
327
|
+
task "#{name}-doc" do
|
328
328
|
@installed_doc = false
|
329
329
|
catch(:doc_disabled) do
|
330
330
|
begin
|
@@ -186,6 +186,17 @@ module Autobuild
|
|
186
186
|
end
|
187
187
|
end
|
188
188
|
|
189
|
+
def self.orogen_version
|
190
|
+
if !@orogen_version && root = orogen_root
|
191
|
+
version_file = File.join(root, 'orogen', 'version.rb')
|
192
|
+
version_line = File.readlines(version_file).grep(/VERSION\s*=\s*"/).first
|
193
|
+
if version_line =~ /.*=\s+"(.+)"$/
|
194
|
+
@orogen_version = $1
|
195
|
+
end
|
196
|
+
end
|
197
|
+
@orogen_version
|
198
|
+
end
|
199
|
+
|
189
200
|
attr_writer :orocos_target
|
190
201
|
def orocos_target
|
191
202
|
if @orocos_target.nil?
|
@@ -308,6 +319,10 @@ module Autobuild
|
|
308
319
|
end
|
309
320
|
cmdline << orogen_file
|
310
321
|
|
322
|
+
if (version = Orogen.orogen_version) && (version >= "1.0")
|
323
|
+
cmdline << "--parallel-build=#{parallel_build_level}"
|
324
|
+
end
|
325
|
+
|
311
326
|
progress "generating oroGen project %s"
|
312
327
|
Dir.chdir(srcdir) do
|
313
328
|
Subprocess.run self, 'orogen', *cmdline
|
data/lib/autobuild/subcommand.rb
CHANGED
@@ -245,7 +245,7 @@ module Autobuild::Subprocess
|
|
245
245
|
duration = Time.now - start_time
|
246
246
|
Autobuild.add_stat(target, phase, duration)
|
247
247
|
File.open(File.join(Autobuild.logdir, "stats.log"), 'a') do |io|
|
248
|
-
io.puts "#{
|
248
|
+
io.puts "#{target_name} #{phase} #{duration}"
|
249
249
|
end
|
250
250
|
if target.respond_to?(:add_stat)
|
251
251
|
target.add_stat(phase, duration)
|
data/lib/autobuild/version.rb
CHANGED
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: autobuild
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 53
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 5
|
9
|
-
-
|
10
|
-
version: 1.5.
|
9
|
+
- 27
|
10
|
+
version: 1.5.27
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Sylvain Joyeux
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-
|
18
|
+
date: 2010-12-02 00:00:00 +01:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|