autobuild 1.5.23 → 1.5.24

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 CHANGED
@@ -1,3 +1,10 @@
1
+ == Version 1.5.24
2
+ * fix bug with git importer and the push_to option. The pushurl configuration
3
+ option was not set in just-cloned repositories
4
+ * improve error message in the "merge" case of git updates
5
+ * fix appearance of a backtrace when CTRL+C was hit just at the same time that
6
+ we start a subcommand
7
+
1
8
  == Version 1.5.23
2
9
  * fix bug with paths that contain regexp special characters like C++
3
10
 
@@ -120,3 +120,4 @@ module Autobuild
120
120
  end
121
121
  end
122
122
 
123
+
@@ -94,6 +94,13 @@ module Autobuild
94
94
  # is the same than the source dir
95
95
  def archive_dir; @options[:archive_dir] || tardir end
96
96
 
97
+ # Returns a string that identifies the remote repository uniquely
98
+ #
99
+ # This is meant for display purposes
100
+ def repository_id
101
+ url.dup
102
+ end
103
+
97
104
  # Creates a new importer which downloads +url+ in +cachedir+ and unpacks it. The following options
98
105
  # are allowed:
99
106
  # [:cachedir] the cache directory. Defaults to "#{Autobuild.prefix}/cache"
@@ -46,6 +46,19 @@ module Autobuild
46
46
  super(common)
47
47
  end
48
48
 
49
+ # Returns a string that identifies the remote repository uniquely
50
+ #
51
+ # This is meant for display purposes
52
+ def repository_id
53
+ result = "git:#{repository} branch=#{branch}"
54
+ if commit
55
+ result << " commit=#{commit}"
56
+ elsif tag
57
+ result << " tag=#{tag}"
58
+ end
59
+ result
60
+ end
61
+
49
62
  # The remote repository URL.
50
63
  #
51
64
  # See also #push_to
@@ -265,7 +278,7 @@ module Autobuild
265
278
  status = merge_status(fetch_commit)
266
279
  if status.needs_update?
267
280
  if !merge? && status.status == Status::NEEDS_MERGE
268
- raise PackageException, "importing the current version of #{package.name} would require a merge"
281
+ raise PackageException, "the local and remote branches #{branch} of #{package.name} have diverged, and I therefore refuse to update automatically. Go into #{package.srcdir} and either reset the local branch or merge the remote changes"
269
282
  end
270
283
  Subprocess.run(package, :import, Autobuild.tool('git'), 'merge', fetch_commit)
271
284
  end
@@ -279,10 +292,14 @@ module Autobuild
279
292
  end
280
293
 
281
294
  Subprocess.run(package, :import,
282
- Autobuild.tool('git'), 'clone', '-o', 'autobuild',
283
- repository, package.srcdir)
295
+ Autobuild.tool('git'), 'clone', '-o', 'autobuild', repository, package.srcdir)
284
296
 
285
297
  Dir.chdir(package.srcdir) do
298
+ if push_to
299
+ Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
300
+ "--replace-all", "remote.autobuild.pushurl", push_to)
301
+ end
302
+
286
303
  # If we are tracking a commit/tag, just check it out
287
304
  if commit || tag
288
305
  Subprocess.run(package, :import, Autobuild.tool('git'),
@@ -19,6 +19,13 @@ module Autobuild
19
19
  super(options)
20
20
  end
21
21
 
22
+ # Returns a string that identifies the remote repository uniquely
23
+ #
24
+ # This is meant for display purposes
25
+ def repository_id
26
+ @source.dup
27
+ end
28
+
22
29
  private
23
30
 
24
31
  def update(package) # :nodoc:
@@ -186,13 +186,6 @@ module Autobuild
186
186
  end
187
187
  end
188
188
 
189
- def self.map_dependencies_with(&block)
190
- @dependency_mapper = block
191
- end
192
- def self.dependency_mapper
193
- @dependency_mapper
194
- end
195
-
196
189
  attr_writer :orocos_target
197
190
  def orocos_target
198
191
  if @orocos_target.nil?
@@ -261,8 +254,6 @@ module Autobuild
261
254
  target = "pkgconfig/#{pkg_name}"
262
255
  if Autobuild::Package[target]
263
256
  depends_on target
264
- elsif self.class.dependency_mapper && target = self.class.dependency_mapper[pkg_name]
265
- depends_on target
266
257
  end
267
258
  end
268
259
 
@@ -306,7 +297,15 @@ module Autobuild
306
297
  def regen
307
298
  cmdline = [guess_ruby_name, self.class.orogen_bin]
308
299
  cmdline << '--corba' if corba
309
- cmdline << '--extended-states' if extended_states
300
+
301
+ ext_states = extended_states
302
+ if !ext_states.nil?
303
+ if ext_states
304
+ cmdline << '--extended-states'
305
+ else
306
+ cmdline << '--no-extended-states'
307
+ end
308
+ end
310
309
  cmdline << orogen_file
311
310
 
312
311
  progress "generating oroGen project %s"
@@ -141,8 +141,8 @@ module Autobuild::Subprocess
141
141
  cwrite.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
142
142
 
143
143
  pid = fork do
144
- cwrite.sync = true
145
144
  begin
145
+ cwrite.sync = true
146
146
  if Autobuild.nice
147
147
  Process.setpriority(Process::PRIO_PROCESS, 0, Autobuild.nice)
148
148
  end
@@ -1,5 +1,5 @@
1
1
  module Autobuild
2
- VERSION = "1.5.23" unless defined? Autobuild::VERSION
2
+ VERSION = "1.5.24" unless defined? Autobuild::VERSION
3
3
  end
4
4
 
5
5
 
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: 45
4
+ hash: 51
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
8
  - 5
9
- - 23
10
- version: 1.5.23
9
+ - 24
10
+ version: 1.5.24
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-11-05 00:00:00 +01:00
18
+ date: 2010-11-18 00:00:00 +01:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -107,9 +107,9 @@ dependencies:
107
107
  hash: 19
108
108
  segments:
109
109
  - 2
110
- - 6
111
- - 2
112
- version: 2.6.2
110
+ - 7
111
+ - 0
112
+ version: 2.7.0
113
113
  type: :development
114
114
  version_requirements: *id006
115
115
  description: |-