autoproj 1.9.5.rc5 → 1.9.5
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/autoproj_bootstrap +6 -0
- data/lib/autoproj/autobuild.rb +1 -1
- data/lib/autoproj/default.osdeps +7 -0
- data/lib/autoproj/version.rb +1 -1
- metadata +5 -5
data/bin/autoproj_bootstrap
CHANGED
@@ -2159,6 +2159,12 @@ git:
|
|
2159
2159
|
arch,manjarolinux: git
|
2160
2160
|
fedora: git
|
2161
2161
|
darwin: git-core
|
2162
|
+
hg:
|
2163
|
+
debian,ubuntu: mercurial
|
2164
|
+
gentoo: dev-vcs/mercurial
|
2165
|
+
arch,manjarolinux: mercurial
|
2166
|
+
fedora: mercurial
|
2167
|
+
darwin: mercurial
|
2162
2168
|
svn:
|
2163
2169
|
debian,ubuntu: subversion
|
2164
2170
|
gentoo: dev-util/subversion
|
data/lib/autoproj/autobuild.rb
CHANGED
@@ -184,7 +184,7 @@ module Autobuild
|
|
184
184
|
# manifest
|
185
185
|
def pick_from_autoproj_root(package, installation_manifest)
|
186
186
|
other_pkg = installation_manifest[package.name]
|
187
|
-
return if !other_pkg
|
187
|
+
return if !other_pkg || !File.directory?(other_pkg.srcdir)
|
188
188
|
self.relocate(other_pkg.srcdir)
|
189
189
|
true
|
190
190
|
end
|
data/lib/autoproj/default.osdeps
CHANGED
@@ -73,6 +73,13 @@ git:
|
|
73
73
|
fedora: git
|
74
74
|
darwin: git-core
|
75
75
|
|
76
|
+
hg:
|
77
|
+
debian,ubuntu: mercurial
|
78
|
+
gentoo: dev-vcs/mercurial
|
79
|
+
arch,manjarolinux: mercurial
|
80
|
+
fedora: mercurial
|
81
|
+
darwin: mercurial
|
82
|
+
|
76
83
|
svn:
|
77
84
|
debian,ubuntu: subversion
|
78
85
|
gentoo: dev-util/subversion
|
data/lib/autoproj/version.rb
CHANGED
metadata
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: autoproj
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.9.5
|
5
|
-
prerelease:
|
4
|
+
version: 1.9.5
|
5
|
+
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Rock Core Developers
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-
|
12
|
+
date: 2013-11-14 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: autobuild
|
@@ -196,9 +196,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
196
196
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
197
197
|
none: false
|
198
198
|
requirements:
|
199
|
-
- - ! '
|
199
|
+
- - ! '>='
|
200
200
|
- !ruby/object:Gem::Version
|
201
|
-
version:
|
201
|
+
version: '0'
|
202
202
|
requirements: []
|
203
203
|
rubyforge_project: autobuild
|
204
204
|
rubygems_version: 1.8.23
|