[DRE-commits] [gem2deb] 06/07: dh_ruby: print sbuild-like banners
Antonio Terceiro
terceiro at moszumanska.debian.org
Wed Jul 22 01:54:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository gem2deb.
commit 2dbdca6336f7a212ca01d1220d6f68e29377d2fb
Author: Antonio Terceiro <terceiro at debian.org>
Date: Tue Jul 21 22:44:02 2015 -0300
dh_ruby: print sbuild-like banners
---
debian/changelog | 3 +++
lib/gem2deb/dh_ruby.rb | 3 +++
lib/gem2deb/installer.rb | 8 ++++++--
lib/gem2deb/setup_rb_installer.rb | 4 ++++
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bff625e..1cb9a81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ gem2deb (0.20) UNRELEASED; urgency=medium
- gem2deb/rake/spectask: add a utility task for running tests with rspec
- print a sbuild-like banner before start running tests
* dh-make-ruby: generate debian/ruby-tests.rake using gem2deb/rake/spectask
+ * dh_ruby:
+ - print sbuild-like banners before installing files and before building
+ native extensions
-- Antonio Terceiro <terceiro at debian.org> Mon, 20 Jul 2015 23:12:27 -0300
diff --git a/lib/gem2deb/dh_ruby.rb b/lib/gem2deb/dh_ruby.rb
index 91bac0c..37c88b7 100644
--- a/lib/gem2deb/dh_ruby.rb
+++ b/lib/gem2deb/dh_ruby.rb
@@ -14,6 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
require 'gem2deb'
+require 'gem2deb/banner'
require 'gem2deb/installer'
require 'gem2deb/make'
require 'find'
@@ -95,6 +96,8 @@ module Gem2Deb
if File.exists?('debian/require-rubygems.overrides')
puts "W: debian/require-rubygems.overrides is obsolete, and is now ignored"
end
+
+ Gem2Deb::Banner.print 'dh_ruby --install finished'
end
protected # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/lib/gem2deb/installer.rb b/lib/gem2deb/installer.rb
index e5a10e1..2915a4e 100644
--- a/lib/gem2deb/installer.rb
+++ b/lib/gem2deb/installer.rb
@@ -1,3 +1,4 @@
+require 'gem2deb/banner'
require 'gem2deb/metadata'
module Gem2Deb
@@ -24,13 +25,15 @@ module Gem2Deb
end
def install_files_and_build_extensions
- install_files(bindir, destdir(:bindir), 755) if File::directory?(bindir)
+ Gem2Deb::Banner.print "Install files"
+ install_files(bindir, destdir(:bindir), 755) if File::directory?(bindir)
install_files(libdir, destdir(:libdir), 644) if File::directory?(libdir)
if metadata.has_native_extensions?
ruby_versions.each do |rubyver|
- puts "Building extension for #{rubyver} ..." if verbose
+ Gem2Deb::Banner.print "Build native extensions for #{rubyver}" if verbose
+
run_ruby(SUPPORTED_RUBY_VERSIONS[rubyver], EXTENSION_BUILDER, root, destdir_base)
# Remove duplicate files installed by rubygems in the arch dir
@@ -69,6 +72,7 @@ module Gem2Deb
end
def install_gemspec
+ Gem2Deb::Banner.print "Install Rubygems integration metadata"
if metadata.gemspec
versions =
if metadata.has_native_extensions?
diff --git a/lib/gem2deb/setup_rb_installer.rb b/lib/gem2deb/setup_rb_installer.rb
index ec77e27..80b3be4 100644
--- a/lib/gem2deb/setup_rb_installer.rb
+++ b/lib/gem2deb/setup_rb_installer.rb
@@ -13,6 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+require 'gem2deb/banner'
require 'gem2deb/dh_ruby'
module Gem2Deb
@@ -21,6 +22,9 @@ module Gem2Deb
def install_files_and_build_extensions
ruby_versions.each do |rubyver|
+
+ Gem2Deb::Banner.print "Install files for #{rubyver} with setup.rb"
+
ruby = SUPPORTED_RUBY_VERSIONS[rubyver]
siteruby = destdir(:libdir, rubyver)
bindir = destdir(:bindir, rubyver)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gem2deb.git
More information about the Pkg-ruby-extras-commits
mailing list