autobuild 1.5.9 → 1.5.10
Sign up to get free protection for your applications and to get access to all the features.
- data/Changes.txt +3 -0
- data/lib/autobuild.rb +1 -1
- data/lib/autobuild/import/git.rb +0 -14
- data/lib/autobuild/packages/autotools.rb +12 -1
- metadata +3 -3
data/Changes.txt
CHANGED
data/lib/autobuild.rb
CHANGED
data/lib/autobuild/import/git.rb
CHANGED
@@ -193,20 +193,6 @@ module Autobuild
|
|
193
193
|
Status.new(status, fetch_commit, head_commit, common_commit)
|
194
194
|
end
|
195
195
|
|
196
|
-
# Returns a hash that represents the whole import configuration
|
197
|
-
#
|
198
|
-
# The returned hash is:
|
199
|
-
#
|
200
|
-
# 'type' => 'git'
|
201
|
-
# 'url' => the_package_url
|
202
|
-
# 'tag' => current_commit_id
|
203
|
-
#
|
204
|
-
def current_state
|
205
|
-
return_value = { 'type' => 'git', 'url' => repository }
|
206
|
-
return_value
|
207
|
-
end
|
208
|
-
|
209
|
-
|
210
196
|
def update(package)
|
211
197
|
validate_srcdir(package)
|
212
198
|
Dir.chdir(package.srcdir) do
|
@@ -110,6 +110,7 @@ module Autobuild
|
|
110
110
|
|
111
111
|
def prepare
|
112
112
|
super
|
113
|
+
autodetect_needed_stages
|
113
114
|
|
114
115
|
# Check if config.status has been generated with the
|
115
116
|
# same options than the ones in configureflags
|
@@ -124,9 +125,19 @@ module Autobuild
|
|
124
125
|
|
125
126
|
# Add the --prefix option to the configureflags array
|
126
127
|
testflags = ["--prefix=#{prefix}"] + Array[*configureflags]
|
127
|
-
old_opt = options.find
|
128
|
+
old_opt = options.find do |o|
|
129
|
+
if testflags.include?(o)
|
130
|
+
false
|
131
|
+
else
|
132
|
+
name, value = o.split("=")
|
133
|
+
ENV[name] != value
|
134
|
+
end
|
135
|
+
end
|
128
136
|
new_opt = testflags.find { |o| !options.include?(o) }
|
129
137
|
if old_opt || new_opt
|
138
|
+
if Autobuild.verbose
|
139
|
+
STDERR.puts " forcing reconfiguration of #{name} (#{old_opt} != #{new_opt})"
|
140
|
+
end
|
130
141
|
FileUtils.rm_f configurestamp # to force reconfiguration
|
131
142
|
end
|
132
143
|
end
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 1
|
7
7
|
- 5
|
8
|
-
-
|
9
|
-
version: 1.5.
|
8
|
+
- 10
|
9
|
+
version: 1.5.10
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Sylvain Joyeux
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2010-
|
17
|
+
date: 2010-06-03 00:00:00 +02:00
|
18
18
|
default_executable:
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|