autobuild 1.6.2.rc3 → 1.6.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.
@@ -115,7 +115,7 @@ module Autobuild
115
115
  # [:no_subdirectory] the archive does not have the custom archive
116
116
  # subdirectory.
117
117
  def initialize(url, options)
118
- @options = options.dup
118
+ super(options)
119
119
  if !@options.has_key?(:update_cached_file)
120
120
  @options[:update_cached_file] = false
121
121
  end
@@ -159,7 +159,8 @@ module Autobuild
159
159
  cmd = [ '-o', cachefile, '-d', main_dir ]
160
160
  Subprocess.run(package, :import, Autobuild.tool('unzip'), *cmd)
161
161
 
162
- if archive_dir
162
+ archive_dir = (self.archive_dir || File.basename(package.name))
163
+ if archive_dir != File.basename(package.srcdir)
163
164
  FileUtils.rm_rf File.join(package.srcdir)
164
165
  FileUtils.mv File.join(base_dir, archive_dir), package.srcdir
165
166
  elsif !File.directory?(package.srcdir)
@@ -1,5 +1,5 @@
1
1
  module Autobuild
2
- VERSION = "1.6.2.rc3" unless defined? Autobuild::VERSION
2
+ VERSION = "1.6.2" unless defined? Autobuild::VERSION
3
3
  end
4
4
 
5
5
 
metadata CHANGED
@@ -1,19 +1,19 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: autobuild
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.2.rc3
5
- prerelease: 6
4
+ version: 1.6.2
5
+ prerelease:
6
6
  platform: ruby
7
7
  authors:
8
8
  - Sylvain Joyeux
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-10-18 00:00:00.000000000 Z
12
+ date: 2012-11-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
16
- requirement: &20141480 !ruby/object:Gem::Requirement
16
+ requirement: &20399480 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.7.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *20141480
24
+ version_requirements: *20399480
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: utilrb
27
- requirement: &20138420 !ruby/object:Gem::Requirement
27
+ requirement: &20398760 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.3.3
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *20138420
35
+ version_requirements: *20398760
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rdoc
38
- requirement: &20134680 !ruby/object:Gem::Requirement
38
+ requirement: &20397900 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '3.10'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *20134680
46
+ version_requirements: *20397900
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: hoe
49
- requirement: &19452900 !ruby/object:Gem::Requirement
49
+ requirement: &20397060 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '3.1'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *19452900
57
+ version_requirements: *20397060
58
58
  description: Collection of classes to handle build systems (CMake, autotools, ...)
59
59
  and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
60
60
  to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)
@@ -128,9 +128,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
128
128
  required_rubygems_version: !ruby/object:Gem::Requirement
129
129
  none: false
130
130
  requirements:
131
- - - ! '>'
131
+ - - ! '>='
132
132
  - !ruby/object:Gem::Version
133
- version: 1.3.1
133
+ version: '0'
134
134
  requirements: []
135
135
  rubyforge_project: autobuild
136
136
  rubygems_version: 1.8.11