bin/autoproj_bootstrap in autoproj-1.8.0.rc7 vs bin/autoproj_bootstrap in autoproj-1.8.0
- old
+ new
@@ -1734,41 +1734,48 @@
@root_dir = Dir.pwd
end
DEFS = <<EODEFS
---
+cvs:
+ debian,ubuntu: cvs
+autoproj: gem
+zlib:
+ debian,ubuntu: zlib1g-dev
lsb_release:
arch: ignore
debian,ubuntu: lsb-release
gentoo: sys-apps/lsb-release
+cmake:
+ arch: cmake
+ debian,ubuntu: cmake
+ gentoo: dev-util/cmake
+svn:
+ arch: subversion
+ debian,ubuntu: subversion
+ gentoo: dev-util/subversion
autobuild: gem
-archive:
- arch:
- - tar
- - unzip
- debian,ubuntu:
- - tar
- - unzip
- gentoo:
- - app-arch/tar
- - app-arch/unzip
+build-essential:
+ arch: ignore
+ debian,ubuntu: build-essential
+ gentoo: ignore
ruby19:
- ubuntu:
- - ruby1.9.1
- - ruby1.9.1-dev
- - rubygems1.9.1
- - ri1.9.1
- - libopenssl-ruby1.9.1
- - rake
arch:
- ruby
- rake
debian:
- ruby1.9.1
- ruby1.9.1-dev
- rubygems1.9.1
- rake
+ ubuntu:
+ - ruby1.9.1
+ - ruby1.9.1-dev
+ - rubygems1.9.1
+ - ri1.9.1
+ - libopenssl-ruby1.9.1
+ - rake
gentoo:
- dev-lang/ruby:1.9
- rake
ruby18:
debian,ubuntu:
@@ -1779,50 +1786,43 @@
- libopenssl-ruby1.8
- rake
gentoo:
- dev-lang/ruby:1.8
- rake
-svn:
- arch: subversion
- debian,ubuntu: subversion
- gentoo: dev-util/subversion
-libxml2:
- arch: libxml2
- debian,ubuntu: libxml2-dev
- gentoo: dev-libs/libxml2
-none: ignore
autotools:
arch: automake autoconf
debian,ubuntu:
- automake1.9
- autoconf
gentoo:
- sys-devel/automake:1.9
- sys-devel/autoconf
-cmake:
- arch: cmake
- debian,ubuntu: cmake
- gentoo: dev-util/cmake
-zlib:
- debian,ubuntu: zlib1g-dev
-libxslt:
- arch: libxslt
- debian,ubuntu: libxslt1-dev
- gentoo: dev-libs/libxslt
-build-essential:
- arch: ignore
- debian,ubuntu: build-essential
- gentoo: ignore
+libxml2:
+ arch: libxml2
+ debian,ubuntu: libxml2-dev
+ gentoo: dev-libs/libxml2
+archive:
+ arch:
+ - tar
+ - unzip
+ debian,ubuntu:
+ - tar
+ - unzip
+ gentoo:
+ - app-arch/tar
+ - app-arch/unzip
git:
- ubuntu: git-core
arch: git
debian:
- default: git-core
lenny: git
+ default: git-core
+ ubuntu: git-core
gentoo: dev-vcs/git
-autoproj: gem
-cvs:
- debian,ubuntu: cvs
+libxslt:
+ arch: libxslt
+ debian,ubuntu: libxslt1-dev
+ gentoo: dev-libs/libxslt
+none: ignore
EODEFS
Autoproj::OSDependencies.define_osdeps_mode_option
osdeps_mode = Autoproj::OSDependencies.osdeps_mode