[DRE-commits] [ruby-json] 01/01: Build java extension
Miguel Landaeta
nomadium at moszumanska.debian.org
Wed Mar 15 08:20:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch experimental
in repository ruby-json.
commit dbe3d2fd7353433dc93f74a5e14dffdcc3ee15f0
Author: Miguel Landaeta <nomadium at debian.org>
Date: Tue Mar 14 21:17:36 2017 +0000
Build java extension
---
debian/changelog | 7 ++++
debian/control | 3 ++
.../0003-Remove-additional-gemspec-files.patch | 48 +---------------------
...05-Disable-rubygems-usage-in-tests-helper.patch | 13 ++++++
.../0006-Disable-git-usage-during-build-time.patch | 16 ++++++++
debian/patches/series | 2 +
debian/ruby-tests.rb | 3 ++
debian/rules | 11 +++++
8 files changed, 56 insertions(+), 47 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d29ba3c..5af4732 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-json (2.0.1+dfsg-4) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Build java extension.
+
+ -- Miguel Landaeta <nomadium at debian.org> Tue, 14 Mar 2017 21:01:24 +0000
+
ruby-json (2.0.1+dfsg-3) unstable; urgency=medium
* Add Conflicts: ruby-json-pure (Closes: #847141)
diff --git a/debian/control b/debian/control
index 5192e68..b718c4a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,10 @@ Uploaders: Lucas Nussbaum <lucas at debian.org>,
Antonio Terceiro <terceiro at softwarelivre.org>,
Cédric Boutillier <boutil at debian.org>
Build-Depends: debhelper (>= 9~),
+ default-jdk,
gem2deb,
+ jruby,
+ locales-all,
ruby-test-unit
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-json.git
diff --git a/debian/patches/0003-Remove-additional-gemspec-files.patch b/debian/patches/0003-Remove-additional-gemspec-files.patch
index a02479c..3d8f948 100644
--- a/debian/patches/0003-Remove-additional-gemspec-files.patch
+++ b/debian/patches/0003-Remove-additional-gemspec-files.patch
@@ -4,56 +4,10 @@ Subject: Remove additional gemspec files.
This is required so that autopkgtest finds the correct gemspec.
---
- json-java.gemspec | 38 --------------------------------------
json_pure.gemspec | 37 -------------------------------------
- 2 files changed, 75 deletions(-)
- delete mode 100644 json-java.gemspec
+ 1 files changed, 37 deletions(-)
delete mode 100644 json_pure.gemspec
-diff --git a/json-java.gemspec b/json-java.gemspec
-deleted file mode 100644
-index 1524b1f..0000000
---- a/json-java.gemspec
-+++ /dev/null
-@@ -1,38 +0,0 @@
--#!/usr/bin/env jruby
--require "rubygems"
--
--spec = Gem::Specification.new do |s|
-- s.name = "json"
-- s.version = File.read("VERSION").chomp
-- s.summary = "JSON implementation for JRuby"
-- s.description = "A JSON implementation as a JRuby extension."
-- s.author = "Daniel Luz"
-- s.email = "dev+ruby at mernen.com"
-- s.homepage = "http://json-jruby.rubyforge.org/"
-- s.platform = 'java'
-- s.rubyforge_project = "json-jruby"
-- s.licenses = ["Ruby"]
--
-- s.files = Dir["{docs,lib,tests}/**/*"]
--
-- if s.respond_to? :specification_version then
-- s.specification_version = 4
--
-- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-- s.add_development_dependency(%q<rake>, [">= 0"])
-- s.add_development_dependency(%q<test-unit>, ["~> 2.0"])
-- else
-- s.add_dependency(%q<rake>, [">= 0"])
-- s.add_dependency(%q<test-unit>, ["~> 2.0"])
-- end
-- else
-- s.add_dependency(%q<rake>, [">= 0"])
-- s.add_dependency(%q<test-unit>, ["~> 2.0"])
-- end
--end
--
--if $0 == __FILE__
-- Gem::Builder.new(spec).build
--else
-- spec
--end
diff --git a/json_pure.gemspec b/json_pure.gemspec
deleted file mode 100644
index bf7dc79..0000000
diff --git a/debian/patches/0005-Disable-rubygems-usage-in-tests-helper.patch b/debian/patches/0005-Disable-rubygems-usage-in-tests-helper.patch
new file mode 100644
index 0000000..d20116b
--- /dev/null
+++ b/debian/patches/0005-Disable-rubygems-usage-in-tests-helper.patch
@@ -0,0 +1,13 @@
+Description: Disable rubygems usage for dependencies management
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2017-03-12
+
+--- ruby-json-2.0.1+dfsg.orig/tests/test_helper.rb
++++ ruby-json-2.0.1+dfsg/tests/test_helper.rb
+@@ -1,4 +1,4 @@
+-gem 'json', File.read('VERSION').chomp
++# gem 'json', File.read('VERSION').chomp
+
+ case ENV['JSON']
+ when 'pure'
diff --git a/debian/patches/0006-Disable-git-usage-during-build-time.patch b/debian/patches/0006-Disable-git-usage-during-build-time.patch
new file mode 100644
index 0000000..bde3f04
--- /dev/null
+++ b/debian/patches/0006-Disable-git-usage-during-build-time.patch
@@ -0,0 +1,16 @@
+Description: Remove unnecessary git usage during package build time
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2017-03-14
+
+--- ruby-json-2.0.1+dfsg.orig/Rakefile
++++ ruby-json-2.0.1+dfsg/Rakefile
+@@ -28,7 +28,7 @@ BUNDLE = ENV['BUNDLE'] || %w[bundle].fin
+ PKG_NAME = 'json'
+ PKG_TITLE = 'JSON Implementation for Ruby'
+ PKG_VERSION = File.read('VERSION').chomp
+-PKG_FILES = FileList[`git ls-files`.split(/\n/)]
++PKG_FILES = FileList[Dir.glob(File.join("**", "*"))]
+
+ EXT_ROOT_DIR = 'ext/json/ext'
+ EXT_PARSER_DIR = "#{EXT_ROOT_DIR}/parser"
diff --git a/debian/patches/series b/debian/patches/series
index a628c3e..346dc97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
02-fix-fuzz.rb-shebang.patch
04-fix-tests-path.patch
0003-Remove-additional-gemspec-files.patch
+0005-Disable-rubygems-usage-in-tests-helper.patch
+0006-Disable-git-usage-during-build-time.patch
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index 1598554..9dcf815 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -7,3 +7,6 @@ system("#{ENV['RUBY_TEST_BIN']} #{inc} tests/*_test.rb") or raise
ENV['json'] = 'ext'
puts "Ext version of the tests"
system("#{ENV['RUBY_TEST_BIN']} #{inc} tests/*_test.rb") or raise
+ENV['JSON'] = 'ext'
+puts "Java ext version of the tests"
+system("jruby -S rake test_ext") or raise
diff --git a/debian/rules b/debian/rules
index b985900..51c5170 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,17 @@
export DH_RUBY_GEMSPEC=json.gemspec
export GEM2DEB_TEST_RUNNER = --check-dependencies
+export JAVA_HOME = /usr/lib/jvm/default-java
+export LC_ALL = en_US.UTF-8
%:
dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_build:
+ dh_auto_build
+ jruby -S rake build
+
+override_dh_auto_clean:
+ dh_auto_clean
+ jruby -S rake clean
+ -rm -r ./pkg/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-json.git
More information about the Pkg-ruby-extras-commits
mailing list