autobuild 1.5.52.rc1 → 1.5.52.rc2

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.
@@ -118,7 +118,6 @@ class Importer
118
118
  raise
119
119
  end
120
120
  end
121
-
122
121
  end
123
122
 
124
123
  # Tries to find a fallback importer because of the given error.
@@ -112,16 +112,32 @@ module Autobuild
112
112
  end
113
113
 
114
114
  def import
115
- @has_checked_out = !File.directory?(srcdir)
115
+ # We force a regen after the first checkout. The issue is that
116
+ # autotools is less robust than it should, and very often it is
117
+ # better to generate the build system for the system on which we
118
+ # must build
119
+ #
120
+ # When we are doing a fresh checkout, a file is touched in the
121
+ # source directory. That file is then deleted after #prepare gets
122
+ # called
123
+ is_checking_out = !File.directory?(srcdir)
124
+
116
125
  super
126
+
127
+ ensure
128
+ if is_checking_out && File.directory?(srcdir)
129
+ FileUtils.touch File.join(srcdir, ".fresh_checkout")
130
+ end
117
131
  end
118
132
 
119
133
  def prepare
120
134
  super
121
135
  autodetect_needed_stages
122
136
 
123
- if @has_checked_out
137
+ fresh_checkout_mark = File.join(srcdir, '.fresh_checkout')
138
+ if File.file?(fresh_checkout_mark)
124
139
  prepare_for_forced_build
140
+ FileUtils.rm_f fresh_checkout_mark
125
141
  end
126
142
 
127
143
  # Check if config.status has been generated with the
@@ -1,5 +1,5 @@
1
1
  module Autobuild
2
- VERSION = "1.5.52.rc1" unless defined? Autobuild::VERSION
2
+ VERSION = "1.5.52.rc2" unless defined? Autobuild::VERSION
3
3
  end
4
4
 
5
5
 
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: autobuild
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15424455
4
+ hash: 15424449
5
5
  prerelease: 7
6
6
  segments:
7
7
  - 1
8
8
  - 5
9
9
  - 52
10
10
  - rc
11
- - 1
12
- version: 1.5.52.rc1
11
+ - 2
12
+ version: 1.5.52.rc2
13
13
  platform: ruby
14
14
  authors:
15
15
  - Sylvain Joyeux
@@ -17,7 +17,7 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2011-10-11 00:00:00 Z
20
+ date: 2011-10-24 00:00:00 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: rake