bin/autoproj_bootstrap in autoproj-1.8.0.rc2 vs bin/autoproj_bootstrap in autoproj-1.8.0.rc3
- old
+ new
@@ -117,10 +117,14 @@
def initialize(names = [])
@names = names.dup
@enabled = true
@silent = true
end
+
+ def name
+ names.first
+ end
end
# Dummy package manager used for unknown OSes. It simply displays a
# message to the user when packages are needed
class UnknownOSManager < Manager
@@ -1727,96 +1731,96 @@
end
@root_dir = Dir.pwd
end
DEFS = <<EODEFS
----
-cvs:
- debian,ubuntu: cvs
-svn:
- arch: subversion
- gentoo: dev-util/subversion
- debian,ubuntu: subversion
-autobuild: gem
-zlib:
- debian,ubuntu: zlib1g-dev
-libxml2:
- arch: libxml2
- gentoo: dev-libs/libxml2
- debian,ubuntu: libxml2-dev
+---
none: ignore
-autotools:
- arch: automake autoconf
- gentoo:
- - sys-devel/automake:1.9
- - sys-devel/autoconf
- debian,ubuntu:
- - automake1.9
- - autoconf
-autoproj: gem
-archive:
- arch:
- - tar
- - unzip
- gentoo:
- - app-arch/tar
- - app-arch/unzip
- debian,ubuntu:
- - tar
- - unzip
-lsb_release:
- arch: ignore
- gentoo: sys-apps/lsb-release
- debian,ubuntu: lsb-release
-ruby18:
- gentoo:
- - dev-lang/ruby:1.8
- - rake
- debian,ubuntu:
+ruby18:
+ debian,ubuntu:
- ruby1.8-dev
- ruby1.8
- rubygems1.8
- ri1.8
- libopenssl-ruby1.8
- rake
-ruby19:
- debian:
+ gentoo:
+ - dev-lang/ruby:1.8
+ - rake
+ruby19:
+ debian:
- ruby1.9.1
- ruby1.9.1-dev
- rubygems1.9.1
- rake
- arch:
- - ruby
- - rake
- gentoo:
- - dev-lang/ruby:1.9
- - rake
- ubuntu:
+ ubuntu:
- ruby1.9.1
- ruby1.9.1-dev
- rubygems1.9.1
- ri1.9.1
- libopenssl-ruby1.9.1
- rake
-git:
- debian:
+ gentoo:
+ - dev-lang/ruby:1.9
+ - rake
+ arch:
+ - ruby
+ - rake
+build-essential:
+ debian,ubuntu: build-essential
+ gentoo: ignore
+ arch: ignore
+libxml2:
+ debian,ubuntu: libxml2-dev
+ gentoo: dev-libs/libxml2
+ arch: libxml2
+libxslt:
+ debian,ubuntu: libxslt1-dev
+ gentoo: dev-libs/libxslt
+ arch: libxslt
+zlib:
+ debian,ubuntu: zlib1g-dev
+autobuild: gem
+autoproj: gem
+git:
+ debian:
lenny: git
default: git-core
- arch: git
- gentoo: dev-vcs/git
ubuntu: git-core
-cmake:
- arch: cmake
- gentoo: dev-util/cmake
+ gentoo: dev-vcs/git
+ arch: git
+svn:
+ debian,ubuntu: subversion
+ gentoo: dev-util/subversion
+ arch: subversion
+cmake:
debian,ubuntu: cmake
-build-essential:
+ gentoo: dev-util/cmake
+ arch: cmake
+autotools:
+ debian,ubuntu:
+ - automake1.9
+ - autoconf
+ gentoo:
+ - sys-devel/automake:1.9
+ - sys-devel/autoconf
+ arch: automake autoconf
+lsb_release:
+ debian,ubuntu: lsb-release
+ gentoo: sys-apps/lsb-release
arch: ignore
- gentoo: ignore
- debian,ubuntu: build-essential
-libxslt:
- arch: libxslt
- gentoo: dev-libs/libxslt
- debian,ubuntu: libxslt1-dev
+archive:
+ debian,ubuntu:
+ - tar
+ - unzip
+ gentoo:
+ - app-arch/tar
+ - app-arch/unzip
+ arch:
+ - tar
+ - unzip
+cvs:
+ debian,ubuntu: cvs
EODEFS
Autoproj::OSDependencies.define_osdeps_mode_option
osdeps_mode = Autoproj::OSDependencies.osdeps_mode